Changeset 7481ee19 in mainline for uspace/lib/ui/test

Timestamp:

2021-06-23T08:15:00Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a977e37

Parents:

034ce6bb

git-author:

Jiri Svoboda <jiri@…> (2021-06-22 17:14:40)

git-committer:

Jiri Svoboda <jiri@…> (2021-06-23 08:15:00)

Message:

Basic editable text entry

Location:

uspace/lib/ui/test

Files:

• control.c (modified) (7 diffs)
• entry.c (modified) (2 diffs)

uspace/lib/ui/test/control.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -29 +29 @@
 #include <errno.h>
 #include <mem.h>
+#include <io/kbd_event.h>
 #include <io/pos_event.h>
 #include <pcut/pcut.h>
@@ -41 +42 @@
 static void test_ctl_destroy(void *);
 static errno_t test_ctl_paint(void *);
+static ui_evclaim_t test_ctl_kbd_event(void *, kbd_event_t *);
 static ui_evclaim_t test_ctl_pos_event(void *, pos_event_t *);
 static void test_ctl_unfocus(void *);
@@ -47 +49 @@
         .destroy = test_ctl_destroy,
         .paint = test_ctl_paint,
+        .kbd_event = test_ctl_kbd_event,
         .pos_event = test_ctl_pos_event,
         .unfocus = test_ctl_unfocus
@@ -64 +67 @@
         bool paint;
 
+        /** @c true iff kbd_event was called */
+        bool kbd;
+        /** Keyboard event that was sent */
+        kbd_event_t kevent;
+
         /** @c true iff pos_event was called */
         bool pos;
@@ -134 +142 @@
         PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
         PCUT_ASSERT_TRUE(resp.paint);
+
+        ui_control_delete(control);
+}
+
+/** Test sending keyboard event to control */
+PCUT_TEST(kbd_event)
+{
+        ui_control_t *control = NULL;
+        test_resp_t resp;
+        kbd_event_t event;
+        ui_evclaim_t claim;
+        errno_t rc;
+
+        rc = ui_control_new(&test_ctl_ops, &resp, &control);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(control);
+
+        resp.claim = ui_claimed;
+        resp.kbd = false;
+        event.type = KEY_PRESS;
+        event.key = KC_2;
+        event.mods = KM_LSHIFT;
+        event.c = '@';
+
+        claim = ui_control_kbd_event(control, &event);
+        PCUT_ASSERT_EQUALS(resp.claim, claim);
+        PCUT_ASSERT_TRUE(resp.kbd);
+        PCUT_ASSERT_EQUALS(resp.kevent.type, event.type);
+        PCUT_ASSERT_INT_EQUALS(resp.kevent.key, event.key);
+        PCUT_ASSERT_INT_EQUALS(resp.kevent.mods, event.mods);
+        PCUT_ASSERT_INT_EQUALS(resp.kevent.c, event.c);
 
         ui_control_delete(control);
@@ -205 +244 @@
 }
 
+static ui_evclaim_t test_ctl_kbd_event(void *arg, kbd_event_t *event)
+{
+        test_resp_t *resp = (test_resp_t *) arg;
+
+        resp->kbd = true;
+        resp->kevent = *event;
+
+        return resp->claim;
+}
+
 static ui_evclaim_t test_ctl_pos_event(void *arg, pos_event_t *event)
 {

uspace/lib/ui/test/entry.c

@@ -119 +119 @@
 }
 
+/** Set entry read only flag sets internal field */
+PCUT_TEST(set_read_only)
+{
+        ui_entry_t *entry;
+        errno_t rc;
+
+        rc = ui_entry_create(NULL, "Hello", &entry);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_entry_set_read_only(entry, true);
+        PCUT_ASSERT_TRUE(entry->read_only);
+        ui_entry_set_read_only(entry, false);
+        PCUT_ASSERT_FALSE(entry->read_only);
+
+        ui_entry_destroy(entry);
+}
+
 /** Set text entry rectangle sets internal field */
 PCUT_TEST(set_text)
@@ -173 +190 @@
 }
 
+/** ui_entry_insert_str() inserts string at cursor. */
+PCUT_TEST(insert_str)
+{
+        errno_t rc;
+        ui_t *ui = NULL;
+        ui_window_t *window = NULL;
+        ui_wnd_params_t params;
+        ui_entry_t *entry;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_wnd_params_init(&params);
+        params.caption = "Hello";
+
+        rc = ui_window_create(ui, &params, &window);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(window);
+
+        rc = ui_entry_create(window, "A", &entry);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_STR_EQUALS("A", entry->text);
+
+        rc = ui_entry_insert_str(entry, "B");
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_STR_EQUALS("AB", entry->text);
+
+        rc = ui_entry_insert_str(entry, "CD");
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_STR_EQUALS("ABCD", entry->text);
+
+        ui_entry_destroy(entry);
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
+/** ui_entry_backspace() deletes character before cursor. */
+PCUT_TEST(backspace)
+{
+        errno_t rc;
+        ui_t *ui = NULL;
+        ui_window_t *window = NULL;
+        ui_wnd_params_t params;
+        ui_entry_t *entry;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_wnd_params_init(&params);
+        params.caption = "Hello";
+
+        rc = ui_window_create(ui, &params, &window);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(window);
+
+        rc = ui_entry_create(window, "ABC", &entry);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_STR_EQUALS("ABC", entry->text);
+
+        ui_entry_backspace(entry);
+        PCUT_ASSERT_STR_EQUALS("AB", entry->text);
+
+        ui_entry_backspace(entry);
+        PCUT_ASSERT_STR_EQUALS("A", entry->text);
+
+        ui_entry_backspace(entry);
+        PCUT_ASSERT_STR_EQUALS("", entry->text);
+
+        ui_entry_backspace(entry);
+        PCUT_ASSERT_STR_EQUALS("", entry->text);
+
+        ui_entry_destroy(entry);
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
 PCUT_EXPORT(entry);