Changeset 913add60 in mainline for uspace/srv/hid/display/test

Timestamp:

2022-10-31T10:53:53Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1b92d4b

Parents:

7cc30e9

git-author:

Jiri Svoboda <jiri@…> (2022-10-30 10:53:48)

git-committer:

Jiri Svoboda <jiri@…> (2022-10-31 10:53:53)

Message:

Deliver WM events for windows being added and removed

Location:

uspace/srv/hid/display/test

Files:

• display.c (modified) (6 diffs)
• main.c (modified) (1 diff)
• window.c (modified) (1 diff)
• wmclient.c (added)

uspace/srv/hid/display/test/display.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 #include "../seat.h"
 #include "../window.h"
+#include "../wmclient.h"
 
 PCUT_INIT;
@@ -47 +48 @@
 };
 
+static void test_ds_wmev_pending(void *);
+
+static ds_wmclient_cb_t test_ds_wmclient_cb = {
+        .ev_pending = test_ds_wmev_pending
+};
+
 static void test_ds_ev_pending(void *arg)
 {
@@ -53 +60 @@
 }
 
+static void test_ds_wmev_pending(void *arg)
+{
+        bool *called_cb = (bool *) arg;
+        *called_cb = true;
+}
+
 /** Display creation and destruction. */
 PCUT_TEST(display_create_destroy)
@@ -86 +99 @@
 
         ds_client_destroy(client);
+        ds_display_destroy(disp);
+}
+
+/** Basic WM client operation. */
+PCUT_TEST(display_wmclient)
+{
+        ds_display_t *disp;
+        ds_wmclient_t *wmclient;
+        ds_wmclient_t *c0, *c1;
+        errno_t rc;
+
+        rc = ds_display_create(NULL, df_none, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_wmclient_create(disp, &test_ds_wmclient_cb, NULL, &wmclient);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        c0 = ds_display_first_wmclient(disp);
+        PCUT_ASSERT_EQUALS(c0, wmclient);
+
+        c1 = ds_display_next_wmclient(c0);
+        PCUT_ASSERT_NULL(c1);
+
+        ds_wmclient_destroy(wmclient);
         ds_display_destroy(disp);
 }
@@ -150 +187 @@
         wnd = ds_display_find_window(disp, w0->id + 1);
         PCUT_ASSERT_NULL(wnd);
+
+        ds_window_destroy(w0);
+        ds_window_destroy(w1);
+        ds_seat_destroy(seat);
+        ds_client_destroy(client);
+        ds_display_destroy(disp);
+}
+
+/** Test ds_display_window_to_top() */
+PCUT_TEST(display_window_to_top)
+{
+        ds_display_t *disp;
+        ds_client_t *client;
+        ds_seat_t *seat;
+        ds_window_t *w0;
+        ds_window_t *w1;
+        display_wnd_params_t params;
+        bool called_cb = false;
+        errno_t rc;
+
+        rc = ds_display_create(NULL, df_none, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_client_create(disp, &test_ds_client_cb, &called_cb, &client);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_seat_create(disp, &seat);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        display_wnd_params_init(&params);
+        params.rect.p0.x = params.rect.p0.y = 0;
+        params.rect.p1.x = params.rect.p1.y = 100;
+
+        rc = ds_window_create(client, &params, &w0);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_window_create(client, &params, &w1);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_EQUALS(w1, ds_display_first_window(disp));
+        ds_display_window_to_top(w0);
+        PCUT_ASSERT_EQUALS(w0, ds_display_first_window(disp));
 
         ds_window_destroy(w0);

uspace/srv/hid/display/test/main.c

@@ -37 +37 @@
 PCUT_IMPORT(seat);
 PCUT_IMPORT(window);
+PCUT_IMPORT(wmclient);
 
 PCUT_MAIN();

uspace/srv/hid/display/test/window.c

@@ -51 +51 @@
 };
 
+/** Test creating and destroying window */
+PCUT_TEST(create_destroy)
+{
+        ds_display_t *disp;
+        ds_client_t *client;
+        ds_seat_t *seat;
+        ds_window_t *wnd;
+        display_wnd_params_t params;
+        errno_t rc;
+
+        rc = ds_display_create(NULL, df_none, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_client_create(disp, NULL, NULL, &client);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_seat_create(disp, &seat);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        display_wnd_params_init(&params);
+        params.rect.p0.x = params.rect.p0.y = 0;
+        params.rect.p1.x = params.rect.p1.y = 10;
+
+        rc = ds_window_create(client, &params, &wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ds_window_destroy(wnd);
+        ds_seat_destroy(seat);
+        ds_client_destroy(client);
+        ds_display_destroy(disp);
+}
+
+/** Test ds_window_bring_to_top() brings window to top */
+PCUT_TEST(bring_to_top)
+{
+        ds_display_t *disp;
+        ds_client_t *client;
+        ds_seat_t *seat;
+        ds_window_t *w1;
+        ds_window_t *w2;
+        display_wnd_params_t params;
+        errno_t rc;
+
+        rc = ds_display_create(NULL, df_none, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_client_create(disp, NULL, NULL, &client);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_seat_create(disp, &seat);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        display_wnd_params_init(&params);
+        params.rect.p0.x = params.rect.p0.y = 0;
+        params.rect.p1.x = params.rect.p1.y = 10;
+
+        rc = ds_window_create(client, &params, &w1);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_window_create(client, &params, &w2);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        /* w2 should be on the top */
+        PCUT_ASSERT_EQUALS(w2, ds_display_first_window(disp));
+
+        /* Bring w1 to top */
+        ds_window_bring_to_top(w1);
+
+        /* Now w1 should be on the top */
+        PCUT_ASSERT_EQUALS(w1, ds_display_first_window(disp));
+
+        ds_window_destroy(w1);
+        ds_window_destroy(w2);
+        ds_seat_destroy(seat);
+        ds_client_destroy(client);
+        ds_display_destroy(disp);
+}
+
 /** Test ds_window_resize(). */
 PCUT_TEST(window_resize)