Change implementation to distinct classes

Author: hlovdal

cpp/unittest/ArduinoUnitTests.cpp

@@ -1,5 +1,6 @@
 #include "ArduinoUnitTests.h"
 
-Test* Test::sSetup = 0;
-Test* Test::sTeardown = 0;
+TestSetup *TestSetup::sInstance;
+TestTeardown *TestTeardown::sInstance;
+
 Test* Test::sRoot = 0;

cpp/unittest/ArduinoUnitTests.h

@@ -15,6 +15,26 @@ struct TestData {
   int result;
 };
 
+class TestSetup
+{
+  public:
+  TestSetup() {
+    sInstance = this;
+  }
+  virtual void run() {}
+  static TestSetup *sInstance;
+};
+
+class TestTeardown
+{
+  public:
+  TestTeardown() {
+    sInstance = this;
+  }
+  virtual void run() {}
+  static TestTeardown *sInstance;
+};
+
 class Test
 {
   public:
@@ -81,8 +101,6 @@ class Test
     const char* mName;
 
     // linked list structure for active tests
-    static Test* sSetup;
-    static Test* sTeardown;
     static Test* sRoot;
     Test* mNext;
 
@@ -121,13 +139,7 @@ class Test
     Test(const char* _name) : mName(_name) {
       mResult = RESULT_NONE;
       mReporter = 0;
-      if (_name == "s e t u p") {
-        sSetup = this;
-      } else if (_name == "t e a r d o w n") {
-        sTeardown = this;
-      } else {
-        append();
-      }
+      append();
     }
 
     inline void fail() { mResult = RESULT_FAIL; }
@@ -160,9 +172,9 @@ class Test
     static int run_and_report(int argc, char *argv[]) {
       // TODO: pick a reporter based on args
       ReporterTAP rep;
-      if (sSetup) sSetup->task();
+      if (TestSetup::sInstance) TestSetup::sInstance->run();
       Results results = run(&rep);
-      if (sTeardown) sTeardown->task();
+      if (TestTeardown::sInstance) TestTeardown::sInstance->run();
       return results.failed + results.skipped;
     }
 
@@ -233,25 +245,18 @@ class Test
  * related to the functionality that you are testing, for instance a LCD.
  */
 #define unittest_setup()                          \
-  struct xtest_unittest_setup : Test              \
-  {                                               \
-    xtest_unittest_setup() : Test("s e t u p"){}; \
-    void task();                                  \
-  } xtest_unittest_setup_instance;                \
-  void xtest_unittest_setup::task()
-
-#define unittest_teardown() \
-  struct xtest_unittest_teardown : Test                    \
-  {                                                        \
-    xtest_unittest_teardown() : Test("t e a r d o w n"){}; \
-    void task();                                           \
-  } xtest_unittest_teardown_instance;                      \
-  void xtest_unittest_teardown::task()
-
-// To avoid potentionally breaking existing code by re-using the Test class for
-// setup and teardown, add a "x" prefix in front of names so that it will be
-// different from code generated by the unittest macro. Also using _name
-// arguments to Test that cannot be used in the unittest macro.
+  class unittest_setup_class : public TestSetup { \
+    public:                                       \
+    virtual void run() override;                  \
+  } unittest_setup_instance;                      \
+  void unittest_setup_class::run()
+
+#define unittest_teardown()                             \
+  class unittest_teardown_class : public TestTeardown { \
+    public:                                             \
+    virtual void run() override;                        \
+  } unittest_teardown_instance;                         \
+  void unittest_teardown_class::run()
 
 #define unittest_main()                      \
   int main(int argc, char *argv[]) {         \