Changeset 8d1bcd7 in mainline for uspace/lib/ui/test/menubar.c

Timestamp:

2023-09-26T20:26:55Z (8 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5afc1aa

Parents:

ed1a948

Message:

Handover between system menu and menu bar

We can move between them using Left and Right keys in either closed
or open state. One can now open system menu with F10, Left, Down in
a window with menu bar, or just F10 in a window without menu bar.

File:

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

uspace/lib/ui/test/menubar.c

@@ -37 +37 @@
 #include <ui/window.h>
 #include "../private/menubar.h"
+#include "../private/wdecor.h"
+#include "../private/window.h"
 
 PCUT_INIT;
@@ -45 +47 @@
 PCUT_TEST(create_destroy)
 {
-        ui_menu_bar_t *mbar = NULL;
-        errno_t rc;
-
-        rc = ui_menu_bar_create(NULL, NULL, &mbar);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_NOT_NULL(mbar);
-
-        ui_menu_bar_destroy(mbar);
+        ui_t *ui = NULL;
+        ui_window_t *window = NULL;
+        ui_wnd_params_t params;
+        ui_menu_bar_t *mbar = 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);
+
+        ui_menu_bar_destroy(mbar);
+        ui_window_destroy(window);
+        ui_destroy(ui);
 }
 
@@ -64 +81 @@
 PCUT_TEST(ctl)
 {
+        ui_t *ui = NULL;
+        ui_window_t *window = NULL;
+        ui_wnd_params_t params;
         ui_menu_bar_t *mbar = NULL;
         ui_control_t *control;
         errno_t rc;
 
-        rc = ui_menu_bar_create(NULL, NULL, &mbar);
+        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);
@@ -76 +106 @@
 
         ui_control_destroy(control);
+        ui_window_destroy(window);
+        ui_destroy(ui);
 }
 
@@ -344 +376 @@
 }
 
+/** ui_menu_bar_select_first/last() selects first/last drop-down */
+PCUT_TEST(select_first_last)
+{
+        ui_t *ui = NULL;
+        ui_window_t *window = NULL;
+        ui_wnd_params_t params;
+        ui_menu_bar_t *mbar = NULL;
+        ui_menu_dd_t *mdd1 = NULL;
+        ui_menu_dd_t *mdd2 = 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_dd_create(mbar, "Test 1", &mdd1, NULL);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(mdd1);
+
+        rc = ui_menu_dd_create(mbar, "Test 2", &mdd2, NULL);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(mdd2);
+
+        ui_menu_bar_select_first(mbar, true, 0);
+        PCUT_ASSERT_EQUALS(mdd1, mbar->selected);
+
+        ui_menu_bar_select_last(mbar, true, 0);
+        PCUT_ASSERT_EQUALS(mdd2, mbar->selected);
+
+        ui_menu_bar_destroy(mbar);
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
+/** ui_menu_bar_select_sysmenu() activates system menu */
+PCUT_TEST(select_sysmenu)
+{
+        ui_t *ui = NULL;
+        ui_window_t *window = NULL;
+        ui_wnd_params_t params;
+        ui_menu_bar_t *mbar = NULL;
+        ui_menu_dd_t *mdd1 = NULL;
+        ui_menu_dd_t *mdd2 = 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_dd_create(mbar, "Test 1", &mdd1, NULL);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(mdd1);
+
+        rc = ui_menu_dd_create(mbar, "Test 2", &mdd2, NULL);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(mdd2);
+
+        ui_menu_bar_select_sysmenu(mbar, 0);
+        PCUT_ASSERT_TRUE(window->wdecor->sysmenu_hdl_active);
+
+        ui_menu_bar_destroy(mbar);
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
 /** ui_menu_bar_activate() activates/deactivates menu bar */
 PCUT_TEST(activate_deactivate)