Changeset b2d1df3 in mainline

Timestamp:

2019-11-06T13:20:41Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

648e2ac

Parents:

be15256

git-author:

Jiri Svoboda <jiri@…> (2019-10-03 18:20:38)

git-committer:

Jiri Svoboda <jiri@…> (2019-11-06 13:20:41)

Message:

Fix test, add missing tests for ds_client and ds_display

Location:

uspace/srv/hid/display

Files:

• meson.build (modified) (1 diff)
• test/client.c (added)
• test/display.c (modified) (3 diffs)
• test/main.c (modified) (1 diff)
• test/window.c (modified) (4 diffs)

uspace/srv/hid/display/meson.build

@@ -41 +41 @@
         'display.c',
         'window.c',
+        'test/client.c',
         'test/display.c',
         'test/main.c',

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

@@ -34 +34 @@
 #include "../client.h"
 #include "../display.h"
+#include "../window.h"
 
 PCUT_INIT;
@@ -47 +48 @@
 static void test_ds_ev_pending(void *arg)
 {
+        bool *called_cb = (bool *) arg;
         printf("test_ds_ev_pending\n");
+        *called_cb = true;
+
 }
-
 
 /** Display creation and destruction. */
@@ -87 +90 @@
 }
 
+/** Test ds_display_find_window(). */
+PCUT_TEST(display_find_window)
+{
+        ds_display_t *disp;
+        ds_client_t *client;
+        ds_window_t *w0;
+        ds_window_t *w1;
+        ds_window_t *wnd;
+        errno_t rc;
+
+        rc = ds_display_create(NULL, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_client_create(disp, &test_ds_client_cb, NULL, &client);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_window_create(client, &w0);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_window_create(client, &w1);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        wnd = ds_display_find_window(disp, w0->id);
+        PCUT_ASSERT_EQUALS(w0, wnd);
+
+        wnd = ds_display_find_window(disp, w1->id);
+        PCUT_ASSERT_EQUALS(w1, wnd);
+
+        wnd = ds_display_find_window(disp, 0);
+        PCUT_ASSERT_NULL(wnd);
+
+        wnd = ds_display_find_window(disp, w1->id + 1);
+        PCUT_ASSERT_NULL(wnd);
+
+        ds_window_delete(w0);
+        ds_window_delete(w1);
+        ds_client_destroy(client);
+        ds_display_destroy(disp);
+}
+
+/** Test ds_display_post_kbd_event(). */
+PCUT_TEST(display_post_kbd_event)
+{
+        ds_display_t *disp;
+        ds_client_t *client;
+        ds_window_t *wnd;
+        kbd_event_t event;
+        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);
+
+        rc = ds_window_create(client, &wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        event.type = KEY_PRESS;
+        event.key = KC_ENTER;
+        event.mods = 0;
+        event.c = L'\0';
+
+        PCUT_ASSERT_FALSE(called_cb);
+
+        rc = ds_display_post_kbd_event(disp, &event);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_TRUE(called_cb);
+
+        ds_window_delete(wnd);
+        ds_client_destroy(client);
+        ds_display_destroy(disp);
+}
+
 PCUT_EXPORT(display);

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

@@ -31 +31 @@
 PCUT_INIT;
 
+PCUT_IMPORT(client);
 PCUT_IMPORT(display);
 PCUT_IMPORT(window);

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

@@ -33 +33 @@
 
 #include "../client.h"
+#include "../display.h"
 #include "../window.h"
 
@@ -42 +43 @@
 PCUT_TEST(window_get_ctx)
 {
+        ds_display_t *disp;
         ds_client_t *client;
         ds_window_t *wnd;
@@ -47 +49 @@
         errno_t rc;
 
-        rc = ds_client_create(NULL, NULL, NULL, &client);
+        rc = ds_display_create(NULL, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_client_create(disp, NULL, NULL, &client);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -58 +63 @@
         ds_window_delete(wnd);
         ds_client_destroy(client);
+        ds_display_destroy(disp);
 }