Changeset dcac756 in mainline

Timestamp:

2019-11-10T16:36:53Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6427f083

Parents:

38e4f42

git-author:

Jiri Svoboda <jiri@…> (2019-11-10 16:32:14)

git-committer:

Jiri Svoboda <jiri@…> (2019-11-10 16:36:53)

Message:

Improve libdisplay tests, fix bugs

Location:

uspace

Files:

• lib/display/src/disp_srv.c (modified) (1 diff)
• lib/display/src/display.c (modified) (1 diff)
• lib/display/test/display.c (modified) (4 diffs)
• srv/hid/display/client.c (modified) (1 diff)
• srv/hid/display/test/client.c (modified) (1 diff)

uspace/lib/display/src/disp_srv.c

@@ -109 +109 @@
 
         rc = srv->ops->get_event(srv->arg, &wnd_id, &event);
-        if (rc != EOK)
+        if (rc != EOK) {
                 async_answer_0(icall, rc);
+                return;
+        }
 
         /* Transfer event data */

uspace/lib/display/src/display.c

@@ -189 +189 @@
         async_exchange_end(exch);
 
+        list_remove(&window->lwindows);
         free(window);
         return rc;

uspace/lib/display/test/display.c

@@ -79 +79 @@
         bool get_event_called;
         bool set_color_called;
+        display_srv_t *srv;
 } test_response_t;
 
@@ -87 +88 @@
         service_id_t sid;
         display_t *disp = NULL;
-
-        async_set_fallback_port_handler(test_display_conn, disp);
+        test_response_t resp;
+
+        async_set_fallback_port_handler(test_display_conn, &resp);
 
         // FIXME This causes this test to be non-reentrant!
@@ -322 +324 @@
 }
 
+/** Keyboard event can be delivered from server to client callback function */
+#include <stdio.h>
+PCUT_TEST(kbd_event_deliver)
+{
+        errno_t rc;
+        service_id_t sid;
+        display_t *disp = NULL;
+        display_window_t *wnd;
+        test_response_t resp;
+        gfx_context_t *gc;
+
+        async_set_fallback_port_handler(test_display_conn, &resp);
+
+        // FIXME This causes this test to be non-reentrant!
+        rc = loc_server_register(test_display_server);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = loc_service_register(test_display_svc, &sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = display_open(test_display_svc, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(disp);
+        PCUT_ASSERT_NOT_NULL(resp.srv);
+
+        wnd = NULL;
+        resp.rc = EOK;
+        rc = display_window_create(disp, &test_display_wnd_cb, NULL, &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);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(gc);
+
+        printf(" ** call display_srv_ev_pending\n");
+        display_srv_ev_pending(resp.srv);
+
+        printf(" ** call display_window_destroy\n");
+        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");
+        rc = loc_service_unregister(sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
 /** Test display service connection.
  *
@@ -344 +397 @@
                 srv.ops = &test_display_srv_ops;
                 srv.arg = arg;
+                resp->srv = &srv;
 
                 /* Handle connection */
                 display_conn(icall, &srv);
+
+                resp->srv = NULL;
         } else {
                 (void) wnd_id;

uspace/srv/hid/display/client.c

@@ -177 +177 @@
         if (link == NULL)
                 return ENOENT;
+
         wevent = list_get_instance(link, ds_window_ev_t, levents);
+        list_remove(link);
 
         *ewindow = wevent->window;

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

@@ -195 +195 @@
         PCUT_ASSERT_EQUALS(event.c, revent.kbd_event.c);
 
+        rc = ds_client_get_event(client, &rwindow, &revent);
+        PCUT_ASSERT_ERRNO_VAL(ENOENT, rc);
+
         ds_window_destroy(wnd);
         ds_client_destroy(client);