Changeset 96c6a00 in mainline for uspace/lib/ui/test/menubar.c

Timestamp:

2022-03-10T13:44:10Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c88d7f99

Parents:

ca2680d

git-author:

Jiri Svoboda <jiri@…> (2022-03-09 18:44:00)

git-committer:

Jiri Svoboda <jiri@…> (2022-03-10 13:44:10)

Message:

Menu accelerators

Open a menu by pressing F10, then accelerator key (e.g. 'F').

File:

• uspace/lib/ui/test/menubar.c (modified) (2 diffs)

uspace/lib/ui/test/menubar.c

@@ -187 +187 @@
 
         event.type = KEY_PRESS;
-        event.key = KC_ESCAPE;
+        event.key = KC_F10;
+        event.mods = 0;
         claimed = ui_menu_bar_kbd_event(mbar, &event);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
@@ -249 +250 @@
 }
 
-/** Calling ui_menu_bar_select() with the same menu twice deselects it */
-PCUT_TEST(select_same)
-{
-        ui_t *ui = NULL;
-        ui_window_t *window = NULL;
-        ui_wnd_params_t params;
-        ui_menu_bar_t *mbar = NULL;
-        ui_menu_t *menu = NULL;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Hello";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_NOT_NULL(window);
-
-        rc = ui_menu_bar_create(ui, window, &mbar);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_NOT_NULL(mbar);
-
-        rc = ui_menu_create(mbar, "Test", &menu);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_NOT_NULL(menu);
-
-        ui_menu_bar_select(mbar, menu, true);
-        PCUT_ASSERT_EQUALS(menu, mbar->selected);
-
-        /* Selecting again should unselect the menu */
-        ui_menu_bar_select(mbar, menu, true);
-        PCUT_ASSERT_NULL(mbar->selected);
-
-        ui_menu_bar_destroy(mbar);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
 /** Calling ui_menu_bar_select() with another menu selects it */
 PCUT_TEST(select_different)