Changeset ebb1489 in mainline for uspace/lib/tbarcfg/test/tbarcfg.c

Timestamp:

2024-10-13T08:23:40Z (8 weeks ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• uspace/lib/tbarcfg/test/tbarcfg.c (modified) (13 diffs)

uspace/lib/tbarcfg/test/tbarcfg.c

@@ -57 +57 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
+        tbarcfg_sync(tbcfg);
         tbarcfg_close(tbcfg);
 
@@ -170 +171 @@
         PCUT_ASSERT_TRUE(smenu_entry_get_separator(e2));
 
+        tbarcfg_sync(tbcfg);
         tbarcfg_close(tbcfg);
 
@@ -261 +263 @@
         smenu_entry_set_terminal(e, true);
 
-        rc = smenu_entry_save(e);
+        rc = tbarcfg_sync(tbcfg);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -272 +274 @@
         PCUT_ASSERT_TRUE(terminal);
 
+        tbarcfg_sync(tbcfg);
         tbarcfg_close(tbcfg);
 
@@ -359 +362 @@
         PCUT_ASSERT_EQUALS(e, f);
 
-        rc = smenu_entry_destroy(e);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        smenu_entry_destroy(e);
 
         f = tbarcfg_smenu_first(tbcfg);
@@ -400 +402 @@
         /* Moving the first entry up should have no effect */
 
-        rc = smenu_entry_move_up(e1);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        smenu_entry_move_up(e1);
 
         f = tbarcfg_smenu_first(tbcfg);
@@ -408 +409 @@
         /* Moving the second entry up should move it to first position */
 
-        rc = smenu_entry_move_up(e2);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        smenu_entry_move_up(e2);
 
         f = tbarcfg_smenu_first(tbcfg);
@@ -416 +416 @@
         /* Moving the last entry up should move it to second position */
 
-        rc = smenu_entry_move_up(e3);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        smenu_entry_move_up(e3);
 
         f = tbarcfg_smenu_first(tbcfg);
@@ -428 +427 @@
         PCUT_ASSERT_EQUALS(e1, f);
 
+        tbarcfg_sync(tbcfg);
         tbarcfg_close(tbcfg);
 
@@ -496 +496 @@
         /* Moving the last entry down should have no effect */
 
-        rc = smenu_entry_move_down(e3);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        smenu_entry_move_down(e3);
 
         f = tbarcfg_smenu_last(tbcfg);
@@ -504 +503 @@
         /* Moving the second entry down should move it to last position */
 
-        rc = smenu_entry_move_down(e2);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        smenu_entry_move_down(e2);
 
         f = tbarcfg_smenu_last(tbcfg);
@@ -512 +510 @@
         /* Moving the first entry down should move it to second position */
 
-        rc = smenu_entry_move_down(e1);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        smenu_entry_move_down(e1);
 
         f = tbarcfg_smenu_last(tbcfg);
@@ -524 +521 @@
         PCUT_ASSERT_EQUALS(e3, f);
 
+        tbarcfg_sync(tbcfg);
         tbarcfg_close(tbcfg);