Changeset 338d0935 in mainline for uspace/srv/hid/display/test

Timestamp:

2020-03-02T11:22:01Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a2e104e

Parents:

7bb45e3

git-author:

Jiri Svoboda <jiri@…> (2020-02-01 11:18:50)

git-committer:

Jiri Svoboda <jiri@…> (2020-03-02 11:22:01)

Message:

Closing windows

Location:

uspace/srv/hid/display/test

Files:

• client.c (modified) (1 diff)
• window.c (modified) (1 diff)

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

@@ -163 +163 @@
 }
 
+/** Test ds_client_get_event(), ds_client_post_close_event(). */
+PCUT_TEST(client_get_post_close_event)
+{
+        ds_display_t *disp;
+        ds_client_t *client;
+        ds_window_t *wnd;
+        display_wnd_params_t params;
+        ds_window_t *rwindow;
+        display_wnd_ev_t revent;
+        bool called_cb = NULL;
+        errno_t rc;
+
+        rc = ds_display_create(NULL, &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);
+
+        display_wnd_params_init(&params);
+        params.rect.p0.x = params.rect.p0.y = 0;
+        params.rect.p1.x = params.rect.p1.y = 1;
+
+        rc = ds_window_create(client, &params, &wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_FALSE(called_cb);
+
+        rc = ds_client_get_event(client, &rwindow, &revent);
+        PCUT_ASSERT_ERRNO_VAL(ENOENT, rc);
+
+        rc = ds_client_post_close_event(client, wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_TRUE(called_cb);
+
+        rc = ds_client_get_event(client, &rwindow, &revent);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_EQUALS(wnd, rwindow);
+        PCUT_ASSERT_EQUALS(wev_close, revent.etype);
+
+        rc = ds_client_get_event(client, &rwindow, &revent);
+        PCUT_ASSERT_ERRNO_VAL(ENOENT, rc);
+
+        ds_window_destroy(wnd);
+        ds_client_destroy(client);
+        ds_display_destroy(disp);
+}
+
 /** Test ds_client_get_event(), ds_client_post_focus_event(). */
 PCUT_TEST(client_get_post_focus_event)

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

@@ -124 +124 @@
 }
 
+/** Test ds_window_post_kbd_event() with Alt-F4 sends close event */
+PCUT_TEST(window_post_kbd_event_alt_f4)
+{
+        gfx_context_t *gc;
+        ds_display_t *disp;
+        ds_client_t *client;
+        ds_window_t *wnd;
+        ds_window_t *rwindow;
+        display_wnd_ev_t revent;
+        display_wnd_params_t params;
+        kbd_event_t event;
+        errno_t rc;
+
+        rc = gfx_context_new(&dummy_ops, NULL, &gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_display_create(gc, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_client_create(disp, NULL, NULL, &client);
+        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 = 1;
+
+        rc = ds_window_create(client, &params, &wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        event.type = KEY_PRESS;
+        event.mods = KM_ALT;
+        event.key = KC_F4;
+        rc = ds_window_post_kbd_event(wnd, &event);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_client_get_event(client, &rwindow, &revent);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_EQUALS(wnd, rwindow);
+        PCUT_ASSERT_EQUALS(wev_close, revent.etype);
+
+        rc = ds_client_get_event(client, &rwindow, &revent);
+        PCUT_ASSERT_ERRNO_VAL(ENOENT, rc);
+
+        ds_window_destroy(wnd);
+        ds_client_destroy(client);
+        ds_display_destroy(disp);
+}
+
 /** Test ds_window_post_pos_event() */
 PCUT_TEST(window_post_pos_event)