Tests moved to IoAbstractions SimpleTest

Author: dave

tests/taskMgrTests/HighThroughputTestCases.cpp

@@ -59,8 +59,7 @@ class HighThroughputFixture : public UnitTestExecutor {
             // we then compare it in order, obviously millis tick slower than micros
             if(currentTaskMicros < prevTaskMicros && (prevTaskMicros - currentTaskMicros) > 1000) {
                 inOrder = false;
-                Serial.print("Failed prev "); Serial.print(prevTaskMicros);
-                Serial.print(", current ");Serial.println(currentTaskMicros);
+                serdebugF4("Failed prev ", prevTaskMicros, ", current ", currentTaskMicros);
             }
 
             // get the next item and store this micros for next compare.
@@ -85,23 +84,23 @@ testF(HighThroughputFixture, taskManagerHighThroughputTest) {
     char slotData[32];
     clearCounts();
 
-    Serial.print("Dumping threads"); Serial.println(taskManager.checkAvailableSlots(slotData, sizeof slotData));
+    serdebugF2("Dumping threads", taskManager.checkAvailableSlots(slotData, sizeof slotData));
 
     taskManager.scheduleFixedRate(10, testCall1);
     taskManager.scheduleFixedRate(100, testCall2);
     taskManager.scheduleFixedRate(250, testCall3, TIME_MICROS);
     taskManager.scheduleOnce(1, testCall4, TIME_SECONDS);
     taskManager.scheduleOnce(10, testCall5, TIME_SECONDS);
 
-    Serial.print("Dumping threads"); Serial.println(taskManager.checkAvailableSlots(slotData, sizeof slotData));
+    serdebugF2("Dumping threads", taskManager.checkAvailableSlots(slotData, sizeof slotData));
 
     unsigned long start = millis();
     while(counts[5] < 10 && (millis() - start) < 25000) {
         taskManager.yieldForMicros(10000);
         assertTasksAreInOrder();
     }
 
-    Serial.print("Dumping threads"); Serial.println(taskManager.checkAvailableSlots(slotData, sizeof slotData));
+    serdebugF2("Dumping threads", taskManager.checkAvailableSlots(slotData, sizeof slotData));
 
     assertEquals(10, counts[5]); 	// should be 10 runs as it's manually repeating
     assertMoreThan(140, counts[1]);		// should be at least 140 runs, scheduled every 100 millis,
@@ -167,7 +166,7 @@ testF(HighThroughputFixture, testCancellingsTasksWithinAnotherTask) {
     // in this case we dump the queue, something is wrong.
     if (counts[1] == storedCount1) {
         dumpTasks();
-        Serial.print("Dumping threads"); Serial.println(taskManager.checkAvailableSlots(slotData, sizeof slotData));
+        serdebugF2("Dumping threads", taskManager.checkAvailableSlots(slotData, sizeof slotData));
     }
 
     assertNotEquals(counts[1], storedCount1);

tests/taskMgrTests/InterruptTestCases.cpp

@@ -43,7 +43,7 @@ class MockedInterruptAbstraction : public InterruptAbstraction {
 void intHandler(pinid_t pin) {
     scheduled = true;
     microsExecuted = micros();
-    count++;
+    count1++;
     pinNo = pin;
 }
 

tests/taskMgrTests/taskManagerCoreTests.cpp

@@ -7,15 +7,13 @@
 using namespace SimpleTest;
 
 void dumpTasks() {
-    Serial.println("Dumping the task queue contents");
+    serdebugF("Dumping the task queue contents");
     TimerTask* task = taskManager.getFirstTask();
     while(task) {
-        Serial.print(" - Task schedule "); Serial.print(task->microsFromNow());
-        Serial.print(task->isRepeating() ? " Repeating ":" Once ");
-        Serial.print(task->isMicrosSchedule() ? " Micros " : " Millis ");
-        Serial.println(task->isInUse() ? " InUse":" Free");
+        serdebugF4(" - Task schedule ", task->microsFromNow(), task->isRepeating() ? " Repeating ":" Once ", (task->isMicrosSchedule() ? " Micros " : " Millis "));
+        serdebug(task->isInUse() ? " InUse":" Free");
         if(task->getNext() == task) {
-            Serial.println("!!!Infinite loop found!!!");
+            serdebugF("!!!Infinite loop found!!!");
         }
         task = task->getNext();
     }
@@ -25,12 +23,12 @@ void dumpTasks() {
 bool scheduled = false;
 bool scheduled2ndJob = false;
 unsigned long microsStarted = 0, microsExecuted = 0, microsExecuted2ndJob = 0;
-int count = 0, count2 = 0;
+int count1 = 0, count2 = 0;
 uint8_t pinNo = 0;
 
 void recordingJob() {
     microsExecuted = micros();
-    count++;
+    count1++;
     scheduled = true;
 }
 
@@ -149,7 +147,7 @@ testF(TimingHelpFixture, scheduleFixedRateTestCase) {
     assertMoreThan((uint32_t) 19, timeTaken);
 
     // now make sure that we got in the right ball park of calls.
-    assertMoreThan(1, count);
+    assertMoreThan(1, count1);
     assertMoreThan(150, count2);
 }
 
@@ -161,7 +159,7 @@ testF(TimingHelpFixture, cancellingAJobAfterCreation) {
     // now check the task registration in detail.
     assertNotEquals(taskId, TASKMGR_INVALIDID);
     TimerTask* task = taskManager.getFirstTask();
-    assertNotEquals(task, NULL);
+    assertNotEquals(task, nullptr);
     assertTrue(task->isMillisSchedule());
     assertFalse(task->isMicrosSchedule());
     assertMoreThan(8000UL, task->microsFromNow());

tests/taskMgrTests/taskMgrTests.ino tests/taskMgrTests/taskMgrTests.cpptests/taskMgrTests/taskMgrTests.ino renamed to tests/taskMgrTests/taskMgrTests.cpp

@@ -1,13 +1,13 @@
 
-#include <Arduino.h>
+#include <IoAbstraction.h>
 #include <testing/SimpleTest.h>
-#include <Wire.h>
 
 using namespace SimpleTest;
 
+IOLOG_MBED_PORT_IF_NEEDED(USBTX, USBRX)
+
 void setup() {
-    Serial.begin(115200);
-    while (!Serial);
+    IOLOG_START_SERIAL
     startTesting();
 }
 

tests/taskMgrTests/test_utils.h

@@ -15,7 +15,7 @@ extern bool scheduled2ndJob;
 extern unsigned long microsStarted;
 extern unsigned long microsExecuted;
 extern unsigned long microsExecuted2ndJob;
-extern int count;
+extern int count1;
 extern int count2;
 extern uint8_t pinNo;
 
@@ -48,7 +48,7 @@ class TimingHelpFixture : public SimpleTest::UnitTestExecutor {
         scheduled = scheduled2ndJob = false;
         microsExecuted = microsExecuted2ndJob = 0;
         microsStarted = micros();
-        count = count2 = 0;
+        count1 = count2 = 0;
     }
 
     void assertThatTaskRunsOnTime(uint32_t minExpected, uint32_t allowanceOver) {
@@ -63,11 +63,9 @@ class TimingHelpFixture : public SimpleTest::UnitTestExecutor {
         assertTrue(scheduled);
 
         // print information to help with diagnostics.
-        Serial.print("Scheduled: "); Serial.print(microsStarted);
-        Serial.print(" ExecAt: "); Serial.print(microsExecuted);
+        serdebugF4("Scheduled: ", microsStarted, " exec:", microsExecuted);
         unsigned long howLong = microsExecuted - microsStarted;
-        Serial.print(" difference "); Serial.print(howLong);
-        Serial.print(" - expected "); Serial.println(minExpected);
+        serdebugF4(" difference ", howLong, "  expected:", minExpected);
 
         // check that it has been executed within the allowable window.
         unsigned long minRange = (minExpected < allowanceOver) ? 0 : (minExpected - allowanceOver);
@@ -81,11 +79,9 @@ class TimingHelpFixture : public SimpleTest::UnitTestExecutor {
         // have been run first (ie the shorter task)
 
         // print information to help with diagnostics.
-        Serial.print("Scheduled: "); Serial.print(microsStarted);
-        Serial.print(" ExecAt: "); Serial.print(microsExecuted2ndJob);
+        serdebugF4("Scheduled: ", microsStarted, " ExecAt: ", microsExecuted2ndJob);
         long howLong = microsExecuted2ndJob - microsStarted;
-        Serial.print(" difference "); Serial.print(howLong);
-        Serial.print(" - expected "); Serial.println(minExpected);
+        serdebugF4(" difference ", howLong, " - expected ", minExpected);
 
         assertTrue(scheduled2ndJob);
         unsigned long minRange = (minExpected < allowanceOver) ? 0 : (minExpected - allowanceOver);
@@ -96,14 +92,14 @@ class TimingHelpFixture : public SimpleTest::UnitTestExecutor {
 
     void assertTasksSpacesTaken(int taken) {
         char sz[32];
-        int count = 0;
+        int cnt = 0;
         char* taskData = taskManager.checkAvailableSlots(sz, sizeof sz);
         while(*taskData) {
-            if(*taskData != 'F') count++;
+            if(*taskData != 'F') cnt++;
             ++taskData;
         }
-        Serial.print("Tasks free "); Serial.println(count);
-        assertEquals(taken, count);
+        serdebugF2("Tasks free ", cnt);
+        assertEquals(taken, cnt);
     }
 };
 

tests/timerInterruptTest/timerInterruptTest.cpp

@@ -3,6 +3,8 @@
 
 using namespace SimpleTest;
 
+IOLOG_MBED_PORT_IF_NEEDED(USBTX, USBRX)
+
 HardwareTimer* myTimer;
 int taskExec = 0;
 
@@ -34,8 +36,7 @@ void timerHasChanged() {
 }
 
 void setup() {
-    Serial.begin(115200);
-    while (!Serial);
+    IOLOG_START_SERIAL
     startTesting();
 
 #if defined(TIM1)
@@ -44,7 +45,6 @@ void setup() {
     TIM_TypeDef *Instance = TIM2;
 #endif
 
-    // Instantiate HardwareTimer object. Thanks to 'new' instanciation, HardwareTimer is not destructed when setup() function is finished.
     myTimer = new HardwareTimer(Instance);
     pinMode(LED_BUILTIN, OUTPUT);
     myTimer->setOverflow(250, HERTZ_FORMAT);