Changeset 3583ffb in mainline for uspace/lib/ui/test/window.c

Timestamp:

2020-11-08T19:51:04Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f93e4e3

Parents:

8c772c4

Message:

Revert "Create UI controls based on UI object…"

This was a mistake. Controls need ui_resource object, which must be
(at least currently) specific to a window and cannot be obtained from
ui_t.

File:

• uspace/lib/ui/test/window.c (modified) (3 diffs)

uspace/lib/ui/test/window.c

@@ -35 +35 @@
 #include <stdbool.h>
 #include <ui/control.h>
+#include <ui/resource.h>
 #include <ui/ui.h>
 #include <ui/window.h>
@@ -173 +174 @@
 }
 
-/** ui_window_get_gc/rect() return valid objects */
-PCUT_TEST(gc_rect)
-{
-        errno_t rc;
-        ui_t *ui = NULL;
-        ui_wnd_params_t params;
-        ui_window_t *window = NULL;
+/** ui_window_get_res/gc/rect() return valid objects */
+PCUT_TEST(get_res_gc_rect)
+{
+        errno_t rc;
+        ui_t *ui = NULL;
+        ui_wnd_params_t params;
+        ui_window_t *window = NULL;
+        ui_resource_t *res;
         gfx_context_t *gc;
         gfx_rect_t rect;
@@ -192 +194 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
         PCUT_ASSERT_NOT_NULL(window);
+
+        res = ui_window_get_res(window);
+        PCUT_ASSERT_NOT_NULL(res);
 
         gc = ui_window_get_gc(window);