From fb8f48a10df6d6540a86b8d69a03d56b2ebefc8b Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Sun, 3 May 2020 08:53:51 -0400 Subject: [PATCH] Fix tests that were left behind. --- lib/cmock_generator_plugin_ignore.rb | 2 +- .../unit/cmock_generator_plugin_ignore_test.rb | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/lib/cmock_generator_plugin_ignore.rb b/lib/cmock_generator_plugin_ignore.rb index ada14a2..776a0a8 100644 --- a/lib/cmock_generator_plugin_ignore.rb +++ b/lib/cmock_generator_plugin_ignore.rb @@ -33,7 +33,7 @@ class CMockGeneratorPluginIgnore #add stop ignore function. it does not matter if there are any args lines << "#define #{function[:name]}_StopIgnore() #{function[:name]}_CMockStopIgnore()\n" \ - "void #{function[:name]}_CMockStopIgnore(void);\n" + "void #{function[:name]}_CMockStopIgnore(void);\n" lines end diff --git a/test/unit/cmock_generator_plugin_ignore_test.rb b/test/unit/cmock_generator_plugin_ignore_test.rb index 30b2435..c0c28b8 100644 --- a/test/unit/cmock_generator_plugin_ignore_test.rb +++ b/test/unit/cmock_generator_plugin_ignore_test.rb @@ -35,7 +35,8 @@ describe CMockGeneratorPluginIgnore, "Verify CMockGeneratorPluginIgnore Module" it "handle function declarations for functions without return values" do function = {:name => "Mold", :args_string => "void", :return => test_return[:void]} - expected = "#define Mold_Ignore() Mold_CMockIgnore()\nvoid Mold_CMockIgnore(void);\n" + expected = "#define Mold_Ignore() Mold_CMockIgnore()\nvoid Mold_CMockIgnore(void);\n" + + "#define Mold_StopIgnore() Mold_CMockStopIgnore()\nvoid Mold_CMockStopIgnore(void);\n" returned = @cmock_generator_plugin_ignore.mock_function_declarations(function) assert_equal(expected, returned) end @@ -43,7 +44,9 @@ describe CMockGeneratorPluginIgnore, "Verify CMockGeneratorPluginIgnore Module" it "handle function declarations for functions that returns something" do function = {:name => "Fungus", :args_string => "void", :return => test_return[:string]} expected = "#define Fungus_IgnoreAndReturn(cmock_retval) Fungus_CMockIgnoreAndReturn(__LINE__, cmock_retval)\n"+ - "void Fungus_CMockIgnoreAndReturn(UNITY_LINE_TYPE cmock_line, const char* cmock_to_return);\n" + "void Fungus_CMockIgnoreAndReturn(UNITY_LINE_TYPE cmock_line, const char* cmock_to_return);\n" + + "#define Fungus_StopIgnore() Fungus_CMockStopIgnore()\n"+ + "void Fungus_CMockStopIgnore(void);\n" returned = @cmock_generator_plugin_ignore.mock_function_declarations(function) assert_equal(expected, returned) end @@ -82,6 +85,11 @@ describe CMockGeneratorPluginIgnore, "Verify CMockGeneratorPluginIgnore Module" expected = ["void Slime_CMockIgnore(void)\n", "{\n", " Mock.Slime_IgnoreBool = (char)1;\n", + "}\n\n", + + "void Slime_CMockStopIgnore(void)\n", + "{\n", + " Mock.Slime_IgnoreBool = (char)0;\n", "}\n\n" ].join returned = @cmock_generator_plugin_ignore.mock_interfaces(function) @@ -96,6 +104,12 @@ describe CMockGeneratorPluginIgnore, "Verify CMockGeneratorPluginIgnore Module" "mock_return_1", " cmock_call_instance->ReturnVal = cmock_to_return;\n", " Mock.Slime_IgnoreBool = (char)1;\n", + "}\n\n", + + "void Slime_CMockStopIgnore(void)\n{\n", + " if(Mock.Slime_IgnoreBool)\n", + " Mock.Slime_CallInstance = CMock_Guts_MemNext(Mock.Slime_CallInstance);\n", + " Mock.Slime_IgnoreBool = (char)0;\n", "}\n\n" ].join returned = @cmock_generator_plugin_ignore.mock_interfaces(function)