Rename HexParam_t -> data_t for consistent coding style
diff --git a/tests/scripts/generate_test_code.py b/tests/scripts/generate_test_code.py
index 047b130..c4c11fc 100755
--- a/tests/scripts/generate_test_code.py
+++ b/tests/scripts/generate_test_code.py
@@ -300,19 +300,19 @@
elif re.search('char\s*\*\s*.*', arg.strip()):
args.append('char*')
args_dispatch.append('(char *) params[%d]' % arg_idx)
- elif re.search('HexParam_t\s*\*\s*.*', arg.strip()):
+ elif re.search('data_t\s*\*\s*.*', arg.strip()):
args.append('hex')
# create a structure
pointer_initializer = '(uint8_t *) params[%d]' % arg_idx
len_initializer = '*( (uint32_t *) params[%d] )' % (arg_idx+1)
- locals += """ HexParam_t hex%d = {%s, %s};
+ locals += """ data_t data%d = {%s, %s};
""" % (arg_idx, pointer_initializer, len_initializer)
- args_dispatch.append('&hex%d' % arg_idx)
+ args_dispatch.append('&data%d' % arg_idx)
arg_idx += 1
else:
raise ValueError("Test function arguments can only be 'int', "
- "'char *' or 'HexParam_t'\n%s" % line)
+ "'char *' or 'data_t'\n%s" % line)
arg_idx += 1
return name, args, locals, args_dispatch
diff --git a/tests/scripts/test_generate_test_code.py b/tests/scripts/test_generate_test_code.py
index 9964ab9..f1088a3 100755
--- a/tests/scripts/test_generate_test_code.py
+++ b/tests/scripts/test_generate_test_code.py
@@ -442,11 +442,11 @@
Test hex parameters parsing
:return:
"""
- line = 'void entropy_threshold( char * a, HexParam_t * h, int result )'
+ line = 'void entropy_threshold( char * a, data_t * h, int result )'
name, args, local, arg_dispatch = parse_function_signature(line)
self.assertEqual(name, 'entropy_threshold')
self.assertEqual(args, ['char*', 'hex', 'int'])
- self.assertEqual(local, ' HexParam_t hex1 = {(uint8_t *) params[1], *( (uint32_t *) params[2] )};\n')
+ self.assertEqual(local, ' data_t hex1 = {(uint8_t *) params[1], *( (uint32_t *) params[2] )};\n')
self.assertEqual(arg_dispatch, ['(char *) params[0]', '&hex1', '*( (int *) params[3] )'])
def test_non_void_function(self):
@@ -454,15 +454,15 @@
Test invalid signature (non void).
:return:
"""
- line = 'int entropy_threshold( char * a, HexParam_t * h, int result )'
+ line = 'int entropy_threshold( char * a, data_t * h, int result )'
self.assertRaises(ValueError, parse_function_signature, line)
def test_unsupported_arg(self):
"""
- Test unsupported arguments (not among int, char * and HexParam_t)
+ Test unsupported arguments (not among int, char * and data_t)
:return:
"""
- line = 'int entropy_threshold( char * a, HexParam_t * h, int * result )'
+ line = 'int entropy_threshold( char * a, data_t * h, int * result )'
self.assertRaises(ValueError, parse_function_signature, line)
def test_no_params(self):