Changeset 7bf29e5 in mainline for uspace/lib/ui/test/msgdialog.c

Timestamp:

2025-01-09T11:29:38Z (5 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

a5c2960e

Parents:

bc3d695 (diff), 4e1221c (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.

Message:

Merge 'upstream/master' into helenraid-para

File:

• uspace/lib/ui/test/msgdialog.c (modified) (4 diffs)

uspace/lib/ui/test/msgdialog.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -92 +92 @@
         ui_msg_dialog_params_t params;
         ui_msg_dialog_t *dialog = NULL;
+        unsigned i;
         test_cb_resp_t resp;
 
@@ -100 +101 @@
         params.caption = "Message";
         params.text = "Hello";
+        params.choice = umdc_ok_cancel;
 
         rc = ui_msg_dialog_create(ui, &params, &dialog);
@@ -106 +108 @@
 
         /* Button callback with no callbacks set */
-        ui_pbutton_clicked(dialog->bok);
+        ui_pbutton_clicked(dialog->btn[0]);
 
         /* Button callback with callback not implemented */
         ui_msg_dialog_set_cb(dialog, &dummy_msg_dialog_cb, NULL);
-        ui_pbutton_clicked(dialog->bok);
+        ui_pbutton_clicked(dialog->btn[0]);
 
-        /* Button callback with real callback set */
-        resp.button = false;
-        resp.bnum = 123;
-        ui_msg_dialog_set_cb(dialog, &test_msg_dialog_cb, &resp);
-        ui_pbutton_clicked(dialog->bok);
-        PCUT_ASSERT_TRUE(resp.button);
-        PCUT_ASSERT_INT_EQUALS(0, resp.bnum);
+        for (i = 0; i < 2; i++) {
+                /* Button callback with real callback set */
+                resp.button = false;
+                resp.bnum = 123;
+                ui_msg_dialog_set_cb(dialog, &test_msg_dialog_cb, &resp);
+                ui_pbutton_clicked(dialog->btn[i]);
+                PCUT_ASSERT_TRUE(resp.button);
+                PCUT_ASSERT_INT_EQUALS(i, resp.bnum);
+        }
 
         ui_msg_dialog_destroy(dialog);