Changeset 7cc30e9 in mainline for uspace/lib/display/test/display.c

Timestamp:

2022-10-24T17:50:46Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

913add60

Parents:

7a05d924

Message:

Display server needs to store window caption

Even though it does not use it itself, it needs to provide it to
window managers (e.g. Task bar). We need to be able to set caption
for a new window and to change it for an existing window.

File:

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

uspace/lib/display/test/display.c

@@ -38 +38 @@
 #include <loc.h>
 #include <pcut/pcut.h>
+#include <str.h>
 #include "../private/display.h"
 
@@ -68 +69 @@
 static errno_t test_window_unmaximize(void *, sysarg_t);
 static errno_t test_window_set_cursor(void *, sysarg_t, display_stock_cursor_t);
+static errno_t test_window_set_caption(void *, sysarg_t, const char *);
 static errno_t test_get_event(void *, sysarg_t *, display_wnd_ev_t *);
 static errno_t test_get_info(void *, display_info_t *);
@@ -85 +87 @@
         .window_unmaximize = test_window_unmaximize,
         .window_set_cursor = test_window_set_cursor,
+        .window_set_caption = test_window_set_caption,
         .get_event = test_get_event,
         .get_info = test_get_info
@@ -148 +151 @@
         sysarg_t set_cursor_wnd_id;
         display_stock_cursor_t set_cursor_cursor;
+
+        bool window_set_caption_called;
+        sysarg_t set_caption_wnd_id;
+        char *set_caption_caption;
 
         bool get_event_called;
@@ -1240 +1247 @@
         PCUT_ASSERT_INT_EQUALS(dcurs_size_ud, resp.set_cursor_cursor);
 
+        display_window_destroy(wnd);
+        display_close(disp);
+        rc = loc_service_unregister(sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** display_window_set_caption() with server returning error response works. */
+PCUT_TEST(window_set_caption_failure)
+{
+        errno_t rc;
+        service_id_t sid;
+        display_t *disp = NULL;
+        display_wnd_params_t params;
+        display_window_t *wnd;
+        const char *caption;
+        test_response_t resp;
+
+        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);
+
+        resp.rc = EOK;
+        display_wnd_params_init(&params);
+        params.rect.p0.x = 0;
+        params.rect.p0.y = 0;
+        params.rect.p0.x = 100;
+        params.rect.p0.y = 100;
+
+        rc = display_window_create(disp, &params, &test_display_wnd_cb,
+            (void *) &resp, &wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(wnd);
+
+        caption = "Hello";
+
+        resp.rc = EIO;
+        resp.window_set_caption_called = false;
+
+        rc = display_window_set_caption(wnd, caption);
+        PCUT_ASSERT_INT_EQUALS(wnd->id, resp.set_caption_wnd_id);
+        PCUT_ASSERT_TRUE(resp.window_set_caption_called);
+        PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
+        PCUT_ASSERT_INT_EQUALS(0, str_cmp(caption, resp.set_caption_caption));
+
+        //free(resp.set_caption_caption);
+        display_window_destroy(wnd);
+        display_close(disp);
+        rc = loc_service_unregister(sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** display_window_set_caption() with server returning success response works. */
+PCUT_TEST(window_set_caption_success)
+{
+        errno_t rc;
+        service_id_t sid;
+        display_t *disp = NULL;
+        display_wnd_params_t params;
+        display_window_t *wnd;
+        const char *caption;
+        test_response_t resp;
+
+        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);
+
+        resp.rc = EOK;
+        display_wnd_params_init(&params);
+        params.rect.p0.x = 0;
+        params.rect.p0.y = 0;
+        params.rect.p0.x = 100;
+        params.rect.p0.y = 100;
+
+        rc = display_window_create(disp, &params, &test_display_wnd_cb,
+            (void *) &resp, &wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(wnd);
+
+        caption = "Hello";
+
+        resp.rc = EOK;
+        resp.window_set_caption_called = false;
+
+        rc = display_window_set_caption(wnd, caption);
+        PCUT_ASSERT_INT_EQUALS(wnd->id, resp.set_caption_wnd_id);
+        PCUT_ASSERT_TRUE(resp.window_set_caption_called);
+        PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
+        PCUT_ASSERT_INT_EQUALS(0, str_cmp(caption, resp.set_caption_caption));
+
+        //free(resp.set_caption_caption);
         display_window_destroy(wnd);
         display_close(disp);
@@ -2018 +2133 @@
 }
 
+static errno_t test_window_set_caption(void *arg, sysarg_t wnd_id,
+    const char *caption)
+{
+        test_response_t *resp = (test_response_t *) arg;
+
+        resp->window_set_caption_called = true;
+        resp->set_caption_wnd_id = wnd_id;
+        resp->set_caption_caption = str_dup(caption);
+
+        return resp->rc;
+}
+
 static errno_t test_get_event(void *arg, sysarg_t *wnd_id,
     display_wnd_ev_t *event)