Browse Source

Rearrange parameter unit tests so they are in alphabetical order.

sbg
Stephan Brown 8 years ago committed by Beat Küng
parent
commit
e57f6221b2
  1. 2
      src/systemcmds/param/param.c
  2. 44
      unittests/param_test.cpp

2
src/systemcmds/param/param.c

@ -351,7 +351,7 @@ do_find(const char *name)
return 1; return 1;
} }
printf("Found param %s at index %"PRIxPTR"\n", name, ret); printf("Found param %s at index %" PRIxPTR "\n", name, ret);
return 0; return 0;
} }

44
unittests/param_test.cpp

@ -39,10 +39,10 @@ void _add_parameters()
}; };
rc2_x.val.i = 16; rc2_x.val.i = 16;
param_array[0] = test_1; param_array[0] = rc_x;
param_array[1] = test_2; param_array[1] = rc2_x;
param_array[2] = rc_x; param_array[2] = test_1;
param_array[3] = rc2_x; param_array[3] = test_2;
param_info_base = (struct param_info_s *) &param_array[0]; param_info_base = (struct param_info_s *) &param_array[0];
// needs to point at the end of the data, // needs to point at the end of the data,
// therefore number of params + 1 // therefore number of params + 1
@ -91,10 +91,10 @@ TEST(ParamTest, ResetAll)
param_reset_all(); param_reset_all();
_assert_parameter_int_value((param_t)0, 2); _assert_parameter_int_value((param_t)0, 8);
_assert_parameter_int_value((param_t)1, 4); _assert_parameter_int_value((param_t)1, 16);
_assert_parameter_int_value((param_t)2, 8); _assert_parameter_int_value((param_t)2, 2);
_assert_parameter_int_value((param_t)3, 16); _assert_parameter_int_value((param_t)3, 4);
} }
TEST(ParamTest, ResetAllExcludesOne) TEST(ParamTest, ResetAllExcludesOne)
@ -105,10 +105,10 @@ TEST(ParamTest, ResetAllExcludesOne)
const char *excludes[] = {"RC_X"}; const char *excludes[] = {"RC_X"};
param_reset_excludes(excludes, 1); param_reset_excludes(excludes, 1);
_assert_parameter_int_value((param_t)0, 2); _assert_parameter_int_value((param_t)0, 50);
_assert_parameter_int_value((param_t)1, 4); _assert_parameter_int_value((param_t)1, 16);
_assert_parameter_int_value((param_t)2, 50); _assert_parameter_int_value((param_t)2, 2);
_assert_parameter_int_value((param_t)3, 16); _assert_parameter_int_value((param_t)3, 4);
} }
TEST(ParamTest, ResetAllExcludesTwo) TEST(ParamTest, ResetAllExcludesTwo)
@ -120,9 +120,9 @@ TEST(ParamTest, ResetAllExcludesTwo)
param_reset_excludes(excludes, 2); param_reset_excludes(excludes, 2);
_assert_parameter_int_value((param_t)0, 50); _assert_parameter_int_value((param_t)0, 50);
_assert_parameter_int_value((param_t)1, 4); _assert_parameter_int_value((param_t)1, 16);
_assert_parameter_int_value((param_t)2, 50); _assert_parameter_int_value((param_t)2, 50);
_assert_parameter_int_value((param_t)3, 16); _assert_parameter_int_value((param_t)3, 4);
} }
TEST(ParamTest, ResetAllExcludesBoundaryCheck) TEST(ParamTest, ResetAllExcludesBoundaryCheck)
@ -133,10 +133,10 @@ TEST(ParamTest, ResetAllExcludesBoundaryCheck)
const char *excludes[] = {"RC_X", "TEST_1"}; const char *excludes[] = {"RC_X", "TEST_1"};
param_reset_excludes(excludes, 1); param_reset_excludes(excludes, 1);
_assert_parameter_int_value((param_t)0, 2); _assert_parameter_int_value((param_t)0, 50);
_assert_parameter_int_value((param_t)1, 4); _assert_parameter_int_value((param_t)1, 16);
_assert_parameter_int_value((param_t)2, 50); _assert_parameter_int_value((param_t)2, 2);
_assert_parameter_int_value((param_t)3, 16); _assert_parameter_int_value((param_t)3, 4);
} }
TEST(ParamTest, ResetAllExcludesWildcard) TEST(ParamTest, ResetAllExcludesWildcard)
@ -147,8 +147,8 @@ TEST(ParamTest, ResetAllExcludesWildcard)
const char *excludes[] = {"RC*"}; const char *excludes[] = {"RC*"};
param_reset_excludes(excludes, 1); param_reset_excludes(excludes, 1);
_assert_parameter_int_value((param_t)0, 2); _assert_parameter_int_value((param_t)0, 50);
_assert_parameter_int_value((param_t)1, 4); _assert_parameter_int_value((param_t)1, 50);
_assert_parameter_int_value((param_t)2, 50); _assert_parameter_int_value((param_t)2, 2);
_assert_parameter_int_value((param_t)3, 50); _assert_parameter_int_value((param_t)3, 4);
} }

Loading…
Cancel
Save