diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index 3314016..482b381 100644 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -206,7 +206,7 @@ class UnityTestRunnerGenerator output.puts("#define RUN_TEST_NO_ARGS") if @options[:use_param_tests] output.puts("#define RUN_TEST(TestFunc, TestLineNum#{va_args1}) \\") output.puts("{ \\") - output.puts(" Unity.CurrentTestName = #TestFunc; \\") + output.puts(" Unity.CurrentTestName = #TestFunc#{va_args2.empty? ? '' : " \"(\" ##{va_args2} \")\""}; \\") output.puts(" Unity.CurrentTestLineNumber = TestLineNum; \\") output.puts(" Unity.NumberOfTests++; \\") output.puts(" if (TEST_PROTECT()) \\") diff --git a/docs/Unity Summary.odt b/docs/Unity Summary.odt index 69ddaa8..f699661 100644 Binary files a/docs/Unity Summary.odt and b/docs/Unity Summary.odt differ diff --git a/docs/Unity Summary.pdf b/docs/Unity Summary.pdf index ad69d46..ad1a956 100644 Binary files a/docs/Unity Summary.pdf and b/docs/Unity Summary.pdf differ diff --git a/rakefile.rb b/rakefile.rb index 01f8336..19182d3 100644 --- a/rakefile.rb +++ b/rakefile.rb @@ -17,6 +17,7 @@ include RakefileHelpers DEFAULT_CONFIG_FILE = 'gcc.yml' configure_toolchain(DEFAULT_CONFIG_FILE) +desc "Test unity with it's own unit tests" task :unit do run_tests get_unit_test_files end diff --git a/test/expectdata/testsample_mock_param.c b/test/expectdata/testsample_mock_param.c index 5953a25..2f06037 100644 --- a/test/expectdata/testsample_mock_param.c +++ b/test/expectdata/testsample_mock_param.c @@ -4,7 +4,7 @@ #define RUN_TEST_NO_ARGS #define RUN_TEST(TestFunc, TestLineNum, ...) \ { \ - Unity.CurrentTestName = #TestFunc; \ + Unity.CurrentTestName = #TestFunc "(" #__VA_ARGS__ ")"; \ Unity.CurrentTestLineNumber = TestLineNum; \ Unity.NumberOfTests++; \ if (TEST_PROTECT()) \ diff --git a/test/expectdata/testsample_param.c b/test/expectdata/testsample_param.c index e59579b..8865880 100644 --- a/test/expectdata/testsample_param.c +++ b/test/expectdata/testsample_param.c @@ -4,7 +4,7 @@ #define RUN_TEST_NO_ARGS #define RUN_TEST(TestFunc, TestLineNum, ...) \ { \ - Unity.CurrentTestName = #TestFunc; \ + Unity.CurrentTestName = #TestFunc "(" #__VA_ARGS__ ")"; \ Unity.CurrentTestLineNumber = TestLineNum; \ Unity.NumberOfTests++; \ if (TEST_PROTECT()) \