Changeset b279899 in mainline for uspace/lib/tbarcfg/test

Timestamp:

2023-10-17T12:18:10Z (22 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d4643db

Parents:

4030072

git-author:

Jiri Svoboda <jiri@…> (2023-10-16 18:17:59)

git-committer:

Jiri Svoboda <jiri@…> (2023-10-17 12:18:10)

Message:

Rename startmenu library to tbarcfg

There may be other aspects of task bar that will need configuring
so let's widen the scope of the library a bit.

Location:

uspace/lib/tbarcfg/test

Files:

• main.c (moved) (moved from uspace/lib/startmenu/test/main.c ) (1 diff)
• tbarcfg.c (moved) (moved from uspace/lib/startmenu/test/startmenu.c ) (6 diffs)

uspace/lib/tbarcfg/test/main.c

@@ -31 +31 @@
 PCUT_INIT;
 
-PCUT_IMPORT(startmenu);
+PCUT_IMPORT(tbarcfg);
 
 PCUT_MAIN();

uspace/lib/tbarcfg/test/tbarcfg.c

@@ -29 +29 @@
 #include <errno.h>
 #include <pcut/pcut.h>
-#include <startmenu/startmenu.h>
+#include <tbarcfg/tbarcfg.h>
 #include <stdio.h>
 
 PCUT_INIT;
 
-PCUT_TEST_SUITE(startmenu);
+PCUT_TEST_SUITE(tbarcfg);
 
-/** Opening and closing start menu */
+/** Opening and closing task bar configuration */
 PCUT_TEST(open_close)
 {
         errno_t rc;
-        startmenu_t *smenu;
+        tbarcfg_t *tbcfg;
         FILE *f;
         int rv;
@@ -53 +53 @@
         PCUT_ASSERT_INT_EQUALS(0, rv);
 
-        rc = startmenu_open("/tmp/test", &smenu);
+        rc = tbarcfg_open("/tmp/test", &tbcfg);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        startmenu_close(smenu);
+        tbarcfg_close(tbcfg);
 }
 
@@ -63 +63 @@
 {
         errno_t rc;
-        startmenu_t *smenu;
-        startmenu_entry_t *e;
+        tbarcfg_t *tbcfg;
+        smenu_entry_t *e;
         FILE *f;
         int rv;
@@ -80 +80 @@
         PCUT_ASSERT_INT_EQUALS(0, rv);
 
-        rc = startmenu_open("/tmp/test", &smenu);
+        rc = tbarcfg_open("/tmp/test", &tbcfg);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        e = startmenu_first(smenu);
+        e = tbarcfg_smenu_first(tbcfg);
         PCUT_ASSERT_NOT_NULL(e);
-        e = startmenu_next(e);
+        e = tbarcfg_smenu_next(e);
         PCUT_ASSERT_NOT_NULL(e);
-        e = startmenu_next(e);
+        e = tbarcfg_smenu_next(e);
         PCUT_ASSERT_NULL(e);
 
-        startmenu_close(smenu);
+        tbarcfg_close(tbcfg);
 }
 
@@ -97 +97 @@
 {
         errno_t rc;
-        startmenu_t *smenu;
-        startmenu_entry_t *e;
+        tbarcfg_t *tbcfg;
+        smenu_entry_t *e;
         const char *caption;
         const char *cmd;
@@ -115 +115 @@
         PCUT_ASSERT_INT_EQUALS(0, rv);
 
-        rc = startmenu_open("/tmp/test", &smenu);
+        rc = tbarcfg_open("/tmp/test", &tbcfg);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        e = startmenu_first(smenu);
+        e = tbarcfg_smenu_first(tbcfg);
         PCUT_ASSERT_NOT_NULL(e);
 
-        caption = startmenu_entry_get_caption(e);
+        caption = smenu_entry_get_caption(e);
         PCUT_ASSERT_STR_EQUALS("A", caption);
-        cmd = startmenu_entry_get_cmd(e);
+        cmd = smenu_entry_get_cmd(e);
         PCUT_ASSERT_STR_EQUALS("a", cmd);
 
-        startmenu_close(smenu);
+        tbarcfg_close(tbcfg);
 }
 
-PCUT_EXPORT(startmenu);
+PCUT_EXPORT(tbarcfg);