Merge pull request #226 from TcMenu/main-unity-fixes

#221 move unit tests to unity.

Author: davetcc

platformio-test.ini

@@ -3,10 +3,9 @@ platform = espressif32
 framework = arduino
 board = esp32dev
 extra_scripts = post:merge-bin.py
-test_build_src = yes
+test_build_src = true
 
 lib_deps =
-    tcMenu
     IoAbstraction
     TaskManagerIO
     tcUnicodeHelper

test/baseRemoteTests.h

@@ -3,7 +3,7 @@
 #include <RuntimeMenuItem.h>
 #include <RemoteMenuItem.h>
 #include <RemoteAuthentication.h>
-#include "fixtures_extern.h"
+#include "../tutils/fixtures_extern.h"
 #include <tcUtil.h>
 
 RENDERING_CALLBACK_NAME_INVOKE(ipMenuItemTestCb, ipAddressRenderFn, "HelloWorld", 102, NULL)
@@ -79,7 +79,7 @@ void testFloatType() {
 	menuFloatItem.clearSendRemoteNeededAll();
 	menuFloatItem.setChanged(false);
 	menuFloatItem.setFloatValue(1.001);
-	TEST_ASSERT_FLOAT_WITHIN(1.001, menuFloatItem.getFloatValue(), 0.0001);
+	TEST_ASSERT_FLOAT_WITHIN(0.0001, 1.001, menuFloatItem.getFloatValue());
 	TEST_ASSERT_TRUE(menuFloatItem.isChanged());
 	TEST_ASSERT_TRUE(menuFloatItem.isSendRemoteNeeded(0));
 	TEST_ASSERT_EQUAL(4, menuFloatItem.getDecimalPlaces());
@@ -91,23 +91,23 @@ void testFloatType() {
     //
 
     copyMenuItemNameAndValue(&menuFloatItem, sz, sizeof(sz));
-	TEST_ASSERT_EQUAL("FloatItem: 1.0010", sz);
+	TEST_ASSERT_EQUAL_STRING("FloatItem: 1.0010", sz);
 
 	menuFloatItem.setFloatValue(234.456722);
     copyMenuItemValue(&menuFloatItem, sz, sizeof(sz));
-	TEST_ASSERT_EQUAL("234.4567", sz);
+	TEST_ASSERT_EQUAL_STRING("234.4567", sz);
 
     menuFloatItem.setFloatValue(-938.4567);
     copyMenuItemValue(&menuFloatItem, sz, sizeof(sz));
-    TEST_ASSERT_EQUAL("-938.4567", sz);
+    TEST_ASSERT_EQUAL_STRING("-938.4567", sz);
 
     menuFloatItem.setFloatValue(-0.001);
     copyMenuItemValue(&menuFloatItem, sz, sizeof(sz));
-    TEST_ASSERT_EQUAL("-0.0010", sz);
+    TEST_ASSERT_EQUAL_STRING("-0.0010", sz);
 
     menuFloatItem.setFloatValue(-0.0);
     copyMenuItemValue(&menuFloatItem, sz, sizeof(sz));
-    TEST_ASSERT_EQUAL("0.0000", sz);
+    TEST_ASSERT_EQUAL_STRING("0.0000", sz);
 
     TEST_ASSERT_FALSE(isMenuRuntime(&menuFloatItem));
 	TEST_ASSERT_FALSE(isMenuBasedOnValueItem(&menuFloatItem));

test/CoreMenuItemTests.cpp …st/test_core_items/CoreMenuItemTests.cpptest/CoreMenuItemTests.cpp renamed to test/test_core_items/CoreMenuItemTests.cpp test/CoreMenuItemTests.cpp renamed to test/test_core_items/CoreMenuItemTests.cpp

@@ -1,12 +1,9 @@
 
 #include <unity.h>
 #include <RuntimeMenuItem.h>
-#include "fixtures_extern.h"
+#include "../tutils/fixtures_extern.h"
 #include <tcUtil.h>
 
-void printMenuItem(MenuItem* menuItem);
-
-
 RENDERING_CALLBACK_NAME_INVOKE(timeMenuItemTestCb, timeItemRenderFn, "Time", 103, NULL)
 RENDERING_CALLBACK_NAME_INVOKE(dateFormattedTestCb, dateItemRenderFn, "Date", 999, NULL)
 

test/DateTimeItemTestCases.cpp …est_core_items/DateTimeItemTestCases.cpptest/DateTimeItemTestCases.cpp renamed to test/test_core_items/DateTimeItemTestCases.cpp test/DateTimeItemTestCases.cpp renamed to test/test_core_items/DateTimeItemTestCases.cpp

@@ -4,7 +4,7 @@
 #include <unity.h>
 #include <RuntimeMenuItem.h>
 #include <EditableLargeNumberMenuItem.h>
-#include "fixtures_extern.h"
+#include "../tutils/fixtures_extern.h"
 #include <tcMenu.h>
 
 void dumpBuffer(LargeFixedNumber* buffer) {
@@ -69,7 +69,7 @@ void testLargeNumberGetAndSet() {
     TEST_ASSERT_EQUAL(largeNumber.getWhole(), (uint32_t)1234);
     TEST_ASSERT_EQUAL(largeNumber.getFraction(), (uint32_t)5678);
     TEST_ASSERT_FALSE(largeNumber.isNegative());
-    TEST_ASSERT_FLOAT_WITHIN(largeNumber.getAsFloat(), 1234.5678f, 0.0001f);
+    TEST_ASSERT_FLOAT_WITHIN(0.0001f, largeNumber.getAsFloat(), 1234.5678f);
 
     // now set a negative value and read it back
     largeNumber.setValue(123UL, 56UL, true);
@@ -78,7 +78,7 @@ void testLargeNumberGetAndSet() {
 	TEST_ASSERT_EQUAL(largeNumber.getWhole(), (uint32_t)123);
     TEST_ASSERT_EQUAL(largeNumber.getFraction(), (uint32_t)56);
     TEST_ASSERT_TRUE(largeNumber.isNegative());
-    TEST_ASSERT_FLOAT_WITHIN(largeNumber.getAsFloat(), -123.0056f, 0.0001f);
+    TEST_ASSERT_FLOAT_WITHIN(0.0001f, largeNumber.getAsFloat(), -123.0056f);
 
     // now set a really large value and try to read back
     largeNumber.setPrecision(5);
@@ -201,7 +201,7 @@ void testPersistLargeInteger() {
 	MockEepromAbstraction mockRom;
     menuMgr.getNavigationStore().clearNavigationListeners();
 	menuMgr.setRootMenu(&editable);
-	menuMgr.save(mockRom);
+	saveMenuItem(&mockRom, &editable);
 	dumpBuffer(editable.getLargeNumber());
 	TEST_ASSERT_EQUAL(mockRom.read8(4), (uint8_t)0);
 	TEST_ASSERT_EQUAL(mockRom.read8(5), (uint8_t)0x02);
@@ -249,7 +249,7 @@ void testLargeNumWithNegativeNotAllowed() {
     editable.setLargeNumberFromString("15234");
     TEST_ASSERT_EQUAL(editable.getLargeNumber()->getWhole(), (uint32_t)15234);
     TEST_ASSERT_EQUAL(editable.getLargeNumber()->getFraction(), (uint32_t)0);
-    TEST_ASSERT_FLOAT_WITHIN(editable.getLargeNumber()->getAsFloat(), 15234.0F, 0.00001);
+    TEST_ASSERT_FLOAT_WITHIN(0.00001F, editable.getLargeNumber()->getAsFloat(), 15234.0F);
     TEST_ASSERT_FALSE(editable.getLargeNumber()->isNegative());
 
     char sz[32];

test/LargeNumberItemTests.cpp …test_core_items/LargeNumberItemTests.cpptest/LargeNumberItemTests.cpp renamed to test/test_core_items/LargeNumberItemTests.cpp test/LargeNumberItemTests.cpp renamed to test/test_core_items/LargeNumberItemTests.cpp

@@ -3,7 +3,7 @@
 #include <RuntimeMenuItem.h>
 #include <RemoteMenuItem.h>
 #include <RemoteAuthentication.h>
-#include "fixtures_extern.h"
+#include "../tutils/fixtures_extern.h"
 #include <tcUtil.h>
 
 bool renderActivateCalled = false;

test/RuntimeItemTestCases.cpp …test_core_items/RuntimeItemTestCases.cpptest/RuntimeItemTestCases.cpp renamed to test/test_core_items/RuntimeItemTestCases.cpp test/RuntimeItemTestCases.cpp renamed to test/test_core_items/RuntimeItemTestCases.cpp

@@ -2,7 +2,7 @@
 #include <unity.h>
 #include <RuntimeMenuItem.h>
 #include <ScrollChoiceMenuItem.h>
-#include "fixtures_extern.h"
+#include "../tutils/fixtures_extern.h"
 #include <tcMenu.h>
 #include <IoLogging.h>
 
@@ -139,38 +139,38 @@ void testColorMenuItemNoAlpha() {
     TEST_ASSERT_EQUAL((uint16_t)202, colorItemNoAlpha.getId());
     TEST_ASSERT_EQUAL((uint16_t)233, colorItemNoAlpha.getEepromPosition());
     colorItemNoAlpha.copyNameToBuffer(sz, sizeof(sz));
-    TEST_ASSERT_EQUAL("RGB NoAlpha", sz);
+    TEST_ASSERT_EQUAL_STRING("RGB NoAlpha", sz);
 
     colorItemNoAlpha.setColorData(RgbColor32(100, 50, 200));
 
     colorItemNoAlpha.copyValue(sz, sizeof sz);
-    TEST_ASSERT_EQUAL("R100 G50 B200", sz);
+    TEST_ASSERT_EQUAL_STRING("R100 G50 B200", sz);
 
     TEST_ASSERT_EQUAL(3, colorItemNoAlpha.beginMultiEdit());
     TEST_ASSERT_EQUAL(255, colorItemNoAlpha.nextPart());
     colorItemNoAlpha.copyValue(sz, sizeof sz);
-    TEST_ASSERT_EQUAL("R100 G50 B200", sz);
+    TEST_ASSERT_EQUAL_STRING("R100 G50 B200", sz);
     TEST_ASSERT_TRUE(checkEditorHints(1, 4, CurrentEditorRenderingHints::EDITOR_RUNTIME_TEXT));
     colorItemNoAlpha.valueChanged(145);
     TEST_ASSERT_EQUAL(originalChangeCount + 2, colorCbCount);
 
     TEST_ASSERT_EQUAL(255, colorItemNoAlpha.nextPart());
     colorItemNoAlpha.copyValue(sz, sizeof sz);
-    TEST_ASSERT_EQUAL("R145 G50 B200", sz);
+    TEST_ASSERT_EQUAL_STRING("R145 G50 B200", sz);
     TEST_ASSERT_TRUE(checkEditorHints(6, 8, CurrentEditorRenderingHints::EDITOR_RUNTIME_TEXT));
     colorItemNoAlpha.valueChanged(222);
     TEST_ASSERT_EQUAL(originalChangeCount + 3, colorCbCount);
 
     TEST_ASSERT_EQUAL(255, colorItemNoAlpha.nextPart());
     colorItemNoAlpha.copyValue(sz, sizeof sz);
-    TEST_ASSERT_EQUAL("R145 G222 B200", sz);
+    TEST_ASSERT_EQUAL_STRING("R145 G222 B200", sz);
     TEST_ASSERT_TRUE(checkEditorHints(11, 14, CurrentEditorRenderingHints::EDITOR_RUNTIME_TEXT));
     colorItemNoAlpha.valueChanged(1);
     TEST_ASSERT_EQUAL(originalChangeCount + 4, colorCbCount);
 
     TEST_ASSERT_EQUAL(0, colorItemNoAlpha.nextPart());
     colorItemNoAlpha.copyValue(sz, sizeof sz);
-    TEST_ASSERT_EQUAL("R145 G222 B1", sz);
+    TEST_ASSERT_EQUAL_STRING("R145 G222 B1", sz);
 }
 
 RENDERING_CALLBACK_NAME_INVOKE(colorItemWithAlphaFn, rgbAlphaItemRenderFn, "RGB Alpha", 333, myCountingCallback);
@@ -182,27 +182,27 @@ void testColorMenuItemWithAlphaAndFn() {
     char sz[25];
     TEST_ASSERT_EQUAL((uint16_t)202, colorItemWithAlpha.getId());
     colorItemWithAlpha.copyNameToBuffer(sz, sizeof(sz));
-    TEST_ASSERT_EQUAL("RGB Alpha", sz);
+    TEST_ASSERT_EQUAL_STRING("RGB Alpha", sz);
 
     colorItemWithAlpha.setColorData(RgbColor32(100, 50, 200, 150));
 
     colorItemWithAlpha.copyValue(sz, sizeof sz);
-    TEST_ASSERT_EQUAL("R100 G50 B200 A150", sz);
+    TEST_ASSERT_EQUAL_STRING("R100 G50 B200 A150", sz);
 
     TEST_ASSERT_EQUAL(4, colorItemWithAlpha.beginMultiEdit());
     TEST_ASSERT_EQUAL(255, colorItemWithAlpha.nextPart());
     TEST_ASSERT_EQUAL(255, colorItemWithAlpha.nextPart());
     TEST_ASSERT_EQUAL(255, colorItemWithAlpha.nextPart());
     TEST_ASSERT_EQUAL(255, colorItemWithAlpha.nextPart());
     colorItemWithAlpha.copyValue(sz, sizeof sz);
-    TEST_ASSERT_EQUAL("R100 G50 B200 A150", sz);
+    TEST_ASSERT_EQUAL_STRING("R100 G50 B200 A150", sz);
     TEST_ASSERT_TRUE(checkEditorHints(15, 18, CurrentEditorRenderingHints::EDITOR_RUNTIME_TEXT));
     colorItemWithAlpha.valueChanged(225);
     TEST_ASSERT_EQUAL(originalChangeCount + 2, colorCbCount);
 
     TEST_ASSERT_EQUAL(0, colorItemWithAlpha.nextPart());
     colorItemWithAlpha.copyValue(sz, sizeof sz);
-    TEST_ASSERT_EQUAL("R100 G50 B200 A225", sz);
+    TEST_ASSERT_EQUAL_STRING("R100 G50 B200 A225", sz);
 }