Renamed conn-roster2/conn-roster-groups2 to conn-roster/conn-roster-groups.

3 files changed, 31 insertions, 31 deletions

diff --git a/tests/dbus/CMakeLists.txt b/tests/dbus/CMakeLists.txt
index 35e41f38..b0e0d191 100644
--- a/tests/dbus/CMakeLists.txt
+++ b/tests/dbus/CMakeLists.txt
@@ -30,9 +30,9 @@ if(ENABLE_TP_GLIB_TESTS)
     tpqt4_add_dbus_unit_test(ConnectionCapabilities conn-capabilities tp-glib-tests)
     tpqt4_add_dbus_unit_test(ConnectionRequests conn-requests tp-glib-tests)
     tpqt4_add_dbus_unit_test(ConnectionRosterLegacy conn-roster-legacy tp-glib-tests)
-    tpqt4_add_dbus_unit_test(ConnectionRoster2 conn-roster2 example-cm-contactlist2 ${TELEPATHY_GLIB_LIBRARIES})
+    tpqt4_add_dbus_unit_test(ConnectionRoster conn-roster example-cm-contactlist2 ${TELEPATHY_GLIB_LIBRARIES})
     tpqt4_add_dbus_unit_test(ConnectionRosterGroupsLegacy conn-roster-groups-legacy tp-glib-tests)
-    tpqt4_add_dbus_unit_test(ConnectionRosterGroups2 conn-roster-groups2 example-cm-contactlist2 ${TELEPATHY_GLIB_LIBRARIES})
+    tpqt4_add_dbus_unit_test(ConnectionRosterGroups conn-roster-groups example-cm-contactlist2 ${TELEPATHY_GLIB_LIBRARIES})
     tpqt4_add_dbus_unit_test(Contacts contacts tp-glib-tests)
     tpqt4_add_dbus_unit_test(ContactsAvatar contacts-avatar tp-glib-tests)
     tpqt4_add_dbus_unit_test(ContactsCapabilities contacts-capabilities tp-glib-tests)
diff --git a/tests/dbus/conn-roster-groups2.cpp b/tests/dbus/conn-roster-groups.cpp
index 91279ca0..99631361 100644
--- a/tests/dbus/conn-roster-groups2.cpp
+++ b/tests/dbus/conn-roster-groups.cpp
@@ -24,12 +24,12 @@
 
 using namespace Tp;
 
-class TestConnRosterGroups2 : public Test
+class TestConnRosterGroups : public Test
 {
     Q_OBJECT
 
 public:
-    TestConnRosterGroups2(QObject *parent = 0)
+    TestConnRosterGroups(QObject *parent = 0)
         : Test(parent), mConnService(0),
           mContactsAddedToGroup(0), mContactsRemovedFromGroup(0)
     { }
@@ -65,38 +65,38 @@ private:
     bool mConnInvalidated;
 };
 
-void TestConnRosterGroups2::onGroupAdded(const QString &group)
+void TestConnRosterGroups::onGroupAdded(const QString &group)
 {
     mGroupAdded = group;
     mLoop->exit(0);
 }
 
-void TestConnRosterGroups2::onGroupRemoved(const QString &group)
+void TestConnRosterGroups::onGroupRemoved(const QString &group)
 {
     mGroupRemoved = group;
     mLoop->exit(0);
 }
 
 
-void TestConnRosterGroups2::onContactAddedToGroup(const QString &group)
+void TestConnRosterGroups::onContactAddedToGroup(const QString &group)
 {
     mContactsAddedToGroup++;
     mLoop->exit(0);
 }
 
-void TestConnRosterGroups2::onContactRemovedFromGroup(const QString &group)
+void TestConnRosterGroups::onContactRemovedFromGroup(const QString &group)
 {
     mContactsRemovedFromGroup++;
     mLoop->exit(0);
 }
 
-void TestConnRosterGroups2::expectConnInvalidated()
+void TestConnRosterGroups::expectConnInvalidated()
 {
     mConnInvalidated = true;
     mLoop->exit(0);
 }
 
-void TestConnRosterGroups2::expectContact(Tp::PendingOperation *op)
+void TestConnRosterGroups::expectContact(Tp::PendingOperation *op)
 {
     PendingContacts *contacts = qobject_cast<PendingContacts *>(op);
     QVERIFY(contacts != 0);
@@ -109,7 +109,7 @@ void TestConnRosterGroups2::expectContact(Tp::PendingOperation *op)
     mLoop->exit(0);
 }
 
-void TestConnRosterGroups2::initTestCase()
+void TestConnRosterGroups::initTestCase()
 {
     initTestCaseImpl();
 
@@ -119,7 +119,7 @@ void TestConnRosterGroups2::initTestCase()
     dbus_g_bus_get(DBUS_BUS_STARTER, 0);
 }
 
-void TestConnRosterGroups2::init()
+void TestConnRosterGroups::init()
 {
     gchar *name;
     gchar *connPath;
@@ -149,7 +149,7 @@ void TestConnRosterGroups2::init()
     mConnInvalidated = false;
 }
 
-void TestConnRosterGroups2::testRosterGroups()
+void TestConnRosterGroups::testRosterGroups()
 {
     mConn = Connection::create(mConnName, mConnPath,
             ChannelFactory::create(QDBusConnection::sessionBus()),
@@ -265,7 +265,7 @@ void TestConnRosterGroups2::testRosterGroups()
  * which led to a great many segfaults, which was especially unfortunate considering the
  * ContactManager methods didn't do much any checks at all.
  */
-void TestConnRosterGroups2::testNotADeathTrap()
+void TestConnRosterGroups::testNotADeathTrap()
 {
     mConn = Connection::create(mConnName, mConnPath,
             ChannelFactory::create(QDBusConnection::sessionBus()),
@@ -577,7 +577,7 @@ void TestConnRosterGroups2::testNotADeathTrap()
     QCOMPARE(mLoop->exec(), 0);
 }
 
-void TestConnRosterGroups2::cleanup()
+void TestConnRosterGroups::cleanup()
 {
     mContact.reset();
 
@@ -612,10 +612,10 @@ void TestConnRosterGroups2::cleanup()
     cleanupImpl();
 }
 
-void TestConnRosterGroups2::cleanupTestCase()
+void TestConnRosterGroups::cleanupTestCase()
 {
     cleanupTestCaseImpl();
 }
 
-QTEST_MAIN(TestConnRosterGroups2)
-#include "_gen/conn-roster-groups2.cpp.moc.hpp"
+QTEST_MAIN(TestConnRosterGroups)
+#include "_gen/conn-roster-groups.cpp.moc.hpp"
diff --git a/tests/dbus/conn-roster2.cpp b/tests/dbus/conn-roster.cpp
index 41d77f43..a66b9c2e 100644
--- a/tests/dbus/conn-roster2.cpp
+++ b/tests/dbus/conn-roster.cpp
@@ -25,12 +25,12 @@
 
 using namespace Tp;
 
-class TestConnRoster2 : public Test
+class TestConnRoster : public Test
 {
     Q_OBJECT
 
 public:
-    TestConnRoster2(QObject *parent = 0)
+    TestConnRoster(QObject *parent = 0)
         : Test(parent), mConnService(0)
     { }
 
@@ -59,12 +59,12 @@ private:
     bool mGotPresenceStateChanged;
 };
 
-void TestConnRoster2::expectConnInvalidated()
+void TestConnRoster::expectConnInvalidated()
 {
     mLoop->exit(0);
 }
 
-void TestConnRoster2::expectPendingContactsFinished(PendingOperation *op)
+void TestConnRoster::expectPendingContactsFinished(PendingOperation *op)
 {
     if (!op->isFinished()) {
         qWarning() << "unfinished";
@@ -92,7 +92,7 @@ void TestConnRoster2::expectPendingContactsFinished(PendingOperation *op)
     mLoop->exit(0);
 }
 
-void TestConnRoster2::expectAllKnownContactsChanged(const Tp::Contacts& added, const Tp::Contacts& removed,
+void TestConnRoster::expectAllKnownContactsChanged(const Tp::Contacts& added, const Tp::Contacts& removed,
         const Tp::Channel::GroupMemberChangeDetails &details)
 {
     qDebug() << added.size() << " contacts added, " << removed.size() << " contacts removed";
@@ -112,12 +112,12 @@ void TestConnRoster2::expectAllKnownContactsChanged(const Tp::Contacts& added, c
     }
 }
 
-void TestConnRoster2::expectPresenceStateChanged(Contact::PresenceState state)
+void TestConnRoster::expectPresenceStateChanged(Contact::PresenceState state)
 {
     mGotPresenceStateChanged = true;
 }
 
-void TestConnRoster2::initTestCase()
+void TestConnRoster::initTestCase()
 {
     initTestCaseImpl();
 
@@ -151,7 +151,7 @@ void TestConnRoster2::initTestCase()
     g_free(connPath);
 }
 
-void TestConnRoster2::init()
+void TestConnRoster::init()
 {
     initImpl();
 
@@ -167,7 +167,7 @@ void TestConnRoster2::init()
     QCOMPARE(mConn->status(), ConnectionStatusConnected);
 }
 
-void TestConnRoster2::testRoster()
+void TestConnRoster::testRoster()
 {
     Features features = Features() << Connection::FeatureRoster;
     QVERIFY(connect(mConn->becomeReady(features),
@@ -341,7 +341,7 @@ void TestConnRoster2::testRoster()
     }
 }
 
-void TestConnRoster2::cleanup()
+void TestConnRoster::cleanup()
 {
     if (mConn) {
         // Disconnect and wait for the readiness change
@@ -362,7 +362,7 @@ void TestConnRoster2::cleanup()
     cleanupImpl();
 }
 
-void TestConnRoster2::cleanupTestCase()
+void TestConnRoster::cleanupTestCase()
 {
     if (mConnService != 0) {
         g_object_unref(mConnService);
@@ -372,5 +372,5 @@ void TestConnRoster2::cleanupTestCase()
     cleanupTestCaseImpl();
 }
 
-QTEST_MAIN(TestConnRoster2)
-#include "_gen/conn-roster2.cpp.moc.hpp"
+QTEST_MAIN(TestConnRoster)
+#include "_gen/conn-roster.cpp.moc.hpp"