Test fix up

Author: davetcc

src/MenuHistoryNavigator.h

@@ -41,6 +41,7 @@ namespace tcnav {
         MenuNavigationStore() = default;
 
         void addNavigationListener(NavigationListener* newListener);
+        void clearNavigationListeners() { navigationLister = nullptr; }
 
         void triggerNavigationListener(bool completeReset);
 

tests/tcMenuCoreTests/CoreMenuItemTests.cpp

@@ -42,12 +42,10 @@ testF(TaskManagerResettingTest, testIpAddressItem) {
 	ipItem.copyValue(sz, sizeof(sz));
 	assertStringEquals("192.168.2.201", sz);
     assertTrue(checkEditorHints(10, 13, CurrentEditorRenderingHints::EDITOR_RUNTIME_TEXT));
-	assertTrue(ipItem.isEditing());
 
 	assertEquals(0, ipItem.nextPart());
 	ipItem.copyValue(sz, sizeof(sz));
 	assertStringEquals("192.168.2.201", sz);
-	assertFalse(ipItem.isEditing());
 
 	assertTrue(isMenuRuntime(&ipItem));
 	assertFalse(isMenuBasedOnValueItem(&ipItem));

tests/tcMenuCoreTests/CoreRendererTests.cpp

@@ -84,6 +84,7 @@ void populatePropsWithDefaults(ConfigurableItemDisplayPropertiesFactory& factory
     factory.setDrawingPropertiesAllInSub(ItemDisplayProperties::COMPTYPE_ITEM, menuSub.getId(), palette3, MenuPadding(3), pointer1, 3, 10, 60, GridPosition::JUSTIFY_CENTER_NO_VALUE, MenuBorder(0));
     factory.setDrawingPropertiesForItem(ItemDisplayProperties::COMPTYPE_ITEM, menuSubAnalog.getId(), palette1, MenuPadding(6), pointer2, 3, 12, 80, GridPosition::JUSTIFY_CENTER_WITH_VALUE, MenuBorder(0));
     factory.addGridPosition(&menuVolume, GridPosition(GridPosition::DRAW_INTEGER_AS_UP_DOWN, GridPosition::JUSTIFY_TITLE_LEFT_VALUE_RIGHT, 2, 100));
+    menuMgr.getNavigationStore().clearNavigationListeners();
     menuMgr.initWithoutInput(&noRenderer, &textMenuItem1);
     taskManager.reset();
 }
@@ -274,6 +275,7 @@ testF(TaskManagerResettingTest, testBaseRendererWithDefaults) {
     factory.setDrawingPropertiesDefault(ItemDisplayProperties::COMPTYPE_ACTION, palette1, MenuPadding(4), pointer1, 1, 5, 25, GridPosition::JUSTIFY_LEFT_NO_VALUE, MenuBorder(0));
     factory.setDrawingPropertiesDefault(ItemDisplayProperties::COMPTYPE_ITEM, palette1, MenuPadding(4), pointer1, 1, 5, 20, GridPosition::JUSTIFY_TITLE_LEFT_VALUE_RIGHT, MenuBorder(0));
 
+    menuMgr.getNavigationStore().clearNavigationListeners();
     menuMgr.initWithoutInput(&renderer, &textMenuItem1);
     taskManager.reset();
 
@@ -325,13 +327,6 @@ testF(TaskManagerResettingTest, testBaseRendererWithDefaults) {
     assertTrue(checkItem(renderer.getMenuItemRecordings().getByKey(3), Coord(0, 95), Coord(320, 20), pointer1, GridPosition::DRAW_INTEGER_AS_UP_DOWN, GridPosition::JUSTIFY_TITLE_LEFT_VALUE_RIGHT, 1, &menuEnum1));
 }
 
-void selectItem(MenuItem* root, MenuItem* toSelect) {
-    while(root != nullptr) {
-        root->setActive(root == toSelect);
-        root = root->getNext();
-    }
-}
-
 testF(TaskManagerResettingTest, testScrollingWithMoreThanOneItemOnRow) {
     TestCapturingRenderer renderer(320, 100, false, pgmName);
     renderer.setTitleMode(BaseGraphicalRenderer::NO_TITLE);
@@ -344,6 +339,7 @@ testF(TaskManagerResettingTest, testScrollingWithMoreThanOneItemOnRow) {
     factory.addGridPosition(&boolItem1, GridPosition(GridPosition::DRAW_AS_ICON_ONLY, GridPosition::JUSTIFY_CENTER_WITH_VALUE, 2, 1, 1, 35));
     factory.addGridPosition(&menuSub, GridPosition(GridPosition::DRAW_AS_ICON_ONLY, GridPosition::JUSTIFY_CENTER_NO_VALUE, 2, 2, 1, 35));
 
+    menuMgr.getNavigationStore().clearNavigationListeners();
     menuMgr.initWithoutInput(&renderer, &textMenuItem1);
     taskManager.reset(); // this must be done to clear out the task created by calling initialise above.
 
@@ -362,7 +358,7 @@ testF(TaskManagerResettingTest, testScrollingWithMoreThanOneItemOnRow) {
 
     // now select an item that's off the display, it should remove the first item from the display we clear down the all the
     // states in the test renderer so we can check that we completely refreshed the display, and the first item is not drawn
-    selectItem(&textMenuItem1, &menuAnalog);
+    renderer.setActiveItem(&textMenuItem1);
     renderer.resetCommandStates();
     renderer.getMenuItemRecordings().clear();
     renderer.exec();
@@ -407,6 +403,7 @@ class DisplayDrawing : public CustomDrawing {
 
 testF(TaskManagerResettingTest, testTakeOverDisplay) {
     TestCapturingRenderer renderer(320, 100, false, pgmName);
+    menuMgr.getNavigationStore().clearNavigationListeners();
     menuMgr.initWithoutInput(&renderer, &textMenuItem1);
     DisplayDrawing drawingTest;
     renderer.setCustomDrawingHandler(&drawingTest);
@@ -438,6 +435,7 @@ testF(TaskManagerResettingTest, testListRendering) {
     ListRuntimeMenuItem runtimeItem(101, 20, testBasicRuntimeFn, nullptr);
     TestCapturingRenderer renderer(320, 100, false, pgmName);
     DisplayDrawing drawingTest;
+    menuMgr.getNavigationStore().clearNavigationListeners();
     menuMgr.initWithoutInput(&renderer, &runtimeItem);
     auto& factory = reinterpret_cast<ConfigurableItemDisplayPropertiesFactory &>(renderer.getDisplayPropertiesFactory());
     factory.setDrawingPropertiesDefault(ItemDisplayProperties::COMPTYPE_TITLE, palette1, MenuPadding(4), pointer2, 1, 10, 30, GridPosition::JUSTIFY_CENTER_NO_VALUE, MenuBorder(0));

tests/tcMenuCoreTests/LargeNumberItemTests.cpp

@@ -294,7 +294,6 @@ test(LargeNumWithNegativeNotAllowed) {
     assertTrue(checkEditorHints(5, 6, CurrentEditorRenderingHints::EDITOR_RUNTIME_TEXT));
     assertEquals(0, editable.nextPart());
 
-    assertFalse(editable.isEditing());
     editable.copyValue(sz, sizeof(sz));
     assertStringEquals("15265", sz);
 }

tests/tcMenuCoreTests/RuntimeItemTestCases.cpp

@@ -126,7 +126,6 @@ test(testTextMenuItemFromEmpty) {
 
     // ensure we can edit an empty string position
     assertEquals(uint8_t(10), textItem.beginMultiEdit());
-    assertTrue(textItem.isEditing());
     assertEquals(ALLOWABLE_CHARS_ENCODER_SIZE, textItem.nextPart());
     assertEquals(0, textItem.getPartValueAsInt());
 
@@ -204,7 +203,6 @@ test(testTextPasswordItem) {
     assertStringEquals("****", sz);
 
     assertEquals(uint8_t(5), textItem.beginMultiEdit());
-    assertTrue(textItem.isEditing());
     assertEquals(ALLOWABLE_CHARS_ENCODER_SIZE, textItem.nextPart());
     textItem.valueChanged(findPositionInEditorSet('9'));
     assertEquals(findPositionInEditorSet('9'), textItem.getPartValueAsInt());
@@ -229,7 +227,6 @@ test(testTextRuntimeItem) {
     assertStringEquals("Goodbye", sz);
 
     assertEquals(uint8_t(10), textItem.beginMultiEdit());
-    assertTrue(textItem.isEditing());
     assertEquals(ALLOWABLE_CHARS_ENCODER_SIZE, textItem.nextPart());
     assertEquals(findPositionInEditorSet('G'), textItem.getPartValueAsInt());
 
@@ -262,7 +259,6 @@ test(testTextRuntimeItem) {
     renderActivateCalled = false;
     textItem.stopMultiEdit();
     assertTrue(renderActivateCalled);
-    assertFalse(textItem.isEditing());
     textItem.copyValue(sz, sizeof(sz));
     assertStringEquals("0o1dbye", sz);
 }

tests/tcMenuCoreTests/TestCapturingRenderer.h

@@ -76,7 +76,7 @@ class TestCapturingRenderer : public BaseGraphicalRenderer {
         else widgetRecordings.add(WidgetDrawingRecord(widget, where, colorBg, colorFg));
     }
 
-    void drawMenuItem(GridPositionRowCacheEntry *entry, Coord where, Coord areaSize, bool /*drawAll*/) override {
+    void drawMenuItem(GridPositionRowCacheEntry *entry, Coord where, Coord areaSize, const DrawingFlags&) override {
         uint8_t row = entry->getPosition().getRow() + ((entry->getPosition().getGridPosition() - 1) * 100);
         auto* itemRec = menuItemRecordings.getByKey(row);
         if(itemRec) {

tests/tcMenuCoreTests/ValueItemTestCases.cpp

@@ -6,10 +6,6 @@
 
 test(testCoreAndBooleanMenuItem) {
     // these may seem overkill but the setters are bitwise so quite complex.
-    boolItem1.setActive(true);
-    assertTrue(boolItem1.isActive());
-    boolItem1.setActive(false);
-    assertFalse(boolItem1.isActive());
     assertEquals(MENUTYPE_BOOLEAN_VALUE, boolItem1.getMenuType());
 
     boolItem1.setChanged(true);

tests/tcMenuCoreTests/menuManagerTests.cpp

@@ -189,7 +189,6 @@ test(addingItemsAndMenuCallbacks) {
     menuMgrObserver.setStartReturn(true);
     auto currentMenuValue = boolItem1.getBoolean();
     menuMgr.valueChanged(2); // boolItem1
-    assertTrue(boolItem1.isActive());
     menuMgr.onMenuSelect(false);
 
     assertTrue(menuMgrObserver.didTriggerEndEdit());
@@ -211,7 +210,7 @@ test(addingItemsAndMenuCallbacks) {
     menuMgr.valueChanged(3); //  select menuEnum1
     menuMgr.onMenuSelect(false); // start edit
     assertTrue(menuMgrObserver.didTriggerStartEdit());
-    assertTrue(menuEnum1.isEditing());
+    assertTrue(&menuEnum1 == menuMgr.getCurrentEditor());
 
     menuMgr.valueChanged(1); // we are now editing, change the actual enum
     menuMgr.onMenuSelect(false); // stop editing
@@ -225,6 +224,6 @@ test(addingItemsAndMenuCallbacks) {
     menuMgr.valueChanged(3); // menuEnum1
     menuMgr.onMenuSelect(false);
     assertTrue(menuMgrObserver.didTriggerStartEdit());
-    assertFalse(menuEnum1.isEditing());
+    assertTrue(&menuEnum1 == menuMgr.getCurrentEditor());
 }