#221 move unit tests to unity, interim update to fix build.

Author: davetcc

test/test_core_items/test_main.cpp

@@ -1,7 +1,8 @@
 #include <unity.h>
 #include <tcMenu.h>
 #include "../tutils/fixtures_extern.h"
-#include "../tutils/tcMenuFixtures.h"
+#include <tcm_test/testFixtures.h>
+#include "../tutils/tcMenuFixturesExtra.h"
 
 // core menu item tests
 void testIpAddressItem();

test/test_menumgr/tcMenuCoreTests.cpp

@@ -9,8 +9,6 @@
 void myActionCb(int id);
 #define PRESSMECALLBACK myActionCb
 
-#include <tcm_test/testFixtures.h>
-
 const char *uuid1 = "07cd8bc6-734d-43da-84e7-6084990becfc";
 const char *uuid2 = "07cd8bc6-734d-43da-84e7-6084990becfd";
 const char *uuid3 = "07cd8bc6-734d-43da-84e7-6084990becfe";

test/test_menumgr/test_main.cpp

@@ -1,7 +1,8 @@
 #include <unity.h>
 #include <tcMenu.h>
-#include "../tutils/tcMenuFixtures.h"
 #include "../tutils/fixtures_extern.h"
+#include "../tutils/tcMenuFixturesExtra.h"
+#include <tcm_test/testFixtures.h>
 
 // core tests
 void testTcUtilGetParentAndVisit();

test/test_rendering/test_main.cpp

@@ -1,9 +1,10 @@
 #include <unity.h>
 #include <tcMenu.h>
 #include "../tutils/fixtures_extern.h"
-#include "../tutils/tcMenuFixtures.h"
+#include "../tutils/tcMenuFixturesExtra.h"
 #include "baseDialogTests.h"
 #include "CoreRendererTests.h"
+#include <tcm_test/testFixtures.h>
 
 void setup() {
     menuMgr.initWithoutInput(&noRenderer, &menuVolume);
@@ -29,4 +30,33 @@ void setup() {
 }
 
 void loop() {
-}
+}
+
+bool renderActivateCalled = false;
+
+int testBasicRuntimeFn(RuntimeMenuItem* item, uint8_t row, RenderFnMode mode, char* buffer, int bufferSize) {
+    switch (mode) {
+        case RENDERFN_NAME: {
+            if (row < 10) {
+                strcpy(buffer, "name");
+                fastltoa(buffer, row, 3, NOT_PADDED, bufferSize);
+            }
+            else {
+                strcpy(buffer, "hello");
+            }
+            break;
+        }
+        case RENDERFN_VALUE:
+            ltoaClrBuff(buffer, row, row, NOT_PADDED, bufferSize);
+            break;
+        case RENDERFN_EEPROM_POS:
+            return 44;
+        case RENDERFN_INVOKE:
+            renderActivateCalled = true;
+            break;
+        default: break;
+    }
+    return true;
+}
+
+NoRenderer noRenderer;

test/tutils/tcMenuFixtures.h test/tutils/tcMenuFixturesExtra.htest/tutils/tcMenuFixtures.h renamed to test/tutils/tcMenuFixturesExtra.h

@@ -1,5 +1,5 @@
-#ifndef _TCMENU_FIXTURES_H_
-#define _TCMENU_FIXTURES_H_
+#ifndef _TCMENU_FIXTURES_LOCAL_H_
+#define _TCMENU_FIXTURES_LOCAL_H_
 
 #include "tcUtil.h"
 #include "MenuItems.h"