@@ -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-
274271test (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}
0 commit comments