Skip to content

Commit f1b5a96

Browse files
author
dave
committed
Very minor fixes to unit tests to catch up with other changes, all tests passed on AVR.
1 parent 7ca95dd commit f1b5a96

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

tests/tcMenuCoreTests/RuntimeItemTestCases.cpp

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -268,28 +268,15 @@ void myActionCb(int id) {
268268
actionCbCount++;
269269
}
270270

271-
RENDERING_CALLBACK_NAME_INVOKE(rtActionMenuFn, backSubItemRenderFn, "Lights", 235, myActionCb)
272-
ActionMenuItem rtActionItem(101, rtActionMenuFn);
273-
274271
test(testActionMenuItem) {
275272
char sz[20];
276273
menuPressMe.copyNameToBuffer(sz, sizeof(sz));
277274
assertStringCaseEqual("Press me", sz);
278-
assertTrue(isMenuRuntime(&menuPressMe));
275+
assertTrue(!isMenuRuntime(&menuPressMe));
279276
assertTrue(menuPressMe.getMenuType() == MENUTYPE_ACTION_VALUE);
280277
assertEqual((uint16_t)7, menuSub.getId());
281278
assertEqual((uint16_t)-1, menuSub.getEepromPosition());
282279
auto oldCbCount = actionCbCount;
283-
menuPressMe.runCallback();
284-
assertEqual(oldCbCount + 1, actionCbCount);
285-
286-
rtActionItem.copyNameToBuffer(sz, sizeof(sz));
287-
assertStringCaseEqual("Lights", sz);
288-
assertTrue(isMenuRuntime(&rtActionItem));
289-
assertTrue(rtActionItem.getMenuType() == MENUTYPE_ACTION_VALUE);
290-
assertEqual((uint16_t)101, rtActionItem.getId());
291-
assertEqual((uint16_t)235, rtActionItem.getEepromPosition());
292-
oldCbCount = actionCbCount;
293-
rtActionItem.runCallback();
280+
menuPressMe.triggerCallback();
294281
assertEqual(oldCbCount + 1, actionCbCount);
295282
}

tests/tcMenuCoreTests/ScrollChoiceMenuItemTests.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ test(testValueAtPositionEeeprom) {
5353

5454
eeprom.serDebugContents(0, 35);
5555

56-
ScrollChoiceMenuItem choice(101, enumItemRenderFn, 0, &eeprom, 15, 10, 2, nullptr);
56+
menuMgr.setEepromRef(&eeprom);
57+
ScrollChoiceMenuItem choice(101, enumItemRenderFn, 0, 15, 10, 2, nullptr);
5758

5859
// test the two valid cases
5960

0 commit comments

Comments
 (0)