From 488c469cdf1dc8b81da395db7d4f64db9637c4d8 Mon Sep 17 00:00:00 2001 From: John Lindgren Date: Wed, 13 Sep 2017 10:24:45 -0400 Subject: [PATCH 1/2] Fix Ruby warnings (mostly unused variables). --- lib/cmock_generator_plugin_cexception.rb | 1 - lib/cmock_generator_plugin_ignore_arg.rb | 6 ++---- lib/cmock_generator_plugin_return_thru_ptr.rb | 2 -- test/unit/cmock_generator_main_test.rb | 4 ---- test/unit/cmock_generator_plugin_return_thru_ptr_test.rb | 6 ++++-- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/lib/cmock_generator_plugin_cexception.rb b/lib/cmock_generator_plugin_cexception.rb index 7a1905a9..39d36d64 100644 --- a/lib/cmock_generator_plugin_cexception.rb +++ b/lib/cmock_generator_plugin_cexception.rb @@ -41,7 +41,6 @@ def mock_implementation(function) def mock_interfaces(function) arg_insert = (function[:args_string] == "void") ? "" : "#{function[:args_string]}, " - call_string = function[:args].map{|m| m[:name]}.join(', ') [ "void #{function[:name]}_CMockExpectAndThrow(UNITY_LINE_TYPE cmock_line, #{arg_insert}CEXCEPTION_T cmock_to_throw)\n{\n", @utils.code_add_base_expectation(function[:name]), @utils.code_call_argument_loader(function), diff --git a/lib/cmock_generator_plugin_ignore_arg.rb b/lib/cmock_generator_plugin_ignore_arg.rb index 4ea6350f..ef40e503 100644 --- a/lib/cmock_generator_plugin_ignore_arg.rb +++ b/lib/cmock_generator_plugin_ignore_arg.rb @@ -29,14 +29,12 @@ def mock_interfaces(function) lines = [] func_name = function[:name] function[:args].each do |arg| - arg_name = arg[:name] - arg_type = arg[:type] - lines << "void #{function[:name]}_CMockIgnoreArg_#{arg[:name]}(UNITY_LINE_TYPE cmock_line)\n" + lines << "void #{func_name}_CMockIgnoreArg_#{arg[:name]}(UNITY_LINE_TYPE cmock_line)\n" lines << "{\n" lines << " CMOCK_#{func_name}_CALL_INSTANCE* cmock_call_instance = " + "(CMOCK_#{func_name}_CALL_INSTANCE*)CMock_Guts_GetAddressFor(CMock_Guts_MemEndOfChain(Mock.#{func_name}_CallInstance));\n" lines << " UNITY_TEST_ASSERT_NOT_NULL(cmock_call_instance, cmock_line, CMockStringIgnPreExp);\n" - lines << " cmock_call_instance->IgnoreArg_#{arg_name} = 1;\n" + lines << " cmock_call_instance->IgnoreArg_#{arg[:name]} = 1;\n" lines << "}\n\n" end lines diff --git a/lib/cmock_generator_plugin_return_thru_ptr.rb b/lib/cmock_generator_plugin_return_thru_ptr.rb index f7fddfd1..5c3a9597 100644 --- a/lib/cmock_generator_plugin_return_thru_ptr.rb +++ b/lib/cmock_generator_plugin_return_thru_ptr.rb @@ -40,7 +40,6 @@ def mock_interfaces(function) func_name = function[:name] function[:args].each do |arg| arg_name = arg[:name] - arg_type = arg[:type] if (@utils.ptr_or_str?(arg[:type]) and not arg[:const?]) lines << "void #{func_name}_CMockReturnMemThruPtr_#{arg_name}(UNITY_LINE_TYPE cmock_line, #{arg[:type]} #{arg_name}, int cmock_size)\n" lines << "{\n" @@ -60,7 +59,6 @@ def mock_implementation(function) lines = [] function[:args].each do |arg| arg_name = arg[:name] - arg_type = arg[:type] if (@utils.ptr_or_str?(arg[:type]) and not arg[:const?]) lines << " if (cmock_call_instance->ReturnThruPtr_#{arg_name}_Used)\n" lines << " {\n" diff --git a/test/unit/cmock_generator_main_test.rb b/test/unit/cmock_generator_main_test.rb index cfc715e7..fbfe41c4 100644 --- a/test/unit/cmock_generator_main_test.rb +++ b/test/unit/cmock_generator_main_test.rb @@ -87,7 +87,6 @@ def mock_implementation(name, args) @config.expect :weak, "" orig_filename = "PoutPoutFish.h" define_name = "MOCKPOUTPOUTFISH_H" - mock_name = "MockPoutPoutFish" output = [] expected = [ "/* AUTOGENERATED FILE. DO NOT EDIT. */\n", @@ -143,7 +142,6 @@ def mock_implementation(name, args) @config.expect :weak, "" orig_filename = "Pout-Pout Fish.h" define_name = "MOCKPOUT_POUT_FISH_H" - mock_name = "MockPout_Pout_Fish" output = [] expected = [ "/* AUTOGENERATED FILE. DO NOT EDIT. */\n", @@ -182,7 +180,6 @@ def mock_implementation(name, args) @config.expect :weak, "" orig_filename = "PoutPoutFish.h" define_name = "MOCKPOUTPOUTFISH_H" - mock_name = "MockPoutPoutFish" output = [] expected = [ "/* AUTOGENERATED FILE. DO NOT EDIT. */\n", @@ -220,7 +217,6 @@ def mock_implementation(name, args) @config.expect :weak, "" orig_filename = "PoutPoutFish.h" define_name = "MOCKPOUTPOUTFISH_H" - mock_name = "MockPoutPoutFish" output = [] expected = [ "/* AUTOGENERATED FILE. DO NOT EDIT. */\n", diff --git a/test/unit/cmock_generator_plugin_return_thru_ptr_test.rb b/test/unit/cmock_generator_plugin_return_thru_ptr_test.rb index f715880b..4f73e353 100644 --- a/test/unit/cmock_generator_plugin_return_thru_ptr_test.rb +++ b/test/unit/cmock_generator_plugin_return_thru_ptr_test.rb @@ -124,11 +124,13 @@ def complex_func_expect expected = " if (cmock_call_instance->ReturnThruPtr_tofu_Used)\n" + " {\n" + - " memcpy(tofu, cmock_call_instance->ReturnThruPtr_tofu_Val,\n" + + " UNITY_TEST_ASSERT_NOT_NULL(tofu, cmock_line, CMockStringPtrIsNULL);\n" + + " memcpy((void*)tofu, (void*)cmock_call_instance->ReturnThruPtr_tofu_Val,\n" + " cmock_call_instance->ReturnThruPtr_tofu_Size);\n" + - " }\n" + + " }\n" returned = @cmock_generator_plugin_return_thru_ptr.mock_implementation(@complex_func).join("") + assert_equal(expected, returned) end end From 6d1c0f97f51030f8bda40bd32dacb2fd4663c652 Mon Sep 17 00:00:00 2001 From: John Lindgren Date: Wed, 13 Sep 2017 10:37:19 -0400 Subject: [PATCH 2/2] Fix Minitest deprecation warnings. assert_equal() doesn't like to be passed nil any more. --- test/unit/cmock_config_test.rb | 6 ++++-- test/unit/cmock_generator_plugin_array_test.rb | 4 ++-- test/unit/cmock_generator_plugin_expect_a_test.rb | 4 ++-- test/unit/cmock_generator_plugin_expect_b_test.rb | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/test/unit/cmock_config_test.rb b/test/unit/cmock_config_test.rb index f2dcab1c..291c2cce 100644 --- a/test/unit/cmock_config_test.rb +++ b/test/unit/cmock_config_test.rb @@ -14,7 +14,8 @@ it "use default settings when no parameters are specified" do config = CMockConfig.new assert_equal(CMockConfig::CMockDefaultOptions[:mock_path], config.mock_path) - assert_equal(CMockConfig::CMockDefaultOptions[:includes], config.includes) + assert_nil(CMockConfig::CMockDefaultOptions[:includes]) + assert_nil(config.includes) assert_equal(CMockConfig::CMockDefaultOptions[:attributes], config.attributes) assert_equal(CMockConfig::CMockDefaultOptions[:plugins], config.plugins) assert_equal(CMockConfig::CMockDefaultOptions[:treat_externs], config.treat_externs) @@ -35,7 +36,8 @@ test_plugins = [:soda, :pizza] config = CMockConfig.new("#{File.expand_path(File.dirname(__FILE__))}/cmock_config_test.yml") assert_equal(CMockConfig::CMockDefaultOptions[:mock_path], config.mock_path) - assert_equal(CMockConfig::CMockDefaultOptions[:includes], config.includes) + assert_nil(CMockConfig::CMockDefaultOptions[:includes]) + assert_nil(config.includes) assert_equal(test_plugins, config.plugins) assert_equal(:include, config.treat_externs) end diff --git a/test/unit/cmock_generator_plugin_array_test.rb b/test/unit/cmock_generator_plugin_array_test.rb index 84496165..64c0b283 100644 --- a/test/unit/cmock_generator_plugin_array_test.rb +++ b/test/unit/cmock_generator_plugin_array_test.rb @@ -37,8 +37,8 @@ def code_add_base_expectation(func) end it "have set up internal priority" do - assert_equal(nil, @cmock_generator_plugin_array.unity_helper) - assert_equal(8, @cmock_generator_plugin_array.priority) + assert_nil(@cmock_generator_plugin_array.unity_helper) + assert_equal(8, @cmock_generator_plugin_array.priority) end it "not include any additional include files" do diff --git a/test/unit/cmock_generator_plugin_expect_a_test.rb b/test/unit/cmock_generator_plugin_expect_a_test.rb index 5b115a49..c8e84c27 100644 --- a/test/unit/cmock_generator_plugin_expect_a_test.rb +++ b/test/unit/cmock_generator_plugin_expect_a_test.rb @@ -26,8 +26,8 @@ end it "have set up internal priority on init" do - assert_equal(nil, @cmock_generator_plugin_expect.unity_helper) - assert_equal(5, @cmock_generator_plugin_expect.priority) + assert_nil(@cmock_generator_plugin_expect.unity_helper) + assert_equal(5, @cmock_generator_plugin_expect.priority) end it "not include any additional include files" do diff --git a/test/unit/cmock_generator_plugin_expect_b_test.rb b/test/unit/cmock_generator_plugin_expect_b_test.rb index 47b0c6fa..031d246d 100644 --- a/test/unit/cmock_generator_plugin_expect_b_test.rb +++ b/test/unit/cmock_generator_plugin_expect_b_test.rb @@ -26,8 +26,8 @@ end it "have set up internal priority on init" do - assert_equal(nil, @cmock_generator_plugin_expect.unity_helper) - assert_equal(5, @cmock_generator_plugin_expect.priority) + assert_nil(@cmock_generator_plugin_expect.unity_helper) + assert_equal(5, @cmock_generator_plugin_expect.priority) end it "not include any additional include files" do