[next] telepathy-mission-control: Re-namespace remaining o.fd. T names in tests

[Simon McVittie]

Module: telepathy-mission-control
Branch: next
Commit: 993892d8beeafd4a732b5979585759058937f1dc
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=993892d8beeafd4a732b5979585759058937f1dc

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Sep 27 17:37:53 2013 +0100

Re-namespace remaining o.fd.T names in tests

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54879
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>

---

 tests/twisted/account-manager/connectivity.py  |    2 +-
 tests/twisted/dbus-account-plugin.c            |    4 ++--
 tests/twisted/mc-debug-server.c                |    4 ++--
 tests/twisted/mctest.py                        |    2 +-
 tests/twisted/telepathy/clients/AbiWord.client |   22 +++++++++++-----------
 tests/twisted/telepathy/clients/Logger.client  |   12 ++++++------
 tests/twisted/tools/fake-startup.sh            |    4 ++--
 7 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/tests/twisted/account-manager/connectivity.py b/tests/twisted/account-manager/connectivity.py
index 95fac29..32e27c8 100644
--- a/tests/twisted/account-manager/connectivity.py
+++ b/tests/twisted/account-manager/connectivity.py
@@ -39,7 +39,7 @@ def sync_connectivity_state(mc):
     #
     # The test-specific version of MC implements the 'BillyIdle' method, which
     # returns from a low-priority idle.
-    mc.BillyIdle(dbus_interface='org.freedesktop.Telepathy.MissionControl5.RegressionTests')
+    mc.BillyIdle(dbus_interface='im.telepathy1.MissionControl6.RegressionTests')
 
 def test(q, bus, mc):
     params = dbus.Dictionary(
diff --git a/tests/twisted/dbus-account-plugin.c b/tests/twisted/dbus-account-plugin.c
index e44e32c..9fac547 100644
--- a/tests/twisted/dbus-account-plugin.c
+++ b/tests/twisted/dbus-account-plugin.c
@@ -28,8 +28,8 @@
 
 #define DEBUG(format, ...) g_debug ("%s: " format, G_STRFUNC, ##__VA_ARGS__)
 
-#define TESTDOT "org.freedesktop.Telepathy.Test."
-#define TESTSLASH "/org/freedesktop/Telepathy/Test/"
+#define TESTDOT "im.telepathy1.Test."
+#define TESTSLASH "/im/telepathy1/Test/"
 
 #define TEST_DBUS_ACCOUNT_SERVICE       TESTDOT   "DBusAccountService"
 #define TEST_DBUS_ACCOUNT_SERVICE_PATH  TESTSLASH "DBusAccountService"
diff --git a/tests/twisted/mc-debug-server.c b/tests/twisted/mc-debug-server.c
index 48f0248..a911850 100644
--- a/tests/twisted/mc-debug-server.c
+++ b/tests/twisted/mc-debug-server.c
@@ -97,7 +97,7 @@ dbus_filter_function (DBusConnection *connection,
       mcd_mission_abort ((McdMission *) mcd);
     }
   else if (dbus_message_is_method_call (message,
-        "org.freedesktop.Telepathy.MissionControl5.RegressionTests",
+        "im.telepathy1.MissionControl6.RegressionTests",
         "Abort"))
     {
       DBusMessage *reply;
@@ -114,7 +114,7 @@ dbus_filter_function (DBusConnection *connection,
       return DBUS_HANDLER_RESULT_HANDLED;
     }
   else if (dbus_message_is_method_call (message,
-        "org.freedesktop.Telepathy.MissionControl5.RegressionTests",
+        "im.telepathy1.MissionControl6.RegressionTests",
         "BillyIdle"))
     {
       /* Used to drive a souped-up version of sync_dbus(), where we need to
diff --git a/tests/twisted/mctest.py b/tests/twisted/mctest.py
index 025f87f..8964a6c 100644
--- a/tests/twisted/mctest.py
+++ b/tests/twisted/mctest.py
@@ -1269,7 +1269,7 @@ def tell_mc_to_die(q, bus):
     the version built for tests."""
 
     secret_debug_api = dbus.Interface(bus.get_object(cs.AM, "/"),
-        'org.freedesktop.Telepathy.MissionControl5.RegressionTests')
+        'im.telepathy1.MissionControl6.RegressionTests')
     secret_debug_api.Abort()
 
     # Make sure MC exits
diff --git a/tests/twisted/telepathy/clients/AbiWord.client b/tests/twisted/telepathy/clients/AbiWord.client
index 2ec8494..fcbb995 100644
--- a/tests/twisted/telepathy/clients/AbiWord.client
+++ b/tests/twisted/telepathy/clients/AbiWord.client
@@ -1,16 +1,16 @@
-[org.freedesktop.Telepathy.Client]
-Interfaces=org.freedesktop.Telepathy.Client.Handler
+[im.telepathy1.Client]
+Interfaces=im.telepathy1.Client.Handler
 
-[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 0]
-org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.StreamTube
-org.freedesktop.Telepathy.Channel.TargetHandleType u=1
-org.freedesktop.Telepathy.Channel.Type.StreamTube.Service s=x-abiword
+[im.telepathy1.Client.Handler.HandlerChannelFilter 0]
+im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.StreamTube
+im.telepathy1.Channel.TargetHandleType u=1
+im.telepathy1.Channel.Type.StreamTube.Service s=x-abiword
 
-[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 1]
-org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.StreamTube
-org.freedesktop.Telepathy.Channel.TargetHandleType u=2
-org.freedesktop.Telepathy.Channel.Type.StreamTube.Service s=x-abiword
+[im.telepathy1.Client.Handler.HandlerChannelFilter 1]
+im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.StreamTube
+im.telepathy1.Channel.TargetHandleType u=2
+im.telepathy1.Channel.Type.StreamTube.Service s=x-abiword
 
-[org.freedesktop.Telepathy.Client.Handler.Capabilities]
+[im.telepathy1.Client.Handler.Capabilities]
 com.example.Foo=true
 com.example.Bar=true
diff --git a/tests/twisted/telepathy/clients/Logger.client b/tests/twisted/telepathy/clients/Logger.client
index b46d0d5..b8b498f 100644
--- a/tests/twisted/telepathy/clients/Logger.client
+++ b/tests/twisted/telepathy/clients/Logger.client
@@ -1,10 +1,10 @@
-[org.freedesktop.Telepathy.Client]
-Interfaces=org.freedesktop.Telepathy.Client.Observer
+[im.telepathy1.Client]
+Interfaces=im.telepathy1.Client.Observer
 
-[org.freedesktop.Telepathy.Client.Observer]
+[im.telepathy1.Client.Observer]
 Recover=true
 
-[org.freedesktop.Telepathy.Client.Observer.ObserverChannelFilter 0]
-org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.RespawnObservers
-org.freedesktop.Telepathy.Channel.TargetHandleType u=1
+[im.telepathy1.Client.Observer.ObserverChannelFilter 0]
+im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.RespawnObservers
+im.telepathy1.Channel.TargetHandleType u=1
 
diff --git a/tests/twisted/tools/fake-startup.sh b/tests/twisted/tools/fake-startup.sh
index d571c01..6198597 100644
--- a/tests/twisted/tools/fake-startup.sh
+++ b/tests/twisted/tools/fake-startup.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 dbus-send --session --type=signal --print-reply \
-/org/freedesktop/Telepathy/RegressionTests \
-org.freedesktop.Telepathy.RegressionTests.FakeStartup \
+/im/telepathy1/RegressionTests \
+im.telepathy1.RegressionTests.FakeStartup \
 string:"$1"