Changeset 95a9cbc in mainline

Timestamp:

2021-04-09T22:41:22Z (4 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

d65accb

Parents:

1746ede

git-author:

Jiri Svoboda <jiri@…> (2021-04-09 22:01:35)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-04-09 22:41:22)

Message:

UI menu unit tests

Location:

uspace/lib/ui

Files:

• meson.build (modified) (1 diff)
• private/menu.h (modified) (1 diff)
• private/menubar.h (modified) (1 diff)
• private/menuentry.h (modified) (1 diff)
• src/menuentry.c (modified) (1 diff)
• test/image.c (modified) (1 diff)
• test/main.c (modified) (1 diff)
• test/menu.c (added)
• test/menubar.c (added)
• test/menuentry.c (added)
• test/resource.c (modified) (5 diffs)

uspace/lib/ui/meson.build

@@ -57 +57 @@
         'test/label.c',
         'test/main.c',
+        'test/menu.c',
+        'test/menubar.c',
+        'test/menuentry.c',
         'test/paint.c',
         'test/pbutton.c',

uspace/lib/ui/private/menu.h

@@ -39 +39 @@
 
 #include <adt/list.h>
+#include <gfx/coord.h>
 #include <stdbool.h>
+#include <types/ui/menu.h>
 
 /** Actual structure of menu.

uspace/lib/ui/private/menubar.h

@@ -40 +40 @@
 #include <adt/list.h>
 #include <gfx/coord.h>
+#include <types/ui/menu.h>
 #include <types/ui/menubar.h>
 

uspace/lib/ui/private/menuentry.h

@@ -76 +76 @@
 extern void ui_menu_entry_get_geom(ui_menu_entry_t *, gfx_coord2_t *,
     ui_menu_entry_geom_t *);
+extern void ui_menu_entry_cb(ui_menu_entry_t *);
 
 #endif

uspace/lib/ui/src/menuentry.c

@@ -286 +286 @@
 
                 /* Call back */
-                if (mentry->cb != NULL)
-                        mentry->cb(mentry, mentry->arg);
-        }
+                ui_menu_entry_cb(mentry);
+        }
+}
+
+/** Call menu entry callback.
+ *
+ * @param mentry Menu entry
+ */
+void ui_menu_entry_cb(ui_menu_entry_t *mentry)
+{
+        if (mentry->cb != NULL)
+                mentry->cb(mentry, mentry->arg);
 }
 

uspace/lib/ui/test/image.c

@@ -43 +43 @@
 PCUT_TEST_SUITE(image);
 
-typedef struct {
-        bool clicked;
-} test_cb_resp_t;
-
 /** Create and destroy image */
 PCUT_TEST(create_destroy)

uspace/lib/ui/test/main.c

@@ -37 +37 @@
 PCUT_IMPORT(image);
 PCUT_IMPORT(label);
+PCUT_IMPORT(menu);
+PCUT_IMPORT(menubar);
+PCUT_IMPORT(menuentry);
 PCUT_IMPORT(paint);
 PCUT_IMPORT(pbutton);

uspace/lib/ui/test/resource.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -44 +44 @@
 static errno_t testgc_bitmap_get_alloc(void *, gfx_bitmap_alloc_t *);
 
+static void test_expose(void *);
+
 static gfx_context_ops_t ops = {
         .bitmap_create = testgc_bitmap_create,
@@ -68 +70 @@
 } testgc_bitmap_t;
 
+typedef struct {
+        bool expose;
+} test_resp_t;
+
 /** Create and destroy UI resource */
 PCUT_TEST(create_destroy)
@@ -97 +103 @@
 {
         ui_resource_destroy(NULL);
+}
+
+/** ui_resource_set_expose_cb() / ui_resource_expose() */
+PCUT_TEST(set_expose_cb_expose)
+{
+        errno_t rc;
+        gfx_context_t *gc = NULL;
+        test_gc_t tgc;
+        ui_resource_t *resource = NULL;
+        test_resp_t resp;
+
+        memset(&tgc, 0, sizeof(tgc));
+        rc = gfx_context_new(&ops, &tgc, &gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_resource_create(gc, false, &resource);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(resource);
+
+        ui_resource_set_expose_cb(resource, test_expose, &resp);
+
+        resp.expose = false;
+        ui_resource_expose(resource);
+        PCUT_ASSERT_TRUE(resp.expose);
+
+        ui_resource_destroy(resource);
+
+        rc = gfx_context_delete(gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 }
 
@@ -161 +196 @@
 }
 
+static void test_expose(void *arg)
+{
+        test_resp_t *resp = (test_resp_t *) arg;
+
+        resp->expose = true;
+}
+
 PCUT_EXPORT(resource);