Merge pull request #108 from ianfixes/2019-01-31_fix_unittest_setup

Run unittest_setup and _teardown with every unit test

Author: ianfixes

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Removed
 
 ### Fixed
+- `unittest_setup()` and `unittest_teardown()` were not being executed for each unit test, only for the set of all tests.  My bad.
 
 ### Security
 

SampleProjects/TestSomething/test/deviceusingbytes.cpp

@@ -28,11 +28,15 @@ class FakeHayesModem : public DeviceUsingBytes {
     }
 };
 
-unittest(modem_hardware)
+GodmodeState* state = GODMODE();
+
+unittest_setup()
 {
-  GodmodeState* state = GODMODE();
   state->reset();
+}
 
+unittest(modem_hardware)
+{
   String cmd = "AT\n";
 
   FakeHayesModem m;
@@ -57,9 +61,6 @@ unittest(modem_hardware)
 
 unittest(modem_software)
 {
-  GodmodeState* state = GODMODE();
-  state->reset();
-
   bool bigEndian = false;
   bool flipLogic = false;
   SoftwareSerial ss(1, 2, flipLogic);

SampleProjects/TestSomething/test/godmode.cpp

@@ -1,10 +1,15 @@
 #include <ArduinoUnitTests.h>
 #include <Arduino.h>
 
-unittest(millis_micros_and_delay)
+GodmodeState* state = GODMODE();
+
+unittest_setup()
 {
-  GodmodeState* state = GODMODE();
   state->reset();
+}
+
+unittest(millis_micros_and_delay)
+{
   assertEqual(0, millis());
   assertEqual(0, micros());
   delay(3);
@@ -17,8 +22,6 @@ unittest(millis_micros_and_delay)
 
 unittest(random)
 {
-  GodmodeState* state = GODMODE();
-  state->reset();
   randomSeed(1);
   assertEqual(state->seed, 1);
 
@@ -36,8 +39,6 @@ unittest(random)
 
 unittest(pins)
 {
-  GodmodeState* state = GODMODE();
-  state->reset();
   pinMode(1, OUTPUT);  // this is a no-op in unit tests.  it's just here to prove compilation
   digitalWrite(1, HIGH);
   assertEqual(HIGH, state->digitalPin[1]);
@@ -65,9 +66,6 @@ unittest(pins)
 
 unittest(pin_read_history)
 {
-  GodmodeState* state = GODMODE();
-  state->reset();
-
   int future[6] = {33, 22, 55, 11, 44, 66};
   state->analogPin[1].fromArray(future, 6);
   for (int i = 0; i < 6; ++i)
@@ -92,8 +90,6 @@ unittest(pin_read_history)
 
 unittest(pin_write_history)
 {
-  GodmodeState *state = GODMODE();
-  state->reset();
   int numMoved;
 
   // history for digital pin
@@ -162,8 +158,6 @@ unittest(pin_write_history)
 }
 
 unittest(spi) {
-  GodmodeState *state = GODMODE();
-  state->reset();
   assertEqual("", state->spi.dataIn);
   assertEqual("", state->spi.dataOut);
 
@@ -215,7 +209,6 @@ unittest(spi) {
 
   unittest(does_nothing_if_no_data)
   {
-      GodmodeState* state = GODMODE();
       int myPin = 3;
       state->serialPort[0].dataIn = "";
       state->serialPort[0].dataOut = "";
@@ -227,7 +220,6 @@ unittest(spi) {
 
   unittest(keeps_pin_low_and_acks)
   {
-      GodmodeState* state = GODMODE();
       int myPin = 3;
       state->serialPort[0].dataIn = "0";
       state->serialPort[0].dataOut = "";
@@ -240,7 +232,6 @@ unittest(spi) {
 
   unittest(flips_pin_high_and_acks)
   {
-      GodmodeState* state = GODMODE();
       int myPin = 3;
       state->serialPort[0].dataIn = "1";
       state->serialPort[0].dataOut = "";
@@ -253,7 +244,6 @@ unittest(spi) {
 
   unittest(two_flips)
   {
-      GodmodeState* state = GODMODE();
       int myPin = 3;
       state->serialPort[0].dataIn = "10junk";
       state->serialPort[0].dataOut = "";

SampleProjects/TestSomething/test/setup_and_teardown.cpp

@@ -70,4 +70,11 @@ unittest(add)
   assertEqual("11 + 22 = 33", lcd_p->s);
 }
 
+unittest(add_again)
+{
+  int result = c->add(33, 44);
+  assertEqual(77, result);
+  assertEqual("33 + 44 = 77", lcd_p->s);
+}
+
 unittest_main()

cpp/unittest/ArduinoUnitTests.h

@@ -154,7 +154,9 @@ class Test
         p->mReporter = reporter;
         TestData t1 = {p->name(), p->result()};
         if (reporter) reporter->onTestStart(t1);
+        if (TestSetup::sInstance) TestSetup::sInstance->run();
         p->test();
+        if (TestTeardown::sInstance) TestTeardown::sInstance->run();
         if (p->mResult == RESULT_PASS) ++results.passed;
         if (p->mResult == RESULT_FAIL) ++results.failed;
         if (p->mResult == RESULT_SKIP) ++results.skipped;
@@ -172,9 +174,7 @@ class Test
     static int run_and_report(int argc, char *argv[]) {
       // TODO: pick a reporter based on args
       ReporterTAP rep;
-      if (TestSetup::sInstance) TestSetup::sInstance->run();
       Results results = run(&rep);
-      if (TestTeardown::sInstance) TestTeardown::sInstance->run();
       return results.failed + results.skipped;
     }