Changeset 97d3d9d in mainline

Timestamp:

2023-04-20T18:43:15Z (12 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cdf5361

Parents:

37087c8

Message:

Start filling in unit tests for display-cfg

Location:

uspace/app/display-cfg

Files:

• display-cfg.c (modified) (4 diffs)
• display-cfg.h (modified) (1 diff)
• meson.build (modified) (1 diff)
• seats.c (modified) (5 diffs)
• seats.h (modified) (1 diff)
• test/display-cfg.c (modified) (2 diffs)
• test/seats.c (modified) (2 diffs)

uspace/app/display-cfg/display-cfg.c

@@ -36 +36 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <str.h>
 #include <ui/fixed.h>
 #include <ui/resource.h>
@@ -69 +68 @@
  * @return EOK on success or an error code
  */
-static errno_t display_cfg_create(const char *display_spec,
-    display_cfg_t **rdcfg)
+errno_t display_cfg_create(const char *display_spec, display_cfg_t **rdcfg)
 {
         ui_t *ui = NULL;
@@ -179 +177 @@
  * @param dcfg Display configuration dialog
  */
-static void display_cfg_destroy(display_cfg_t *dcfg)
+void display_cfg_destroy(display_cfg_t *dcfg)
 {
         ui_window_destroy(dcfg->window);
@@ -185 +183 @@
 }
 
-static void print_syntax(void)
-{
-        printf("Syntax: display-cfg [-d <display-spec>]\n");
-}
-
-int main(int argc, char *argv[])
-{
-        const char *display_spec = UI_ANY_DEFAULT;
-        display_cfg_t *dcfg;
-        errno_t rc;
-        int i;
-
-        i = 1;
-        while (i < argc && argv[i][0] == '-') {
-                if (str_cmp(argv[i], "-d") == 0) {
-                        ++i;
-                        if (i >= argc) {
-                                printf("Argument missing.\n");
-                                print_syntax();
-                                return 1;
-                        }
-
-                        display_spec = argv[i++];
-                } else {
-                        printf("Invalid option '%s'.\n", argv[i]);
-                        print_syntax();
-                        return 1;
-                }
-        }
-
-        if (i < argc) {
-                print_syntax();
-                return 1;
-        }
-
-        rc = display_cfg_create(display_spec, &dcfg);
-        if (rc != EOK)
-                return 1;
-
-        ui_run(dcfg->ui);
-        display_cfg_destroy(dcfg);
-
-        return 0;
-}
-
 /** @}
  */

uspace/app/display-cfg/display-cfg.h

@@ -39 +39 @@
 #include "types/display-cfg.h"
 
+extern errno_t display_cfg_create(const char *, display_cfg_t **);
+extern void display_cfg_destroy(display_cfg_t *);
+
 #endif
 

uspace/app/display-cfg/meson.build

@@ -30 +30 @@
 src = files(
         'display-cfg.c',
+        'main.c',
         'seats.c'
 )
 
 test_src = files(
+        'display-cfg.c',
+        'seats.c',
         'test/display-cfg.c',
         'test/main.c',

uspace/app/display-cfg/seats.c

@@ -441 +441 @@
         dcfg_devices_entry_t *dentry;
 
-        ui_pbutton_destroy(seats->add_device);
-        ui_pbutton_destroy(seats->remove_device);
-
-        ui_label_destroy(seats->devices_label);
-
         lentry = ui_list_first(seats->device_list);
         while (lentry != NULL) {
@@ -454 +449 @@
                 lentry = ui_list_first(seats->device_list);
         }
-        ui_list_destroy(seats->device_list);
-
-        ui_pbutton_destroy(seats->add_seat);
-        ui_pbutton_destroy(seats->remove_seat);
 
         lentry = ui_list_first(seats->seat_list);
@@ -468 +459 @@
         }
 
-        ui_label_destroy(seats->seats_label);
-        ui_list_destroy(seats->seat_list);
-        ui_fixed_destroy(seats->fixed);
+        /* This will automatically destroy all controls in the tab */
+        ui_tab_destroy(seats->tab);
         free(seats);
 }
@@ -482 +472 @@
  * @return EOK on success or an error code
  */
-static errno_t dcfg_seats_insert(dcfg_seats_t *seats, const char *name,
+errno_t dcfg_seats_insert(dcfg_seats_t *seats, const char *name,
     sysarg_t seat_id, dcfg_seats_entry_t **rentry)
 {
@@ -564 +554 @@
  * @return EOK on success or an error code
  */
-static errno_t dcfg_devices_insert(dcfg_seats_t *seats, const char *name,
+errno_t dcfg_devices_insert(dcfg_seats_t *seats, const char *name,
     service_id_t svc_id)
 {

uspace/app/display-cfg/seats.h

@@ -42 +42 @@
 extern errno_t dcfg_seats_create(display_cfg_t *, dcfg_seats_t **);
 extern void dcfg_seats_destroy(dcfg_seats_t *);
+extern errno_t dcfg_seats_insert(dcfg_seats_t *, const char *, sysarg_t,
+    dcfg_seats_entry_t **);
+extern errno_t dcfg_devices_insert(dcfg_seats_t *, const char *,
+    service_id_t);
 
 #endif

uspace/app/display-cfg/test/display-cfg.c

@@ -29 +29 @@
 #include <errno.h>
 #include <pcut/pcut.h>
+#include <ui/ui.h>
 #include "../display-cfg.h"
 
@@ -35 +36 @@
 PCUT_TEST_SUITE(display_cfg);
 
-//XXX TODO
+/** Test display_cfg_create() and display_cfg_destroy() */
+PCUT_TEST(create_destroy)
+{
+        display_cfg_t *dcfg;
+        errno_t rc;
+
+        rc = display_cfg_create(UI_DISPLAY_NULL, &dcfg);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        display_cfg_destroy(dcfg);
+}
 
 PCUT_EXPORT(display_cfg);

uspace/app/display-cfg/test/seats.c

@@ -29 +29 @@
 #include <errno.h>
 #include <pcut/pcut.h>
+#include "../display-cfg.h"
 #include "../seats.h"
 
@@ -35 +36 @@
 PCUT_TEST_SUITE(seats);
 
-//XXX TODO
+/** Test dcfg_seats_create() and dcfg_seats_destroy() */
+PCUT_TEST(create_destroy)
+{
+        display_cfg_t *dcfg;
+        dcfg_seats_t *seats;
+        errno_t rc;
+
+        rc = display_cfg_create(UI_DISPLAY_NULL, &dcfg);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = dcfg_seats_create(dcfg, &seats);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        dcfg_seats_destroy(seats);
+        display_cfg_destroy(dcfg);
+}
+
+/** dcfg_seats_insert() inserts an entry into the seat list */
+PCUT_TEST(seats_insert)
+{
+        display_cfg_t *dcfg;
+        dcfg_seats_t *seats;
+        dcfg_seats_entry_t *entry = NULL;
+        errno_t rc;
+
+        rc = display_cfg_create(UI_DISPLAY_NULL, &dcfg);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = dcfg_seats_create(dcfg, &seats);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = dcfg_seats_insert(seats, "Alice", 42, &entry);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(entry);
+
+        PCUT_ASSERT_STR_EQUALS("Alice", entry->name);
+        PCUT_ASSERT_INT_EQUALS(42, entry->seat_id);
+
+        dcfg_seats_destroy(seats);
+        display_cfg_destroy(dcfg);
+}
+
+//??? Requires us to create a test display config service
+PCUT_TEST(seats_list_populate)
+{
+}
+
+/** dcfg_devices_insert() inserts an entry into the device list */
+PCUT_TEST(devices_insert)
+{
+        display_cfg_t *dcfg;
+        dcfg_seats_t *seats;
+        ui_list_entry_t *lentry;
+        dcfg_devices_entry_t *entry;
+        errno_t rc;
+
+        rc = display_cfg_create(UI_DISPLAY_NULL, &dcfg);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = dcfg_seats_create(dcfg, &seats);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = dcfg_devices_insert(seats, "mydevice", 42);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        lentry = ui_list_first(seats->device_list);
+        PCUT_ASSERT_NOT_NULL(lentry);
+        entry = (dcfg_devices_entry_t *)ui_list_entry_get_arg(lentry);
+        PCUT_ASSERT_NOT_NULL(entry);
+
+        PCUT_ASSERT_STR_EQUALS("mydevice", entry->name);
+        PCUT_ASSERT_INT_EQUALS(42, entry->svc_id);
+
+        dcfg_seats_destroy(seats);
+        display_cfg_destroy(dcfg);
+}
+
+PCUT_TEST(avail_devices_insert)
+{
+}
+
+PCUT_TEST(asgn_dev_list_populate)
+{
+}
+
+PCUT_TEST(avail_dev_list_populate)
+{
+}
+
+PCUT_TEST(seats_get_selected)
+{
+}
+
+PCUT_TEST(devices_get_selected)
+{
+}
+
+PCUT_TEST(seats_list_selected)
+{
+}
+
+PCUT_TEST(add_seat_clicked)
+{
+}
+
+PCUT_TEST(remove_seat_clicked)
+{
+}
+
+PCUT_TEST(add_seat_dialog_bok)
+{
+}
+
+PCUT_TEST(add_seat_dialog_bcancel)
+{
+}
+
+PCUT_TEST(add_seat_dialog_close)
+{
+}
+
+PCUT_TEST(add_device_clicked)
+{
+}
+
+PCUT_TEST(remove_device_clicked)
+{
+}
+
+PCUT_TEST(add_device_dialog_bok)
+{
+}
+
+PCUT_TEST(add_device_dialog_bcancel)
+{
+}
+
+PCUT_TEST(add_device_dialog_close)
+{
+}
 
 PCUT_EXPORT(seats);