Changeset c0757e1f in mainline for uspace/lib/dispcfg/test/dispcfg.c

Timestamp:

2023-04-19T11:13:06Z (20 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

37087c8

Parents:

ec8ef12

Message:

UI display configuration utility

In addition to the command-line utility 'disp', we introduce its UI
equivalent 'display-cfg'. Currently this allows the user to configure
seats in a very comfortable way.

File:

• uspace/lib/dispcfg/test/dispcfg.c (modified) (5 diffs)

uspace/lib/dispcfg/test/dispcfg.c

@@ -52 +52 @@
 static errno_t test_dev_assign(void *, sysarg_t, sysarg_t);
 static errno_t test_dev_unassign(void *, sysarg_t);
+static errno_t test_get_asgn_dev_list(void *, sysarg_t, dispcfg_dev_list_t **);
 static errno_t test_get_event(void *, dispcfg_ev_t *);
 
@@ -64 +65 @@
         .dev_assign = test_dev_assign,
         .dev_unassign = test_dev_unassign,
+        .get_asgn_dev_list = test_get_asgn_dev_list,
         .get_event = test_get_event
 };
@@ -102 +104 @@
         bool dev_unassign_called;
         sysarg_t dev_unassign_svc_id;
+
+        bool get_asgn_dev_list_called;
+        sysarg_t get_asgn_dev_list_seat_id;
+        dispcfg_dev_list_t *get_asgn_dev_list_rlist;
 
         bool get_event_called;
@@ -604 +610 @@
 }
 
+/** dispcfg_get_asgn_dev_list() with server returning error response works */
+PCUT_TEST(get_asgn_dev_list_failure)
+{
+        errno_t rc;
+        service_id_t sid;
+        dispcfg_t *dispcfg = NULL;
+        dispcfg_dev_list_t *list;
+        sysarg_t seat_id;
+        test_response_t resp;
+
+        async_set_fallback_port_handler(test_dispcfg_conn, &resp);
+
+        // FIXME This causes this test to be non-reentrant!
+        rc = loc_server_register(test_dispcfg_server);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = loc_service_register(test_dispcfg_svc, &sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = dispcfg_open(test_dispcfg_svc, NULL, NULL, &dispcfg);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(dispcfg);
+
+        resp.rc = ENOMEM;
+        resp.get_asgn_dev_list_called = false;
+        seat_id = 42;
+
+        rc = dispcfg_get_asgn_dev_list(dispcfg, seat_id, &list);
+        PCUT_ASSERT_TRUE(resp.get_asgn_dev_list_called);
+        PCUT_ASSERT_INT_EQUALS(seat_id, resp.get_asgn_dev_list_seat_id);
+        PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
+
+        dispcfg_close(dispcfg);
+        rc = loc_service_unregister(sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** dispcfg_get_asgn_dev_list() with server returning success response works */
+PCUT_TEST(get_asgn_dev_list_success)
+{
+        errno_t rc;
+        service_id_t sid;
+        dispcfg_t *dispcfg = NULL;
+        dispcfg_dev_list_t *list;
+        sysarg_t seat_id;
+        test_response_t resp;
+
+        async_set_fallback_port_handler(test_dispcfg_conn, &resp);
+
+        // FIXME This causes this test to be non-reentrant!
+        rc = loc_server_register(test_dispcfg_server);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = loc_service_register(test_dispcfg_svc, &sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = dispcfg_open(test_dispcfg_svc, NULL, NULL, &dispcfg);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(dispcfg);
+
+        resp.rc = EOK;
+        resp.get_asgn_dev_list_called = false;
+        resp.get_asgn_dev_list_rlist = calloc(1, sizeof(dispcfg_dev_list_t));
+        PCUT_ASSERT_NOT_NULL(resp.get_asgn_dev_list_rlist);
+        resp.get_asgn_dev_list_rlist->ndevs = 2;
+        resp.get_asgn_dev_list_rlist->devs = calloc(2, sizeof(sysarg_t));
+        PCUT_ASSERT_NOT_NULL(resp.get_asgn_dev_list_rlist->devs);
+        resp.get_asgn_dev_list_rlist->devs[0] = 11;
+        resp.get_asgn_dev_list_rlist->devs[1] = 12;
+        seat_id = 42;
+
+        rc = dispcfg_get_asgn_dev_list(dispcfg, seat_id, &list);
+        PCUT_ASSERT_TRUE(resp.get_asgn_dev_list_called);
+        PCUT_ASSERT_INT_EQUALS(seat_id, resp.get_asgn_dev_list_seat_id);
+        PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
+
+        PCUT_ASSERT_INT_EQUALS(2, list->ndevs);
+        PCUT_ASSERT_INT_EQUALS(11, list->devs[0]);
+        PCUT_ASSERT_INT_EQUALS(12, list->devs[1]);
+
+        dispcfg_free_dev_list(list);
+        dispcfg_close(dispcfg);
+        rc = loc_service_unregister(sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
 /** Window added event can be delivered from server to client callback function */
 PCUT_TEST(seat_added_deliver)
@@ -808 +900 @@
 }
 
+static errno_t test_get_asgn_dev_list(void *arg, sysarg_t seat_id,
+    dispcfg_dev_list_t **rlist)
+{
+        test_response_t *resp = (test_response_t *) arg;
+
+        resp->get_asgn_dev_list_called = true;
+        resp->get_asgn_dev_list_seat_id = seat_id;
+
+        if (resp->rc != EOK)
+                return resp->rc;
+
+        *rlist = resp->get_asgn_dev_list_rlist;
+        return EOK;
+}
+
 static errno_t test_get_event(void *arg, dispcfg_ev_t *event)
 {