[gtk/columnview-scrolling: 21/24] testsuite: Beef up action tests
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/columnview-scrolling: 21/24] testsuite: Beef up action tests
- Date: Sun, 31 May 2020 20:44:10 +0000 (UTC)
commit 83c0937a460946ac0c5cb6dba75080b3f8603947
Author: Matthias Clasen <mclasen redhat com>
Date: Sun May 31 15:36:41 2020 -0400
testsuite: Beef up action tests
Check return values from gtk_widget_activate.
testsuite/gtk/action.c | 27 ++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/testsuite/gtk/action.c b/testsuite/gtk/action.c
index 8f348a3f39..d4e8b20073 100644
--- a/testsuite/gtk/action.c
+++ b/testsuite/gtk/action.c
@@ -40,7 +40,7 @@ box_activate (GSimpleAction *action,
* the effect of activating them.
*/
static void
-test_action (void)
+test_inheritance (void)
{
GtkWidget *window;
GtkWidget *box;
@@ -53,7 +53,16 @@ test_action (void)
GActionEntry box_entries[] = {
{ "action", box_activate, NULL, NULL, NULL },
};
-
+ gboolean found;
+
+ /* Our hierarchy looks like this:
+ *
+ * window win.action
+ * |
+ * box box.action
+ * |
+ * button
+ */
window = gtk_window_new ();
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
button = gtk_button_new ();
@@ -79,23 +88,27 @@ test_action (void)
g_assert_cmpint (win_activated, ==, 0);
g_assert_cmpint (box_activated, ==, 0);
- gtk_widget_activate_action (button, "win.action", NULL);
+ found = gtk_widget_activate_action (button, "win.action", NULL);
+ g_assert_true (found);
g_assert_cmpint (win_activated, ==, 1);
g_assert_cmpint (box_activated, ==, 0);
- gtk_widget_activate_action (box, "win.action", NULL);
+ found = gtk_widget_activate_action (box, "win.action", NULL);
+ g_assert_true (found);
g_assert_cmpint (win_activated, ==, 2);
g_assert_cmpint (box_activated, ==, 0);
- gtk_widget_activate_action (button, "box.action", NULL);
+ found = gtk_widget_activate_action (button, "box.action", NULL);
+ g_assert_true (found);
g_assert_cmpint (win_activated, ==, 2);
g_assert_cmpint (box_activated, ==, 1);
- gtk_widget_activate_action (window, "box.action", NULL);
+ found = gtk_widget_activate_action (window, "box.action", NULL);
+ g_assert_false (found);
g_assert_cmpint (win_activated, ==, 2);
g_assert_cmpint (box_activated, ==, 1);
@@ -434,7 +447,7 @@ main (int argc,
{
gtk_test_init (&argc, &argv);
- g_test_add_func ("/action/inheritance", test_action);
+ g_test_add_func ("/action/inheritance", test_inheritance);
g_test_add_func ("/action/text", test_text);
g_test_add_func ("/action/overlap", test_overlap);
g_test_add_func ("/action/overlap2", test_overlap2);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]