Changeset 59768c7 in mainline for uspace/lib/ui/test/menubar.c

Timestamp:

2022-01-10T19:29:00Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5de852c

Parents:

9754ed2

git-author:

Jiri Svoboda <jiri@…> (2022-01-10 19:27:55)

git-committer:

Jiri Svoboda <jiri@…> (2022-01-10 19:29:00)

Message:

Menu control using F10, cursor keys, Enter, Escape

File:

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

uspace/lib/ui/test/menubar.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -149 +149 @@
 }
 
-/** Press event on menu bar entry selects menu */
-PCUT_TEST(pos_event_select)
+/** Deliver menu bar keyboard event */
+PCUT_TEST(kbd_event)
 {
         ui_t *ui = NULL;
@@ -158 +158 @@
         ui_menu_t *menu = NULL;
         ui_evclaim_t claimed;
-        pos_event_t event;
+        kbd_event_t event;
         gfx_rect_t rect;
         errno_t rc;
@@ -186 +186 @@
         PCUT_ASSERT_NOT_NULL(menu);
 
+        event.type = KEY_PRESS;
+        event.key = KC_ESCAPE;
+        claimed = ui_menu_kbd_pos_event(mbar, &event);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_EQUALS(ui_claimed, claimed);
+
+        ui_menu_bar_destroy(mbar);
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
+/** Press event on menu bar entry selects menu */
+PCUT_TEST(pos_event_select)
+{
+        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;
+        ui_evclaim_t claimed;
+        pos_event_t event;
+        gfx_rect_t rect;
+        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);
+
+        rect.p0.x = 0;
+        rect.p0.y = 0;
+        rect.p1.x = 50;
+        rect.p1.y = 25;
+        ui_menu_bar_set_rect(mbar, &rect);
+
+        rc = ui_menu_create(mbar, "Test", &menu);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(menu);
+
         event.type = POS_PRESS;
         event.hpos = 4;
@@ -209 +257 @@
         ui_menu_bar_t *mbar = NULL;
         ui_menu_t *menu = NULL;
-        gfx_rect_t rect;
         errno_t rc;
 
@@ -230 +277 @@
         PCUT_ASSERT_NOT_NULL(menu);
 
-        rect.p0.x = 0;
-        rect.p0.y = 0;
-        rect.p1.x = 0;
-        rect.p1.y = 0;
-        ui_menu_bar_select(mbar, &rect, 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, &rect, menu);
+        ui_menu_bar_select(mbar, menu, true);
         PCUT_ASSERT_NULL(mbar->selected);
 
@@ -255 +298 @@
         ui_menu_t *menu1 = NULL;
         ui_menu_t *menu2 = NULL;
-        gfx_rect_t rect;
         errno_t rc;
 
@@ -280 +322 @@
         PCUT_ASSERT_NOT_NULL(menu2);
 
-        rect.p0.x = 0;
-        rect.p0.y = 0;
-        rect.p1.x = 0;
-        rect.p1.y = 0;
-        ui_menu_bar_select(mbar, &rect, menu1);
+        ui_menu_bar_select(mbar, menu1, true);
         PCUT_ASSERT_EQUALS(menu1, mbar->selected);
 
         /* Selecting different menu should select it */
-        ui_menu_bar_select(mbar, &rect, menu2);
+        ui_menu_bar_select(mbar, menu2, true);
         PCUT_ASSERT_EQUALS(menu2, mbar->selected);
 
@@ -296 +334 @@
 }
 
+/** ui_menu_bar_activate() activates/deactivates menu bar */
+PCUT_TEST(activate_deactivate)
+{
+        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_activate(mbar);
+        PCUT_ASSERT_EQUALS(menu, mbar->selected);
+
+        ui_menu_bar_deactivate(mbar);
+        PCUT_ASSERT_NULL(mbar->selected);
+
+        ui_menu_bar_destroy(mbar);
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
 PCUT_EXPORT(menubar);