diff options
| author | Lars Uebernickel <lars.uebernickel@canonical.com> | 2013-11-20 20:09:25 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-11-20 20:09:25 +0000 |
| commit | 64bad031bda168d637489bdaef45aaf8c726dd68 (patch) | |
| tree | b22ee1cf85dae0a32f2a1360cfdd8e144eec9f74 | |
| parent | 0ebdbd89a221f0d0ca706478084f2ff498317a3c (diff) | |
| parent | 0daa47af4401f10c58016437ab05d5cc57a2f50d (diff) | |
| download | ayatana-indicator-messages-64bad031bda168d637489bdaef45aaf8c726dd68.tar.gz ayatana-indicator-messages-64bad031bda168d637489bdaef45aaf8c726dd68.tar.bz2 ayatana-indicator-messages-64bad031bda168d637489bdaef45aaf8c726dd68.zip | |
Stop showing expected warnings in the actionmuxer test.
Approved by Charles Kerr, PS Jenkins bot.
| -rw-r--r-- | src/gactionmuxer.c | 5 | ||||
| -rw-r--r-- | test/test-gactionmuxer.cpp | 17 |
2 files changed, 21 insertions, 1 deletions
diff --git a/src/gactionmuxer.c b/src/gactionmuxer.c index 0f3cda4..1aae9fb 100644 --- a/src/gactionmuxer.c +++ b/src/gactionmuxer.c @@ -429,10 +429,13 @@ g_action_muxer_insert (GActionMuxer *muxer, gchar **action; g_return_if_fail (G_IS_ACTION_MUXER (muxer)); - g_return_if_fail (G_IS_ACTION_GROUP (group)); + g_return_if_fail (group == NULL || G_IS_ACTION_GROUP (group)); g_action_muxer_remove (muxer, prefix); + if (group == NULL) + return; + if (prefix) { prefix_copy = g_strdup (prefix); diff --git a/test/test-gactionmuxer.cpp b/test/test-gactionmuxer.cpp index 78e808f..5c98c90 100644 --- a/test/test-gactionmuxer.cpp +++ b/test/test-gactionmuxer.cpp @@ -46,17 +46,34 @@ TEST(GActionMuxerTest, Sanity) { g_type_init (); #endif + g_test_expect_message ("Indicator-Messages", G_LOG_LEVEL_CRITICAL, "*G_IS_ACTION_MUXER*"); g_action_muxer_insert (NULL, NULL, NULL); + g_test_assert_expected_messages (); + + g_test_expect_message ("Indicator-Messages", G_LOG_LEVEL_CRITICAL, "*G_IS_ACTION_MUXER*"); g_action_muxer_remove (NULL, NULL); + g_test_assert_expected_messages (); muxer = g_action_muxer_new (); g_action_muxer_insert (muxer, NULL, NULL); g_action_muxer_remove (muxer, NULL); + + g_test_expect_message ("Indicator-Messages", G_LOG_LEVEL_CRITICAL, "*NULL*"); EXPECT_FALSE (g_action_group_has_action (G_ACTION_GROUP (muxer), NULL)); + g_test_assert_expected_messages (); + + g_test_expect_message ("Indicator-Messages", G_LOG_LEVEL_CRITICAL, "*NULL*"); EXPECT_FALSE (g_action_group_get_action_enabled (G_ACTION_GROUP (muxer), NULL)); + g_test_assert_expected_messages (); + + g_test_expect_message ("Indicator-Messages", G_LOG_LEVEL_CRITICAL, "*NULL*"); EXPECT_FALSE (g_action_group_query_action (G_ACTION_GROUP (muxer), NULL, NULL, NULL, NULL, NULL, NULL)); + g_test_assert_expected_messages (); + + g_test_expect_message ("GLib-GIO", G_LOG_LEVEL_CRITICAL, "*NULL*"); g_action_group_activate_action (G_ACTION_GROUP (muxer), NULL, NULL); + g_test_assert_expected_messages (); g_object_unref (muxer); } |