aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rwxr-xr-xtests/execute/com.canonical.indicator.keyboard.test.Execute3
l---------tests/execute/gkbd-keyboard-display2
l---------tests/execute/gucharmap2
-rwxr-xr-xtests/execute/org.ayatana.indicator.keyboard.test.Execute3
l---------tests/execute/unity-control-center2
-rw-r--r--tests/main.vala50
-rw-r--r--tests/services/ayatana-indicator-keyboard.service.in (renamed from tests/services/indicator-keyboard.service.in)2
7 files changed, 32 insertions, 32 deletions
diff --git a/tests/execute/com.canonical.indicator.keyboard.test.Execute b/tests/execute/com.canonical.indicator.keyboard.test.Execute
deleted file mode 100755
index ad73fd24..00000000
--- a/tests/execute/com.canonical.indicator.keyboard.test.Execute
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-gdbus call -e -d com.canonical.indicator.keyboard.test -o /com/canonical/indicator/keyboard/test -m com.canonical.indicator.keyboard.test.Execute "\'`basename $0` $*\'"
diff --git a/tests/execute/gkbd-keyboard-display b/tests/execute/gkbd-keyboard-display
index 849e205e..0d3a8512 120000
--- a/tests/execute/gkbd-keyboard-display
+++ b/tests/execute/gkbd-keyboard-display
@@ -1 +1 @@
-com.canonical.indicator.keyboard.test.Execute \ No newline at end of file
+org.ayatana.indicator.keyboard.test.Execute \ No newline at end of file
diff --git a/tests/execute/gucharmap b/tests/execute/gucharmap
index 849e205e..0d3a8512 120000
--- a/tests/execute/gucharmap
+++ b/tests/execute/gucharmap
@@ -1 +1 @@
-com.canonical.indicator.keyboard.test.Execute \ No newline at end of file
+org.ayatana.indicator.keyboard.test.Execute \ No newline at end of file
diff --git a/tests/execute/org.ayatana.indicator.keyboard.test.Execute b/tests/execute/org.ayatana.indicator.keyboard.test.Execute
new file mode 100755
index 00000000..58b0ce87
--- /dev/null
+++ b/tests/execute/org.ayatana.indicator.keyboard.test.Execute
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+gdbus call -e -d org.ayatana.indicator.keyboard.test -o /org/ayatana/indicator/keyboard/test -m org.ayatana.indicator.keyboard.test.Execute "\'`basename $0` $*\'"
diff --git a/tests/execute/unity-control-center b/tests/execute/unity-control-center
index 849e205e..0d3a8512 120000
--- a/tests/execute/unity-control-center
+++ b/tests/execute/unity-control-center
@@ -1 +1 @@
-com.canonical.indicator.keyboard.test.Execute \ No newline at end of file
+org.ayatana.indicator.keyboard.test.Execute \ No newline at end of file
diff --git a/tests/main.vala b/tests/main.vala
index e2782d1d..71e5e4a6 100644
--- a/tests/main.vala
+++ b/tests/main.vala
@@ -22,7 +22,7 @@ const int LONG_TIMEOUT_S = 10;
static string display;
-[DBus (name = "com.canonical.indicator.keyboard.test")]
+[DBus (name = "org.ayatana.indicator.keyboard.test")]
public class Service : Object {
[DBus (visible = false)]
@@ -56,7 +56,7 @@ public class Tests : Object, Fixture {
if (_connection != null) {
try {
_service = new Service ();
- _object_name = ((!) _connection).register_object ("/com/canonical/indicator/keyboard/test", _service);
+ _object_name = ((!) _connection).register_object ("/org/ayatana/indicator/keyboard/test", _service);
} catch (IOError error) {
_connection = null;
_service = null;
@@ -82,7 +82,7 @@ public class Tests : Object, Fixture {
var loop = new MainLoop (null, false);
_service_name = Bus.own_name (BusType.SESSION,
- "com.canonical.indicator.keyboard.test",
+ "org.ayatana.indicator.keyboard.test",
BusNameOwnerFlags.ALLOW_REPLACEMENT | BusNameOwnerFlags.REPLACE,
(connection, name) => {
if (loop.is_running ()) {
@@ -104,7 +104,7 @@ public class Tests : Object, Fixture {
loop.run ();
if (_connection == null) {
- Test.message ("error: Unable to connect to com.canonical.indicator.keyboard.test.");
+ Test.message ("error: Unable to connect to org.ayatana.indicator.keyboard.test.");
Test.fail ();
}
@@ -150,8 +150,8 @@ public class Tests : Object, Fixture {
}
var action_group = DBusActionGroup.get ((!) _connection,
- "com.canonical.indicator.keyboard",
- "/com/canonical/indicator/keyboard");
+ "org.ayatana.indicator.keyboard",
+ "/org/ayatana/indicator/keyboard");
action_group.list_actions ();
action_group.activate_action ("current", new Variant.uint32 (2));
@@ -178,8 +178,8 @@ public class Tests : Object, Fixture {
public void test_activate_character_map () {
var action_group = DBusActionGroup.get ((!) _connection,
- "com.canonical.indicator.keyboard",
- "/com/canonical/indicator/keyboard");
+ "org.ayatana.indicator.keyboard",
+ "/org/ayatana/indicator/keyboard");
var loop = new MainLoop (null, false);
var signal_name = ((!) _service).notify["command"].connect ((pspec) => {
loop.quit ();
@@ -209,8 +209,8 @@ public class Tests : Object, Fixture {
}
var action_group = DBusActionGroup.get ((!) _connection,
- "com.canonical.indicator.keyboard",
- "/com/canonical/indicator/keyboard");
+ "org.ayatana.indicator.keyboard",
+ "/org/ayatana/indicator/keyboard");
var loop = new MainLoop (null, false);
var signal_name = ((!) _service).notify["command"].connect ((pspec) => {
loop.quit ();
@@ -229,8 +229,8 @@ public class Tests : Object, Fixture {
public void test_activate_text_entry_settings () {
var action_group = DBusActionGroup.get ((!) _connection,
- "com.canonical.indicator.keyboard",
- "/com/canonical/indicator/keyboard");
+ "org.ayatana.indicator.keyboard",
+ "/org/ayatana/indicator/keyboard");
var loop = new MainLoop (null, false);
var signal_name = ((!) _service).notify["command"].connect ((pspec) => {
loop.quit ();
@@ -252,7 +252,7 @@ public class Tests : Object, Fixture {
var migrated = false;
var sources = "[('xkb', 'us')]";
var layouts = "['us', 'ca\teng', 'epo']";
- Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard migrated $migrated");
+ Process.spawn_command_line_sync (@"gsettings set org.ayatana.indicator.keyboard migrated $migrated");
Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources sources \"$sources\"");
Process.spawn_command_line_sync (@"gsettings set org.gnome.libgnomekbd.keyboard layouts \"$layouts\"");
} catch (SpawnError error) {
@@ -282,7 +282,7 @@ public class Tests : Object, Fixture {
return;
}
- dbus_proxy.call_sync ("StartServiceByName", new Variant ("(su)", "com.canonical.indicator.keyboard", 0), DBusCallFlags.NONE, TIMEOUT_MS);
+ dbus_proxy.call_sync ("StartServiceByName", new Variant ("(su)", "org.ayatana.indicator.keyboard", 0), DBusCallFlags.NONE, TIMEOUT_MS);
} catch (Error error) {
Test.message ("error: %s", error.message);
Test.fail ();
@@ -310,7 +310,7 @@ public class Tests : Object, Fixture {
var migrated = true;
var sources = "[('xkb', 'us')]";
var layouts = "['us', 'ca\teng', 'epo']";
- Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard migrated $migrated");
+ Process.spawn_command_line_sync (@"gsettings set org.ayatana.indicator.keyboard migrated $migrated");
Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources sources \"$sources\"");
Process.spawn_command_line_sync (@"gsettings set org.gnome.libgnomekbd.keyboard layouts \"$layouts\"");
} catch (SpawnError error) {
@@ -340,7 +340,7 @@ public class Tests : Object, Fixture {
return;
}
- dbus_proxy.call_sync ("StartServiceByName", new Variant ("(su)", "com.canonical.indicator.keyboard", 0), DBusCallFlags.NONE, TIMEOUT_MS);
+ dbus_proxy.call_sync ("StartServiceByName", new Variant ("(su)", "org.ayatana.indicator.keyboard", 0), DBusCallFlags.NONE, TIMEOUT_MS);
} catch (Error error) {
Test.message ("error: %s", error.message);
Test.fail ();
@@ -368,7 +368,7 @@ public class Tests : Object, Fixture {
try {
visible = true;
- Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard visible $visible");
+ Process.spawn_command_line_sync (@"gsettings set org.ayatana.indicator.keyboard visible $visible");
} catch (SpawnError error) {
Test.message ("error: %s", error.message);
Test.fail ();
@@ -376,8 +376,8 @@ public class Tests : Object, Fixture {
}
var action_group = DBusActionGroup.get ((!) _connection,
- "com.canonical.indicator.keyboard",
- "/com/canonical/indicator/keyboard");
+ "org.ayatana.indicator.keyboard",
+ "/org/ayatana/indicator/keyboard");
var loop = new MainLoop (null, false);
var signal_name = action_group.action_added["indicator"].connect ((action) => {
loop.quit ();
@@ -402,7 +402,7 @@ public class Tests : Object, Fixture {
try {
visible = false;
- Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard visible $visible");
+ Process.spawn_command_line_sync (@"gsettings set org.ayatana.indicator.keyboard visible $visible");
} catch (SpawnError error) {
Test.message ("error: %s", error.message);
Test.fail ();
@@ -426,7 +426,7 @@ public class Tests : Object, Fixture {
try {
visible = true;
- Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard visible $visible");
+ Process.spawn_command_line_sync (@"gsettings set org.ayatana.indicator.keyboard visible $visible");
} catch (SpawnError error) {
Test.message ("error: %s", error.message);
Test.fail ();
@@ -457,8 +457,8 @@ public class Tests : Object, Fixture {
}
var action_group = DBusActionGroup.get ((!) _connection,
- "com.canonical.indicator.keyboard",
- "/com/canonical/indicator/keyboard");
+ "org.ayatana.indicator.keyboard",
+ "/org/ayatana/indicator/keyboard");
var loop = new MainLoop (null, false);
var signal_name = action_group.action_state_changed["current"].connect ((action, state) => {
loop.quit ();
@@ -545,8 +545,8 @@ public class Tests : Object, Fixture {
}
var menu_model = DBusMenuModel.get ((!) _connection,
- "com.canonical.indicator.keyboard",
- "/com/canonical/indicator/keyboard/desktop");
+ "org.ayatana.indicator.keyboard",
+ "/org/ayatana/indicator/keyboard/desktop");
var loop = new MainLoop (null, false);
var signal_name = menu_model.items_changed.connect ((position, removed, added) => {
loop.quit ();
diff --git a/tests/services/indicator-keyboard.service.in b/tests/services/ayatana-indicator-keyboard.service.in
index be38867d..01b42ad1 100644
--- a/tests/services/indicator-keyboard.service.in
+++ b/tests/services/ayatana-indicator-keyboard.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=com.canonical.indicator.keyboard
+Name=org.ayatana.indicator.keyboard
Exec=@abs_top_builddir@/lib/indicator-keyboard-service
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 10:36:35 +0000