Changeset b093a62 in mainline

Timestamp:

2019-11-11T13:04:25Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

84876aa4

Parents:

da412547

git-author:

Jiri Svoboda <jiri@…> (2019-11-10 18:04:14)

git-committer:

Jiri Svoboda <jiri@…> (2019-11-11 13:04:25)

Message:

Fix event delivery test

There was an infinite supply of events which prevented proper shutdown

File:

• uspace/lib/display/test/display.c (modified) (7 diffs)

uspace/lib/display/test/display.c

@@ -31 +31 @@
 #include <display.h>
 #include <disp_srv.h>
+#include <fibril_synch.h>
 #include <gfx/color.h>
 #include <gfx/context.h>
@@ -75 +76 @@
         sysarg_t wnd_id;
         display_wnd_ev_t event;
+        display_wnd_ev_t revent;
+        int event_cnt;
         bool window_create_called;
         bool window_destroy_called;
         bool get_event_called;
         bool set_color_called;
+        bool kbd_event_called;
+        fibril_condvar_t kbd_event_cv;
+        fibril_mutex_t kbd_event_lock;
         display_srv_t *srv;
 } test_response_t;
@@ -325 +331 @@
 
 /** Keyboard event can be delivered from server to client callback function */
-#include <stdio.h>
 PCUT_TEST(kbd_event_deliver)
 {
@@ -351 +356 @@
         wnd = NULL;
         resp.rc = EOK;
-        rc = display_window_create(disp, &test_display_wnd_cb, NULL, &wnd);
+        rc = display_window_create(disp, &test_display_wnd_cb, (void *) &resp,
+            &wnd);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
         PCUT_ASSERT_NOT_NULL(wnd);
 
-        printf(" ** call display_window_get_gc\n");
         gc = NULL;
         rc = display_window_get_gc(wnd, &gc);
@@ -361 +366 @@
         PCUT_ASSERT_NOT_NULL(gc);
 
-        printf(" ** call display_srv_ev_pending\n");
+        resp.event_cnt = 1;
+        resp.event.kbd_event.type = KEY_PRESS;
+        resp.event.kbd_event.key = KC_ENTER;
+        resp.event.kbd_event.mods = 0;
+        resp.event.kbd_event.c = L'\0';
+        resp.wnd_id = wnd->id;
+        resp.kbd_event_called = false;
+        fibril_mutex_initialize(&resp.kbd_event_lock);
+        fibril_condvar_initialize(&resp.kbd_event_cv);
         display_srv_ev_pending(resp.srv);
 
-        printf(" ** call display_window_destroy\n");
+        /* Wait for the event handler to be called. */
+        fibril_mutex_lock(&resp.kbd_event_lock);
+        while (!resp.kbd_event_called) {
+                fibril_condvar_wait(&resp.kbd_event_cv, &resp.kbd_event_lock);
+        }
+        fibril_mutex_unlock(&resp.kbd_event_lock);
+
+        /* Verify that the event was delivered correctly */
+        PCUT_ASSERT_EQUALS(resp.event.kbd_event.type,
+            resp.revent.kbd_event.type);
+        PCUT_ASSERT_EQUALS(resp.event.kbd_event.key,
+            resp.revent.kbd_event.key);
+        PCUT_ASSERT_EQUALS(resp.event.kbd_event.mods,
+            resp.revent.kbd_event.mods);
+        PCUT_ASSERT_EQUALS(resp.event.kbd_event.c,
+            resp.revent.kbd_event.c);
+
         rc = display_window_destroy(wnd);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        printf(" ** call display_close\n");
-        display_close(disp);
-        printf(" ** call loc_service_unregister\n");
+        display_close(disp);
+
         rc = loc_service_unregister(sid);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
@@ -424 +452 @@
 static void test_kbd_event(void *arg, kbd_event_t *event)
 {
+        test_response_t *resp = (test_response_t *) arg;
+
+        resp->revent.kbd_event = *event;
+
+        fibril_mutex_lock(&resp->kbd_event_lock);
+        resp->kbd_event_called = true;
+        fibril_condvar_broadcast(&resp->kbd_event_cv);
+        fibril_mutex_unlock(&resp->kbd_event_lock);
 }
 
@@ -450 +486 @@
 
         resp->get_event_called = true;
-        if (resp->rc == EOK) {
+        if (resp->event_cnt > 0) {
+                --resp->event_cnt;
                 *wnd_id = resp->wnd_id;
                 *event = resp->event;
+                return EOK;
         }
 
-        return resp->rc;
+        return ENOENT;
 }