diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/backend-mock-guest.c | 2 | ||||
| -rw-r--r-- | tests/test-service.cc | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/tests/backend-mock-guest.c b/tests/backend-mock-guest.c index 0428783..b04c805 100644 --- a/tests/backend-mock-guest.c +++ b/tests/backend-mock-guest.c @@ -71,7 +71,7 @@ my_is_active (IndicatorSessionGuest * self) } static void -my_switch_to_guest (IndicatorSessionGuest * self) +my_switch_to_guest (IndicatorSessionGuest * self G_GNUC_UNUSED) { g_message ("%s %s FIXME", G_STRLOC, G_STRFUNC); } diff --git a/tests/test-service.cc b/tests/test-service.cc index 058fc3d..57b4221 100644 --- a/tests/test-service.cc +++ b/tests/test-service.cc @@ -161,16 +161,11 @@ class ServiceTest: public GTestDBusFixture // Start an IndicatorSessionService and wait for it to appear on the bus. // This way our calls to g_dbus_*_get() in the next paragraph won't activate // a second copy of the service... - service = indicator_session_service_new (true); - - // confirm that the property got set - gboolean replace = FALSE; - g_object_get (service, "replace", &replace, NULL); - ASSERT_TRUE (replace); + service = indicator_session_service_new (); // wait for the service to show up on the bus const guint watch_id = g_bus_watch_name_on_connection (conn, - "com.canonical.indicator.session-test", + "com.canonical.indicator.session", G_BUS_NAME_WATCHER_FLAGS_NONE, on_name_appeared, // quits the loop NULL, this, NULL); @@ -182,10 +177,10 @@ class ServiceTest: public GTestDBusFixture // get the actions & menus that the service exported. action_group = g_dbus_action_group_get (conn, - "com.canonical.indicator.session-test", + "com.canonical.indicator.session", "/com/canonical/indicator/session"); menu_model = g_dbus_menu_model_get (conn, - "com.canonical.indicator.session-test", + "com.canonical.indicator.session", "/com/canonical/indicator/session/desktop"); // the actions are added asynchronously, so wait for the actions if (!g_action_group_has_action (G_ACTION_GROUP(action_group), "about")) |