aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/com.canonical.indicator.no-such-service (renamed from tests/com.canonical.test.indicator)1
-rw-r--r--tests/com.canonical.indicator.test (renamed from tests/com.canonical.test.nosuchservice.indicator)4
-rw-r--r--tests/service-manager-connect-service.c2
-rw-r--r--tests/service-manager-connect.c1
-rw-r--r--tests/service-manager-no-connect.c1
-rw-r--r--tests/service-manager-nostart-connect.c1
-rw-r--r--tests/service-shutdown-timeout.c2
-rw-r--r--tests/service-version-bad-service.c2
-rw-r--r--tests/service-version-good-service.c2
-rw-r--r--tests/service-version-manager.c1
-rw-r--r--tests/service-version-multiwatch-manager-impolite.c1
-rw-r--r--tests/service-version-multiwatch-manager.c1
-rw-r--r--tests/service-version-multiwatch-service.c1
-rw-r--r--tests/test-desktop-shortcuts.c3
-rw-r--r--tests/test-indicator-ng.c10
-rw-r--r--tests/test-loader.c1
16 files changed, 9 insertions, 25 deletions
diff --git a/tests/com.canonical.test.indicator b/tests/com.canonical.indicator.no-such-service
index dad4c94..54cc4fd 100644
--- a/tests/com.canonical.test.indicator
+++ b/tests/com.canonical.indicator.no-such-service
@@ -1,4 +1,3 @@
[Indicator Service]
Name=indicator-test
-BusName=com.canonical.indicator.test
ObjectPath=/com/canonical/indicator/test
diff --git a/tests/com.canonical.test.nosuchservice.indicator b/tests/com.canonical.indicator.test
index 8464749..0c7122f 100644
--- a/tests/com.canonical.test.nosuchservice.indicator
+++ b/tests/com.canonical.indicator.test
@@ -1,4 +1,6 @@
[Indicator Service]
Name=indicator-test
-BusName=com.canonical.indicator.test.nosuchservice
ObjectPath=/com/canonical/indicator/test
+
+[desktop]
+ObjectPath=/com/canonical/indicator/test/desktop
diff --git a/tests/service-manager-connect-service.c b/tests/service-manager-connect-service.c
index 09a7ba1..e56060a 100644
--- a/tests/service-manager-connect-service.c
+++ b/tests/service-manager-connect-service.c
@@ -48,8 +48,6 @@ shutdown (void)
int
main (int argc, char ** argv)
{
- g_type_init();
-
g_debug("Starting service");
IndicatorService * is = indicator_service_new("org.ayatana.test");
diff --git a/tests/service-manager-connect.c b/tests/service-manager-connect.c
index 5e7684f..5b07972 100644
--- a/tests/service-manager-connect.c
+++ b/tests/service-manager-connect.c
@@ -62,7 +62,6 @@ connection (IndicatorServiceManager * sm, gboolean connected, gpointer user_data
int
main (int argc, char ** argv)
{
- g_type_init();
g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
IndicatorServiceManager * is = indicator_service_manager_new("org.ayatana.test");
diff --git a/tests/service-manager-no-connect.c b/tests/service-manager-no-connect.c
index fab0607..ad28507 100644
--- a/tests/service-manager-no-connect.c
+++ b/tests/service-manager-no-connect.c
@@ -48,7 +48,6 @@ connection (void)
int
main (int argc, char ** argv)
{
- g_type_init();
g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
IndicatorServiceManager * is = indicator_service_manager_new("my.test.name");
diff --git a/tests/service-manager-nostart-connect.c b/tests/service-manager-nostart-connect.c
index ce0ac80..48f4997 100644
--- a/tests/service-manager-nostart-connect.c
+++ b/tests/service-manager-nostart-connect.c
@@ -62,7 +62,6 @@ connection (IndicatorServiceManager * sm, gboolean connected, gpointer user_data
int
main (int argc, char ** argv)
{
- g_type_init();
g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
g_usleep(150000);
diff --git a/tests/service-shutdown-timeout.c b/tests/service-shutdown-timeout.c
index e461af0..b909077 100644
--- a/tests/service-shutdown-timeout.c
+++ b/tests/service-shutdown-timeout.c
@@ -48,8 +48,6 @@ shutdown (void)
int
main (int argc, char ** argv)
{
- g_type_init();
-
IndicatorService * is = indicator_service_new("my.test.name");
g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL);
diff --git a/tests/service-version-bad-service.c b/tests/service-version-bad-service.c
index 12081d1..556575e 100644
--- a/tests/service-version-bad-service.c
+++ b/tests/service-version-bad-service.c
@@ -49,8 +49,6 @@ shutdown (void)
int
main (int argc, char ** argv)
{
- g_type_init();
-
IndicatorService * is = indicator_service_new_version("org.ayatana.version.bad", SERVICE_VERSION_BAD);
g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL);
diff --git a/tests/service-version-good-service.c b/tests/service-version-good-service.c
index 17f987e..9c0dde7 100644
--- a/tests/service-version-good-service.c
+++ b/tests/service-version-good-service.c
@@ -62,8 +62,6 @@ shutdown (void)
int
main (int argc, char ** argv)
{
- g_type_init();
-
is = indicator_service_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD);
g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL);
diff --git a/tests/service-version-manager.c b/tests/service-version-manager.c
index 9e582f5..63bd6b0 100644
--- a/tests/service-version-manager.c
+++ b/tests/service-version-manager.c
@@ -58,7 +58,6 @@ connection_good (IndicatorServiceManager * sm, gboolean connected, gpointer user
int
main (int argc, char ** argv)
{
- g_type_init();
g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
g_print("Manager: DBUS_SESSION_BUS_ADDRESS = %s\n", g_getenv("DBUS_SESSION_BUS_ADDRESS"));
diff --git a/tests/service-version-multiwatch-manager-impolite.c b/tests/service-version-multiwatch-manager-impolite.c
index b4cd1c8..68788b9 100644
--- a/tests/service-version-multiwatch-manager-impolite.c
+++ b/tests/service-version-multiwatch-manager-impolite.c
@@ -64,7 +64,6 @@ delay_start (gpointer data)
int
main (int argc, char ** argv)
{
- g_type_init();
g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
g_print("Manager: DBUS_SESSION_BUS_ADDRESS = %s\n", g_getenv("DBUS_SESSION_BUS_ADDRESS"));
diff --git a/tests/service-version-multiwatch-manager.c b/tests/service-version-multiwatch-manager.c
index 4db6769..633ee59 100644
--- a/tests/service-version-multiwatch-manager.c
+++ b/tests/service-version-multiwatch-manager.c
@@ -64,7 +64,6 @@ delay_start (gpointer data)
int
main (int argc, char ** argv)
{
- g_type_init();
g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
g_print("Manager: DBUS_SESSION_BUS_ADDRESS = %s\n", g_getenv("DBUS_SESSION_BUS_ADDRESS"));
diff --git a/tests/service-version-multiwatch-service.c b/tests/service-version-multiwatch-service.c
index 30b7f00..1333d7a 100644
--- a/tests/service-version-multiwatch-service.c
+++ b/tests/service-version-multiwatch-service.c
@@ -49,7 +49,6 @@ shutdown (void)
int
main (int argc, char ** argv)
{
- g_type_init();
g_debug("Service starting");
IndicatorService * is = indicator_service_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD);
diff --git a/tests/test-desktop-shortcuts.c b/tests/test-desktop-shortcuts.c
index 2e121fa..4f20d3e 100644
--- a/tests/test-desktop-shortcuts.c
+++ b/tests/test-desktop-shortcuts.c
@@ -125,7 +125,7 @@ test_desktop_shortcuts_launch (void)
const gchar ** nicks = indicator_desktop_shortcuts_get_nicks(ids);
g_assert(nicks_contains(nicks, "touch"));
- g_assert(indicator_desktop_shortcuts_nick_exec(ids, "touch"));
+ g_assert(indicator_desktop_shortcuts_nick_exec_with_context(ids, "touch", NULL));
g_usleep(100000);
g_assert(g_file_test(BUILD_DIR "/test-desktop-shortcuts-touch-test", G_FILE_TEST_EXISTS));
@@ -149,7 +149,6 @@ test_desktop_shortcuts_suite (void)
int
main (int argc, char ** argv)
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
gtk_init(&argc, &argv);
diff --git a/tests/test-indicator-ng.c b/tests/test-indicator-ng.c
index 150cc37..7b677d3 100644
--- a/tests/test-indicator-ng.c
+++ b/tests/test-indicator-ng.c
@@ -50,11 +50,11 @@ test_instantiation (void)
GError *error = NULL;
GMainLoop *loop;
- indicator = indicator_ng_new (SRCDIR "/com.canonical.test.nosuchservice.indicator", &error);
+ indicator = indicator_ng_new (SRCDIR "/com.canonical.indicator.no-such-service", &error);
g_assert (indicator);
g_assert (error == NULL);
- g_assert_cmpstr (indicator_ng_get_service_file (indicator), ==, SRCDIR "/com.canonical.test.nosuchservice.indicator");
+ g_assert_cmpstr (indicator_ng_get_service_file (indicator), ==, SRCDIR "/com.canonical.indicator.no-such-service");
g_assert_cmpstr (indicator_ng_get_profile (indicator), ==, "desktop");
{
@@ -65,7 +65,7 @@ test_instantiation (void)
"profile", &profile,
NULL);
- g_assert_cmpstr (service_file, ==, SRCDIR "/com.canonical.test.nosuchservice.indicator");
+ g_assert_cmpstr (service_file, ==, SRCDIR "/com.canonical.indicator.no-such-service");
g_assert_cmpstr (profile, ==, "desktop");
g_free (service_file);
@@ -89,7 +89,7 @@ test_instantiation_with_profile (void)
IndicatorNg *indicator;
GError *error = NULL;
- indicator = indicator_ng_new_for_profile (SRCDIR "/com.canonical.test.indicator", "greeter", &error);
+ indicator = indicator_ng_new_for_profile (SRCDIR "/com.canonical.indicator.test", "greeter", &error);
g_assert (indicator);
g_assert (error == NULL);
@@ -107,7 +107,7 @@ test_menu (void)
GList *entries;
IndicatorObjectEntry *entry;
- indicator = indicator_ng_new (SRCDIR "/com.canonical.test.indicator", &error);
+ indicator = indicator_ng_new (SRCDIR "/com.canonical.indicator.test", &error);
g_assert (indicator);
g_assert (error == NULL);
diff --git a/tests/test-loader.c b/tests/test-loader.c
index 45901cb..28187ad 100644
--- a/tests/test-loader.c
+++ b/tests/test-loader.c
@@ -362,7 +362,6 @@ test_loader_creation_deletion_suite (void)
int
main (int argc, char ** argv)
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
gtk_init(&argc, &argv);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 08:55:57 +0000