commit 94b916c7b509c63b45a39b8943a9d0a74e46d728
author Paul Bakker <p.j.bakker@polarssl.org> Thu Apr 17 16:07:20 2014 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Thu Apr 17 16:07:20 2014 +0200
tree 54280c8cbcaa3ee4905e5ff6e5e4befce37046ce
parent dd0aae92e0c46fbd04d70577dddbbea79ff39574

Split assignment and assert check into seperate lines in tests

tests/suites/test_suite_hmac_drbg.function

diff --git a/tests/suites/test_suite_hmac_drbg.function b/tests/suites/test_suite_hmac_drbg.function
index d9a365d..7158756 100644
--- a/tests/suites/test_suite_hmac_drbg.function
+++ b/tests/suites/test_suite_hmac_drbg.function
@@ -44,7 +44,8 @@
     entropy.len = sizeof( buf );
     entropy.p = buf;
 
-    TEST_ASSERT( ( md_info = md_info_from_type( md_alg ) ) != NULL );
+    md_info = md_info_from_type( md_alg );
+    TEST_ASSERT( md_info != NULL );
 
     /* Init must use entropy */
     last_len = entropy.len;
@@ -110,7 +111,9 @@
     const md_info_t *md_info;
     hmac_drbg_context ctx;
 
-    TEST_ASSERT( ( md_info = md_info_from_type( md_alg ) ) != NULL );
+    md_info = md_info_from_type( md_alg );
+    TEST_ASSERT( md_info != NULL );
+
     TEST_ASSERT( hmac_drbg_init( &ctx, md_info, rnd_std_rand, NULL,
                                  NULL, 0 ) == 0 );
 
@@ -133,7 +136,8 @@
     memset( buf, 0, sizeof( buf ) );
     memset( out, 0, sizeof( out ) );
 
-    TEST_ASSERT( ( md_info = md_info_from_type( md_alg ) ) != NULL );
+    md_info = md_info_from_type( md_alg );
+    TEST_ASSERT( md_info != NULL );
     TEST_ASSERT( hmac_drbg_init_buf( &ctx, md_info, buf, sizeof( buf ) ) == 0 );
 
     /* Make sure it never tries to reseed (would segfault otherwise) */
@@ -174,7 +178,8 @@
     p_entropy.len = unhexify( entropy, entropy_hex );
     p_entropy.p = entropy;
 
-    TEST_ASSERT( ( md_info = md_info_from_type( md_alg ) ) != NULL );
+    md_info = md_info_from_type( md_alg );
+    TEST_ASSERT( md_info != NULL );
 
     /* Test the simplified buffer-based variant */
     memcpy( data, entropy, p_entropy.len );
@@ -231,7 +236,9 @@
     p_entropy.len = unhexify( entropy, entropy_hex );
     p_entropy.p = entropy;
 
-    TEST_ASSERT( ( md_info = md_info_from_type( md_alg ) ) != NULL );
+    md_info = md_info_from_type( md_alg );
+    TEST_ASSERT( md_info != NULL );
+
     TEST_ASSERT( hmac_drbg_init( &ctx, md_info, entropy_func, &p_entropy,
                                  custom, custom_len ) == 0 );
     TEST_ASSERT( hmac_drbg_reseed( &ctx, add1, add1_len ) == 0 );
@@ -272,7 +279,9 @@
     p_entropy.len = unhexify( entropy, entropy_hex );
     p_entropy.p = entropy;
 
-    TEST_ASSERT( ( md_info = md_info_from_type( md_alg ) ) != NULL );
+    md_info = md_info_from_type( md_alg );
+    TEST_ASSERT( md_info != NULL );
+
     TEST_ASSERT( hmac_drbg_init( &ctx, md_info, entropy_func, &p_entropy,
                                  custom, custom_len ) == 0 );
     hmac_drbg_set_prediction_resistance( &ctx, POLARSSL_HMAC_DRBG_PR_ON );