Changeset bef51cf in mainline

Timestamp:

2019-10-05T09:19:15Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

159776f

Parents:

6af4b4f

Message:

Need a few more tests for ds_display_t/ds_window_t

Location:

uspace/srv/hid/display

Files:

• meson.build (modified) (1 diff)
• test/display.c (modified) (3 diffs)
• test/main.c (modified) (1 diff)
• test/window.c (added)
• window.c (modified) (1 diff)

uspace/srv/hid/display/meson.build

@@ -38 +38 @@
         'display.c',
         'window.c',
+        'test/display.c',
         'test/main.c',
-        'test/display.c',
+        'test/window.c',
 )

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

@@ -33 +33 @@
 
 #include "../display.h"
+#include "../window.h"
 
 PCUT_INIT;
@@ -39 +40 @@
 
 /** Display creation and destruction. */
-PCUT_TEST(display_basic)
+PCUT_TEST(display_create_destroy)
 {
         ds_display_t *disp;
@@ -50 +51 @@
 }
 
+/** Basic window operation. */
+PCUT_TEST(display_window)
+{
+        ds_display_t *disp;
+        ds_window_t *wnd;
+        ds_window_t *w0, *w1, *w2;
+        errno_t rc;
+
+        rc = ds_display_create(&disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_window_create(disp, &wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        w0 = ds_display_first_window(disp);
+        PCUT_ASSERT_EQUALS(w0, wnd);
+
+        w1 = ds_display_next_window(w0);
+        PCUT_ASSERT_NULL(w1);
+
+        w2 = ds_display_find_window(disp, wnd->id);
+        PCUT_ASSERT_EQUALS(w2, wnd);
+
+        ds_window_delete(wnd);
+        ds_display_destroy(disp);
+}
+
 PCUT_EXPORT(display);

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

@@ -32 +32 @@
 
 PCUT_IMPORT(display);
+PCUT_IMPORT(window);
 
 PCUT_MAIN();

uspace/srv/hid/display/window.c

@@ -131 +131 @@
         errno_t rc;
 
+        ds_display_remove_window(wnd);
+
         rc = gfx_context_delete(wnd->gc);
         if (rc != EOK)