diff options
| author | Karol Lewandowski <k.lewandowsk@samsung.com> | 2024-01-25 15:08:05 +0100 |
|---|---|---|
| committer | Karol Lewandowski <k.lewandowsk@samsung.com> | 2024-01-25 15:08:05 +0100 |
| commit | 73d39c11a0c085416cc55df47f9c3fdaa8149c6b (patch) | |
| tree | 9cbd7da363f80d8d492ff944bc44bb64f1d0249f /gobject/tests/signals.c | |
| parent | 28d0ab6922ac85865d2ae49d43732d8c45e78b6d (diff) | |
| download | glib-73d39c11a0c085416cc55df47f9c3fdaa8149c6b.tar.gz glib-73d39c11a0c085416cc55df47f9c3fdaa8149c6b.tar.bz2 glib-73d39c11a0c085416cc55df47f9c3fdaa8149c6b.zip | |
Imported Upstream version 2.76.6
Diffstat (limited to 'gobject/tests/signals.c')
| -rw-r--r-- | gobject/tests/signals.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gobject/tests/signals.c b/gobject/tests/signals.c index e3648cfad..bc0306082 100644 --- a/gobject/tests/signals.c +++ b/gobject/tests/signals.c @@ -1487,6 +1487,11 @@ test_block_handler (void) g_signal_handlers_unblock_matched (test2, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, test_handler, NULL); + /* Match types are conjunctive */ + g_assert_cmpuint (g_signal_handlers_block_matched (test1, G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, NULL, test_handler, "will not match"), ==, 0); + g_assert_cmpuint (g_signal_handlers_block_matched (test1, G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, NULL, test_handler, &count1), ==, 1); + g_assert_cmpuint (g_signal_handlers_unblock_matched (test1, G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, NULL, test_handler, &count1), ==, 1); + g_object_unref (test1); g_object_unref (test2); } @@ -1546,13 +1551,13 @@ test_signal_disconnect_wrong_object (void) NULL); /* disconnect from the wrong object (same type), should warn */ - g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_WARNING, + g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_CRITICAL, "*: instance '*' has no handler with id '*'"); g_signal_handler_disconnect (object2, signal_id); g_test_assert_expected_messages (); /* and from an object of the wrong type */ - g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_WARNING, + g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_CRITICAL, "*: instance '*' has no handler with id '*'"); g_signal_handler_disconnect (object3, signal_id); g_test_assert_expected_messages (); @@ -1586,7 +1591,7 @@ test_clear_signal_handler (void) if (g_test_undefined ()) { handler = g_random_int_range (0x01, 0xFF); - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*instance '* has no handler with id *'"); g_clear_signal_handler (&handler, test_obj); g_assert_cmpuint (handler, ==, 0); @@ -1642,7 +1647,7 @@ test_lookup_invalid (void) g_test_trap_subprocess (NULL, 0, G_TEST_SUBPROCESS_DEFAULT); g_test_trap_assert_failed (); - g_test_trap_assert_stderr ("*WARNING*unable to look up invalid signal name*"); + g_test_trap_assert_stderr ("*CRITICAL*unable to look up invalid signal name*"); } static void |