From f2ce354f99fbbbb5076ba7b1bad497f3362eff39 Mon Sep 17 00:00:00 2001 From: mvandervoord Date: Wed, 10 Nov 2010 16:15:09 +0000 Subject: [PATCH] - cleaned up test runner problems. again getting ready to support parameterized tests git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@103 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e --- auto/generate_test_runner.rb | 71 +++++++++++++++++++----------------- src/unity.c | 20 ++++++++++ src/unity.h | 9 ++--- src/unity_internals.h | 1 + 4 files changed, 62 insertions(+), 39 deletions(-) diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index 2985b65..708d806 100644 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -50,7 +50,6 @@ class UnityTestRunnerGenerator create_externs(output, tests, used_mocks) create_mock_management(output, used_mocks) create_suite_setup_and_teardown(output) - create_runtest(output, used_mocks) create_reset(output, used_mocks) create_main(output, input_file, tests) end @@ -67,10 +66,10 @@ class UnityTestRunnerGenerator input_file.rewind source_raw = input_file.read - source_scrubbed = source_raw.gsub(/\/\/.*$/, '') #remove line comments - source_scrubbed = source_scrubbed.gsub(/\/\*.*?\*\//m, '') #remove block comments - lines = source_scrubbed.split(/(^\s*\#.*$) # Treat preprocessor directives as a logical line - | (;|\{|\}) /x) # Match ;, {, and } as end of lines + source_scrubbed = source_raw.gsub(/\/\/.*$/, '') # remove line comments + source_scrubbed = source_scrubbed.gsub(/\/\*.*?\*\//m, '') # remove block comments + lines = source_scrubbed.split(/(^\s*\#.*$) # Treat preprocessor directives as a logical line + | (;|\{|\}) /x) # Match ;, {, and } as end of lines lines.each_with_index do |line, index| if line =~ /^\s*void\s+test(.*?)\s*\(\s*void\s*\)/ @@ -113,6 +112,8 @@ class UnityTestRunnerGenerator def create_header(output, mocks) output.puts('/* AUTOGENERATED FILE. DO NOT EDIT. */') + create_runtest(output, mocks) + output.puts("\n//=======Automagically Detected Files To Include=====") output.puts("#include \"#{@options[:framework].to_s}.h\"") output.puts('#include "cmock.h"') unless (mocks.empty?) @options[:includes].flatten.uniq.compact.each do |includes| @@ -124,30 +125,27 @@ class UnityTestRunnerGenerator mocks.each do |mock| output.puts("#include \"#{mock.gsub('.h','')}.h\"") end - output.puts('') - output.puts('char MessageBuffer[50];') if @options[:enforce_strict_ordering] + output.puts('') output.puts('int GlobalExpectCount;') output.puts('int GlobalVerifyOrder;') output.puts('char* GlobalOrderError;') end end - def create_externs(output, tests, mocks) - output.puts('') + output.puts("\n//=======External Functions This Runner Calls=====") output.puts("extern void setUp(void);") output.puts("extern void tearDown(void);") - output.puts('') tests.each do |test| output.puts("extern void #{test[:name]}(void);") end output.puts('') end - def create_mock_management(output, mocks) unless (mocks.empty?) + output.puts("\n//=======Mock Management=====") output.puts("static void CMock_Init(void)") output.puts("{") if @options[:enforce_strict_ordering] @@ -178,12 +176,14 @@ class UnityTestRunnerGenerator def create_suite_setup_and_teardown(output) unless (@options[:suite_setup].nil?) + output.puts("\n//=======Suite Setup=====") output.puts("static int suite_setup(void)") output.puts("{") output.puts(@options[:suite_setup]) output.puts("}") end unless (@options[:suite_teardown].nil?) + output.puts("\n//=======Suite Teardown=====") output.puts("static int suite_teardown(int num_failures)") output.puts("{") output.puts(@options[:suite_teardown]) @@ -193,27 +193,35 @@ class UnityTestRunnerGenerator def create_runtest(output, used_mocks) cexception = @options[:plugins].include? :cexception - output.puts("static void runTest(UnityTestFunction test)") - output.puts("{") - output.puts(" if (TEST_PROTECT())") - output.puts(" {") - output.puts(" CEXCEPTION_T e;") if cexception - output.puts(" Try {") if cexception - output.puts(" CMock_Init();") unless (used_mocks.empty?) - output.puts(" setUp();") - output.puts(" test();") - output.puts(" CMock_Verify();") unless (used_mocks.empty?) - output.puts(" } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, \"Unhandled Exception!\"); }") if cexception - output.puts(" }") - output.puts(" CMock_Destroy();") unless (used_mocks.empty?) - output.puts(" if (TEST_PROTECT() && !TEST_IS_IGNORED)") - output.puts(" {") - output.puts(" tearDown();") - output.puts(" }") - output.puts("}") + va_args1 = @options[:use_param_tests] ? ', ...' : '' + va_args2 = @options[:use_param_tests] ? '__VA_ARGS__' : '' + output.puts("\n//=======Test Runner Used To Run Each Test Below=====") + output.puts("#define RUN_TEST(TestFunc, TestLineNum#{va_args1}) \\") + output.puts("{ \\") + output.puts(" Unity.CurrentTestName = #TestFunc; \\") + output.puts(" Unity.CurrentTestLineNumber = TestLineNum; \\") + output.puts(" Unity.NumberOfTests++; \\") + output.puts(" if (TEST_PROTECT()) \\") + output.puts(" { \\") + output.puts(" CEXCEPTION_T e; \\") if cexception + output.puts(" Try { \\") if cexception + output.puts(" CMock_Init(); \\") unless (used_mocks.empty?) + output.puts(" setUp(); \\") + output.puts(" TestFunc(#{va_args2}); \\") + output.puts(" CMock_Verify(); \\") unless (used_mocks.empty?) + output.puts(" } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, \"Unhandled Exception!\"); } \\") if cexception + output.puts(" } \\") + output.puts(" CMock_Destroy(); \\") unless (used_mocks.empty?) + output.puts(" if (TEST_PROTECT() && !TEST_IS_IGNORED) \\") + output.puts(" { \\") + output.puts(" tearDown(); \\") + output.puts(" } \\") + output.puts(" UnityConcludeTest(); \\") + output.puts("}\n") end def create_reset(output, used_mocks) + output.puts("\n//=======Test Reset Option=====") output.puts("void resetTest()") output.puts("{") output.puts(" CMock_Verify();") unless (used_mocks.empty?) @@ -225,15 +233,12 @@ class UnityTestRunnerGenerator end def create_main(output, filename, tests) - output.puts() - output.puts() + output.puts("\n\n//=======MAIN=====") output.puts("int main(void)") output.puts("{") output.puts(" suite_setup();") unless @options[:suite_setup].nil? output.puts(" Unity.TestFile = \"#{filename}\";") output.puts(" UnityBegin();") - output.puts() - output.puts(" // RUN_TEST calls runTest") tests.each do |test| output.puts(" RUN_TEST(#{test[:name]}, #{test[:line_number]});") end diff --git a/src/unity.c b/src/unity.c index cdf282f..d7df8ef 100644 --- a/src/unity.c +++ b/src/unity.c @@ -790,6 +790,26 @@ void UnityIgnore(const char* msg, const UNITY_LINE_TYPE line) UNITY_IGNORE_AND_BAIL; } +//----------------------------------------------- +void setUp(void); +void tearDown(void); +void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum) +{ + Unity.CurrentTestName = FuncName; + Unity.CurrentTestLineNumber = FuncLineNum; + Unity.NumberOfTests++; + if (TEST_PROTECT()) + { + setUp(); + Func(); + } + if (TEST_PROTECT() && !(Unity.CurrentTestIgnored)) + { + tearDown(); + } + UnityConcludeTest(); +} + //----------------------------------------------- void UnityBegin(void) { diff --git a/src/unity.h b/src/unity.h index efdc2ae..da6dd99 100644 --- a/src/unity.h +++ b/src/unity.h @@ -40,12 +40,9 @@ #define TEST_ABORT() {longjmp(Unity.AbortFrame, 1);} -#define RUN_TEST(func, line_num) \ - Unity.CurrentTestName = #func; \ - Unity.CurrentTestLineNumber = line_num; \ - Unity.NumberOfTests++; \ - runTest(func); \ - UnityConcludeTest(); +#ifndef RUN_TEST +#define RUN_TEST(func, line_num) UnityDefaultTestRun(func, #func, line_num) +#endif #define TEST_LINE_NUM (Unity.CurrentTestLineNumber) #define TEST_IS_IGNORED (Unity.CurrentTestIgnored) diff --git a/src/unity_internals.h b/src/unity_internals.h index c9c7dc0..e95bc36 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -189,6 +189,7 @@ extern struct _Unity Unity; void UnityBegin(void); int UnityEnd(void); void UnityConcludeTest(void); +void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum); //------------------------------------------------------- // Test Output