From 84705b2e8478e35e404067690df8f5fef7f63cae Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Thu, 18 Jun 2026 19:41:35 -0400 Subject: [PATCH] Rename some misnamed tests. --- ...yml => return_thru_ptr_expect_any_args.yml} | 18 +++++++----------- .../return_thru_ptr_ignore_arg.yml | 18 +++++++++++------- 2 files changed, 18 insertions(+), 18 deletions(-) rename test/system/test_interactions/{return_thru_ptr_and_expect_any_args.yml => return_thru_ptr_expect_any_args.yml} (92%) diff --git a/test/system/test_interactions/return_thru_ptr_and_expect_any_args.yml b/test/system/test_interactions/return_thru_ptr_expect_any_args.yml similarity index 92% rename from test/system/test_interactions/return_thru_ptr_and_expect_any_args.yml rename to test/system/test_interactions/return_thru_ptr_expect_any_args.yml index ac3c681..6a4f95d 100644 --- a/test/system/test_interactions/return_thru_ptr_and_expect_any_args.yml +++ b/test/system/test_interactions/return_thru_ptr_expect_any_args.yml @@ -15,7 +15,7 @@ :when_ptr: :smart :plugins: - :array - - :ignore_arg + - :expect_any_args - :return_thru_ptr :systest: @@ -106,11 +106,10 @@ :code: | test() { - int r = 1, s = 2; + int s = 2; int res = 4; - ptr_ret_int_Expect(&r); - ptr_ret_int_IgnoreArg_r(); + ptr_ret_int_ExpectAnyArgs(); ptr_ret_int_ReturnThruPtr_r(&res); ptr_ret_int(&s); TEST_ASSERT_EQUAL(4, s); @@ -124,8 +123,7 @@ int r = 1; int res = 4; - ptr_ret_int_Expect(NULL); - ptr_ret_int_IgnoreArg_r(); + ptr_ret_int_ExpectAnyArgs(); ptr_ret_int_ReturnThruPtr_r(&res); ptr_ret_int(&r); TEST_ASSERT_EQUAL(4, r); @@ -230,13 +228,11 @@ } - :pass: TRUE - :should: "generate IgnoreArg definitions" + :should: "generate ExpectAnyArgs definitions" :code: | test() { - #if !defined(ptr_ret_array_IgnoreArg_r) \ - || !defined(ptr_ret_array_IgnoreArg_len) \ - || !defined(ptr_ret_const_int_IgnoreArg_s) - TEST_FAIL_MESSAGE("IgnoreArg not defined for an argument."); + #if !defined(ptr_ret_array_ExpectAnyArgs) + TEST_FAIL_MESSAGE("ExpectAnyArgs not defined for an argument."); #endif } diff --git a/test/system/test_interactions/return_thru_ptr_ignore_arg.yml b/test/system/test_interactions/return_thru_ptr_ignore_arg.yml index 6a4f95d..ac3c681 100644 --- a/test/system/test_interactions/return_thru_ptr_ignore_arg.yml +++ b/test/system/test_interactions/return_thru_ptr_ignore_arg.yml @@ -15,7 +15,7 @@ :when_ptr: :smart :plugins: - :array - - :expect_any_args + - :ignore_arg - :return_thru_ptr :systest: @@ -106,10 +106,11 @@ :code: | test() { - int s = 2; + int r = 1, s = 2; int res = 4; - ptr_ret_int_ExpectAnyArgs(); + ptr_ret_int_Expect(&r); + ptr_ret_int_IgnoreArg_r(); ptr_ret_int_ReturnThruPtr_r(&res); ptr_ret_int(&s); TEST_ASSERT_EQUAL(4, s); @@ -123,7 +124,8 @@ int r = 1; int res = 4; - ptr_ret_int_ExpectAnyArgs(); + ptr_ret_int_Expect(NULL); + ptr_ret_int_IgnoreArg_r(); ptr_ret_int_ReturnThruPtr_r(&res); ptr_ret_int(&r); TEST_ASSERT_EQUAL(4, r); @@ -228,11 +230,13 @@ } - :pass: TRUE - :should: "generate ExpectAnyArgs definitions" + :should: "generate IgnoreArg definitions" :code: | test() { - #if !defined(ptr_ret_array_ExpectAnyArgs) - TEST_FAIL_MESSAGE("ExpectAnyArgs not defined for an argument."); + #if !defined(ptr_ret_array_IgnoreArg_r) \ + || !defined(ptr_ret_array_IgnoreArg_len) \ + || !defined(ptr_ret_const_int_IgnoreArg_s) + TEST_FAIL_MESSAGE("IgnoreArg not defined for an argument."); #endif }