commit dbd443dca61b5d47722615108b2465c7942bcee3
author Paul Bakker <p.j.bakker@polarssl.org> Fri Aug 16 13:38:47 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Fri Aug 16 13:51:37 2013 +0200
tree f17459cfcc3adf40ed49f66ce04921c7b474db6a
parent 1934318dce170587bada706089ad1016c7614f92

Adapted .function files and .data files to new test framework

Changes include:
 - Integers marked with '#' in the .function files.
 - Strings should have "" in .data files.
 - String comparison instead of preprocessor-like replace for e.g. '=='
 - Params and variables cannot have the same name in .function files

tests/suites/test_suite_cipher.function

diff --git a/tests/suites/test_suite_cipher.function b/tests/suites/test_suite_cipher.function
index 4f37200..6366910 100644
--- a/tests/suites/test_suite_cipher.function
+++ b/tests/suites/test_suite_cipher.function
@@ -7,8 +7,9 @@
 END_DEPENDENCIES
 
 BEGIN_CASE
-enc_dec_buf:cipher_id:cipher_string:key_len:length:pad_mode:
-    size_t length = {length};
+enc_dec_buf:#cipher_id:cipher_string:#key_len:#length_val:#pad_mode
+{
+    size_t length = {length_val};
     unsigned char key[32];
     unsigned char iv[16];
 
@@ -36,7 +37,7 @@
     /* Check and get info structures */
     cipher_info = cipher_info_from_type( {cipher_id} );
     TEST_ASSERT( NULL != cipher_info );
-    TEST_ASSERT( cipher_info_from_string( "{cipher_string}" ) == cipher_info );
+    TEST_ASSERT( cipher_info_from_string( {cipher_string} ) == cipher_info );
 
     /* Initialise enc and dec contexts */
     TEST_ASSERT( 0 == cipher_init_ctx( &ctx_dec, cipher_info ) );
@@ -89,11 +90,13 @@
 
     TEST_ASSERT( 0 == cipher_free_ctx( &ctx_dec ) );
     TEST_ASSERT( 0 == cipher_free_ctx( &ctx_enc ) );
+}
 END_CASE
 
 BEGIN_CASE
-enc_fail:cipher_id:pad_mode:key_len:length:ret:
-    size_t length = {length};
+enc_fail:#cipher_id:#pad_mode:#key_len:#length_val:#ret
+{
+    size_t length = {length_val};
     unsigned char key[32];
     unsigned char iv[16];
 
@@ -129,10 +132,12 @@
 
     /* done */
     TEST_ASSERT( 0 == cipher_free_ctx( &ctx ) );
+}
 END_CASE
 
 BEGIN_CASE
 dec_empty_buf:
+{
     unsigned char key[32];
     unsigned char iv[16];
 
@@ -169,12 +174,14 @@
     TEST_ASSERT( 0 == outlen );
 
     TEST_ASSERT( 0 == cipher_free_ctx( &ctx_dec ) );
+}
 END_CASE
 
 BEGIN_CASE
-enc_dec_buf_multipart:cipher_id:key_len:first_length:second_length:
-    size_t first_length = {first_length};
-    size_t second_length = {second_length};
+enc_dec_buf_multipart:#cipher_id:#key_len:#first_length_val:#second_length_val
+{
+    size_t first_length = {first_length_val};
+    size_t second_length = {second_length_val};
     size_t length = first_length + second_length;
     unsigned char key[32];
     unsigned char iv[16];
@@ -248,10 +255,12 @@
 
     TEST_ASSERT( 0 == cipher_free_ctx( &ctx_dec ) );
     TEST_ASSERT( 0 == cipher_free_ctx( &ctx_enc ) );
+}
 END_CASE
 
 BEGIN_CASE
-set_padding:cipher_id:pad_mode:ret:
+set_padding:#cipher_id:#pad_mode:#ret
+{
     const cipher_info_t *cipher_info;
     cipher_context_t ctx;
 
@@ -262,10 +271,12 @@
     TEST_ASSERT( {ret} == cipher_set_padding_mode( &ctx, {pad_mode} ) );
 
     TEST_ASSERT( 0 == cipher_free_ctx( &ctx ) );
+}
 END_CASE
 
 BEGIN_CASE
-check_padding:pad_mode:input:ret:dlen:
+check_padding:#pad_mode:input_str:#ret:#dlen_check
+{
     cipher_info_t cipher_info;
     cipher_context_t ctx;
     unsigned char input[16];
@@ -278,11 +289,12 @@
 
     TEST_ASSERT( 0 == cipher_set_padding_mode( &ctx, {pad_mode} ) );
 
-    ilen = unhexify( input, {input} );
+    ilen = unhexify( input, {input_str} );
 
     TEST_ASSERT( {ret} == ctx.get_padding( input, ilen, &dlen ) );
     if( 0 == {ret} )
-        TEST_ASSERT( dlen == {dlen} );
+        TEST_ASSERT( dlen == (size_t) {dlen_check} );
+}
 END_CASE
 
 BEGIN_CASE