Changeset 06176e1 in mainline for uspace/lib/ui/test

Timestamp:

2022-12-20T12:31:44Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4e7b0ad

Parents:

d46ac73

git-author:

Jiri Svoboda <jiri@…> (2022-12-19 18:31:30)

git-committer:

Jiri Svoboda <jiri@…> (2022-12-20 12:31:44)

Message:

Minimizing windows

Location:

uspace/lib/ui/test

Files:

• paint.c (modified) (1 diff)
• wdecor.c (modified) (5 diffs)
• window.c (modified) (5 diffs)

uspace/lib/ui/test/paint.c

@@ -354 +354 @@
 }
 
+/** Paint mimimize icon */
+PCUT_TEST(minicon)
+{
+        errno_t rc;
+        gfx_context_t *gc = NULL;
+        ui_resource_t *resource = NULL;
+        test_gc_t tgc;
+        gfx_coord2_t center;
+
+        memset(&tgc, 0, sizeof(tgc));
+        rc = gfx_context_new(&ops, &tgc, &gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_resource_create(gc, false, &resource);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(resource);
+
+        center.x = 0;
+        center.y = 0;
+
+        rc = ui_paint_minicon(resource, &center, 8, 6);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_resource_destroy(resource);
+        rc = gfx_context_delete(gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
 /** Paint maximize icon */
 PCUT_TEST(maxicon)

uspace/lib/ui/test/wdecor.c

@@ -62 +62 @@
 };
 
+static void test_wdecor_minimize(ui_wdecor_t *, void *);
 static void test_wdecor_maximize(ui_wdecor_t *, void *);
 static void test_wdecor_unmaximize(ui_wdecor_t *, void *);
@@ -71 +72 @@
 
 static ui_wdecor_cb_t test_wdecor_cb = {
+        .minimize = test_wdecor_minimize,
         .maximize = test_wdecor_maximize,
         .unmaximize = test_wdecor_unmaximize,
@@ -100 +102 @@
 
 typedef struct {
+        bool minimize;
         bool maximize;
         bool unmaximize;
@@ -222 +225 @@
         rc = gfx_context_delete(gc);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** Test ui_wdecor_minimize() */
+PCUT_TEST(minimize)
+{
+        errno_t rc;
+        ui_wdecor_t *wdecor;
+        test_cb_resp_t resp;
+
+        rc = ui_wdecor_create(NULL, "Hello", ui_wds_none, &wdecor);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        /* Minimize callback with no callbacks set */
+        ui_wdecor_minimize(wdecor);
+
+        /* Minimize callback with minimize callback not implemented */
+        ui_wdecor_set_cb(wdecor, &dummy_wdecor_cb, NULL);
+        ui_wdecor_minimize(wdecor);
+
+        /* Minimize callback with real callback set */
+        resp.minimize = false;
+        ui_wdecor_set_cb(wdecor, &test_wdecor_cb, &resp);
+        ui_wdecor_minimize(wdecor);
+        PCUT_ASSERT_TRUE(resp.minimize);
+
+        ui_wdecor_destroy(wdecor);
 }
 
@@ -1014 +1043 @@
 }
 
+static void test_wdecor_minimize(ui_wdecor_t *wdecor, void *arg)
+{
+        test_cb_resp_t *resp = (test_cb_resp_t *) arg;
+
+        resp->minimize = true;
+}
+
 static void test_wdecor_maximize(ui_wdecor_t *wdecor, void *arg)
 {

uspace/lib/ui/test/window.c

@@ -45 +45 @@
 PCUT_TEST_SUITE(window);
 
+static void test_window_minimize(ui_window_t *, void *);
 static void test_window_maximize(ui_window_t *, void *);
 static void test_window_unmaximize(ui_window_t *, void *);
@@ -55 +56 @@
 
 static ui_window_cb_t test_window_cb = {
+        .minimize = test_window_minimize,
         .maximize = test_window_maximize,
         .unmaximize = test_window_unmaximize,
@@ -80 +82 @@
 typedef struct {
         errno_t rc;
+        bool minimize;
         bool maximize;
         bool unmaximize;
@@ -537 +540 @@
 }
 
+/** ui_window_send_minimize() calls minimize callback set via ui_window_set_cb() */
+PCUT_TEST(send_minimize)
+{
+        errno_t rc;
+        ui_t *ui = NULL;
+        ui_wnd_params_t params;
+        ui_window_t *window = NULL;
+        test_cb_resp_t resp;
+
+        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);
+
+        /* Minimize callback with no callbacks set */
+        ui_window_send_minimize(window);
+
+        /* Minimize callback with minimize callback not implemented */
+        ui_window_set_cb(window, &dummy_window_cb, NULL);
+        ui_window_send_minimize(window);
+
+        /* Minimize callback with real callback set */
+        resp.minimize = false;
+        ui_window_set_cb(window, &test_window_cb, &resp);
+        ui_window_send_minimize(window);
+        PCUT_ASSERT_TRUE(resp.minimize);
+
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
 /** ui_window_send_maximize() calls maximize callback set via ui_window_set_cb() */
 PCUT_TEST(send_maximize)
@@ -849 +888 @@
 }
 
+static void test_window_minimize(ui_window_t *window, void *arg)
+{
+        test_cb_resp_t *resp = (test_cb_resp_t *) arg;
+
+        resp->minimize = true;
+}
+
 static void test_window_maximize(ui_window_t *window, void *arg)
 {