Test uniformity (speeduino#1352)

* Protect redefinition of _countof()

* Rename unit test file.

* Reorder test code to remove unnecessary #includes

* Tests: remove forward declare headers

* Follow convention - rename main test files "main.cpp"

* Prevent division by zero when staging is enabled.

* Put common device test code into device_test_harness.h

* Tests wait for Serial monitor to connect instead of 2s delay

* Explicitly set the half-sync flag (tests fail on native platform)

* Prevent buffer overflow - increase size of buffer

Author: adbancroft

speeduino/utilities.h

@@ -41,7 +41,9 @@ int16_t ProgrammableIOGetData(uint16_t index);
 #define UNUSED(x) (void)(x)
 #endif
 
+#if !defined(_countof)
 #define _countof(x) (sizeof(x) / sizeof (x[0]))
+#endif
 #define _end_range_address(array) (array + _countof(array))
 #define _end_range_byte_address(array) (((byte*)array) + sizeof(array))
 

test/test_secondary/test_main.cpp test/device_test_harness.htest/test_secondary/test_main.cpp renamed to test/device_test_harness.h

@@ -1,35 +1,39 @@
-#include <Arduino.h>
-#include <unity.h>
-#include <avr/sleep.h>
-
-#define UNITY_EXCLUDE_DETAILS
+#pragma once
 
-extern void test_calculateSecondaryFuel(void);
-extern void test_calculateSecondarySpark(void);
+#if !defined(NATIVE_BOARD)
 
+#include <unity.h>
+#include <Arduino.h>
+#if defined(SIMULATOR)
+#include <avr/sleep.h>
+#endif
 
-void setup()
+void setup(void (*runAllTests)(void))
 {
     pinMode(LED_BUILTIN, OUTPUT);
 
-    // NOTE!!! Wait for >2 secs
-    // if board doesn't support software reset via Serial.DTR/RTS
-#if !defined(SIMULATOR)
-    delay(2000);
-#endif
+    // Wait for Serial Monitor connection
+    while (!Serial) {
+        ; 
+    }
 
     UNITY_BEGIN();    // IMPORTANT LINE!
 
-    test_calculateSecondaryFuel();
-    test_calculateSecondarySpark();
+    runAllTests();
 
     UNITY_END(); // stop unit testing
 
 #if defined(SIMULATOR)       // Tell SimAVR we are done
     cli();
     sleep_enable();
     sleep_cpu();
-#endif      
+#endif     
+}
+
+#define DEVICE_TEST(testRunner) \
+void setup() \
+{ \
+    setup(testRunner); \
 }
 
 void loop()
@@ -39,4 +43,7 @@ void loop()
     delay(250);
     digitalWrite(LED_BUILTIN, LOW);
     delay(250);
-}
+}
+#else
+#define DEVICE_TEST(testRunner)
+#endif

…t/test_decoders/FordST170/ForsdST170.cpp …st/test_decoders/FordST170/FordST170.cpptest/test_decoders/FordST170/ForsdST170.cpp renamed to test/test_decoders/FordST170/FordST170.cpp test/test_decoders/FordST170/ForsdST170.cpp renamed to test/test_decoders/FordST170/FordST170.cpp

@@ -1,7 +1,6 @@
 #include <decoders.h>
 #include <globals.h>
 #include <unity.h>
-#include "FordST170.h"
 #include "scheduler.h"
 #include "schedule_calcs.h"
 #include "../../test_utils.h"

test/test_decoders/FordST170/FordST170.h

@@ -1,7 +1,6 @@
 #include <decoders.h>
 #include <globals.h>
 #include <unity.h>
-#include "test_ngc.h"
 #include "scheduler.h"
 #include "schedule_calcs.h"
 #include "../../test_utils.h"

test/test_decoders/NGC/test_ngc.cpp

@@ -1,7 +1,6 @@
 #include <decoders.h>
 #include <globals.h>
 #include <unity.h>
-#include "Nissan360.h"
 #include "scheduler.h"
 #include "schedule_calcs.h"
 #include "../../test_utils.h"

test/test_decoders/NGC/test_ngc.h

@@ -1,7 +1,6 @@
 #include <decoders.h>
 #include <globals.h>
 #include <unity.h>
-#include "dual_wheel.h"
 #include "schedule_calcs.h"
 #include "../../test_utils.h"