Changeset d8503fd in mainline for uspace/srv/hid/display/test/display.c

Timestamp:

2023-01-09T21:14:04Z (16 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

46b02cb

Parents:

e04b72d6

Message:

Display configuration utility and server support

Currently we can only create, list and delete seats using the
'disp' utility (but no way to assign devices).

File:

• uspace/srv/hid/display/test/display.c (modified) (15 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -32 +32 @@
 #include <str.h>
 
+#include "../cfgclient.h"
 #include "../client.h"
 #include "../display.h"
@@ -54 +55 @@
 };
 
+static void test_ds_cfgev_pending(void *);
+
+static ds_cfgclient_cb_t test_ds_cfgclient_cb = {
+        .ev_pending = test_ds_cfgev_pending
+};
+
 static void test_ds_ev_pending(void *arg)
 {
@@ -66 +73 @@
 }
 
+static void test_ds_cfgev_pending(void *arg)
+{
+        bool *called_cb = (bool *) arg;
+        *called_cb = true;
+}
+
 /** Display creation and destruction. */
 PCUT_TEST(display_create_destroy)
@@ -123 +136 @@
 
         ds_wmclient_destroy(wmclient);
+        ds_display_destroy(disp);
+}
+
+/** Basic CFG client operation. */
+PCUT_TEST(display_cfgclient)
+{
+        ds_display_t *disp;
+        ds_cfgclient_t *cfgclient;
+        errno_t rc;
+
+        rc = ds_display_create(NULL, df_none, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_cfgclient_create(disp, &test_ds_cfgclient_cb, NULL, &cfgclient);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ds_cfgclient_destroy(cfgclient);
         ds_display_destroy(disp);
 }
@@ -145 +175 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = ds_seat_create(disp, &seat);
+        rc = ds_seat_create(disp, "Alice", &seat);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -216 +246 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = ds_seat_create(disp, &seat);
+        rc = ds_seat_create(disp, "Alice", &seat);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -287 +317 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = ds_seat_create(disp, &seat);
+        rc = ds_seat_create(disp, "Alice", &seat);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -331 +361 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = ds_seat_create(disp, &seat);
+        rc = ds_seat_create(disp, "Alice", &seat);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -372 +402 @@
         ds_display_t *disp;
         ds_seat_t *seat;
-        ds_seat_t *s0, *s1;
-        errno_t rc;
-
-        rc = ds_display_create(NULL, df_none, &disp);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ds_seat_create(disp, &seat);
+        ds_seat_t *s0, *s1, *s2;
+        errno_t rc;
+
+        rc = ds_display_create(NULL, df_none, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_seat_create(disp, "Alice", &seat);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -386 +416 @@
         s1 = ds_display_next_seat(s0);
         PCUT_ASSERT_NULL(s1);
+
+        s2 = ds_display_find_seat(disp, seat->id);
+        PCUT_ASSERT_EQUALS(s2, seat);
 
         ds_seat_destroy(seat);
@@ -413 +446 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = ds_seat_create(disp, &seat);
+        rc = ds_seat_create(disp, "Alice", &seat);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -461 +494 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = ds_seat_create(disp, &seat);
+        rc = ds_seat_create(disp, "Alice", &seat);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -529 +562 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = ds_seat_create(disp, &seat);
+        rc = ds_seat_create(disp, "Alice", &seat);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -614 +647 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = ds_seat_create(disp, &seat);
+        rc = ds_seat_create(disp, "Alice", &seat);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);