Changeset 4fcc2de in mainline for uspace/app/nav/test/panel.c

Timestamp:

2021-10-25T00:32:45Z (3 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

f783081

Parents:

fa792e8

git-author:

Jiri Svoboda <jiri@…> (2021-10-16 20:41:33)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-10-25 00:32:45)

Message:

Opening directories

File:

• uspace/app/nav/test/panel.c (modified) (5 diffs)

uspace/app/nav/test/panel.c

@@ -143 +143 @@
 
         event.type = KEY_PRESS;
-        event.key = KC_ENTER;
+        event.key = KC_ESCAPE;
         event.mods = 0;
         event.c = '\0';
@@ -158 +158 @@
 
         event.type = KEY_PRESS;
-        event.key = KC_ENTER;
+        event.key = KC_ESCAPE;
         event.mods = 0;
         event.c = '\0';
@@ -277 +277 @@
 
         PCUT_ASSERT_FALSE(panel_is_active(panel));
-        panel_activate(panel);
+        rc = panel_activate(panel);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
         PCUT_ASSERT_TRUE(panel_is_active(panel));
 
@@ -429 +430 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        PCUT_ASSERT_INT_EQUALS(1, list_count(&panel->entries));
+        PCUT_ASSERT_INT_EQUALS(2, list_count(&panel->entries));
 
         entry = panel_first(panel);
         PCUT_ASSERT_NOT_NULL(entry);
+        PCUT_ASSERT_STR_EQUALS("..", entry->name);
+
+        entry = panel_next(entry);
+        PCUT_ASSERT_NOT_NULL(entry);
         PCUT_ASSERT_STR_EQUALS("a", entry->name);
-        // PCUT_ASSERT_INT_EQUALS(1, entry->size);
+        PCUT_ASSERT_INT_EQUALS(1, entry->size);
 
         panel_destroy(panel);
@@ -1136 +1141 @@
 }
 
+/** panel_open() opens a directory entry */
+PCUT_TEST(open)
+{
+        ui_t *ui;
+        ui_window_t *window;
+        ui_wnd_params_t params;
+        panel_t *panel;
+        panel_entry_t *entry;
+        char buf[L_tmpnam];
+        char *sdname;
+        char *p;
+        errno_t rc;
+        int rv;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_wnd_params_init(&params);
+        params.caption = "Test";
+
+        rc = ui_window_create(ui, &params, &window);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        /* Create name for temporary directory */
+        p = tmpnam(buf);
+        PCUT_ASSERT_NOT_NULL(p);
+
+        /* Create temporary directory */
+        rc = vfs_link_path(p, KIND_DIRECTORY, NULL);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rv = asprintf(&sdname, "%s/%s", p, "a");
+        PCUT_ASSERT_TRUE(rv >= 0);
+
+        /* Create sub-directory */
+        rc = vfs_link_path(sdname, KIND_DIRECTORY, NULL);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = panel_create(window, true, &panel);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = panel_read_dir(panel, p);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_STR_EQUALS(p, panel->dir);
+
+        PCUT_ASSERT_INT_EQUALS(2, list_count(&panel->entries));
+
+        entry = panel_first(panel);
+        PCUT_ASSERT_NOT_NULL(entry);
+        PCUT_ASSERT_STR_EQUALS("..", entry->name);
+
+        entry = panel_next(entry);
+        PCUT_ASSERT_NOT_NULL(entry);
+        PCUT_ASSERT_STR_EQUALS("a", entry->name);
+        PCUT_ASSERT_TRUE(entry->isdir);
+
+        rc = panel_open(panel, entry);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_STR_EQUALS(sdname, panel->dir);
+
+        panel_destroy(panel);
+        ui_window_destroy(window);
+        ui_destroy(ui);
+
+        rv = remove(sdname);
+        PCUT_ASSERT_INT_EQUALS(0, rv);
+
+        rv = remove(p);
+        PCUT_ASSERT_INT_EQUALS(0, rv);
+
+        free(sdname);
+}
+
 PCUT_EXPORT(panel);