- 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

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)
 {

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)

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