summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAndre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>2010-11-10 12:12:25 -0200
committerAndre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>2010-11-10 12:12:25 -0200
commit713936493f361b19faf6622e309fa4dec87a90b8 (patch)
tree9d1a49ba245b125cd88642bf1a2a4b35c696146d /tests
parentc6ae8ed77d596b354a66153f9991fa301cb46c56 (diff)
Connection: Remove Connection::Status.
Diffstat (limited to 'tests')
-rw-r--r--tests/dbus/account-basics.cpp2
-rw-r--r--tests/dbus/chan-basics.cpp22
-rw-r--r--tests/dbus/chan-conference-draft.cpp2
-rw-r--r--tests/dbus/chan-conference.cpp2
-rw-r--r--tests/dbus/chan-contact-search.cpp2
-rw-r--r--tests/dbus/chan-group.cpp2
-rw-r--r--tests/dbus/client-factories.cpp2
-rw-r--r--tests/dbus/client.cpp2
-rw-r--r--tests/dbus/conn-basics.cpp22
-rw-r--r--tests/dbus/conn-capabilities.cpp4
-rw-r--r--tests/dbus/conn-requests.cpp2
-rw-r--r--tests/dbus/conn-roster-groups.cpp8
-rw-r--r--tests/dbus/conn-roster.cpp2
-rw-r--r--tests/dbus/contacts-avatar.cpp2
-rw-r--r--tests/dbus/contacts-capabilities.cpp2
-rw-r--r--tests/dbus/contacts-info.cpp2
-rw-r--r--tests/dbus/contacts-location.cpp2
-rw-r--r--tests/dbus/contacts.cpp22
-rw-r--r--tests/dbus/handles.cpp22
-rw-r--r--tests/dbus/streamed-media-chan.cpp2
-rw-r--r--tests/dbus/text-chan.cpp2
21 files changed, 65 insertions, 65 deletions
diff --git a/tests/dbus/account-basics.cpp b/tests/dbus/account-basics.cpp
index 3e567eca..ecb986e5 100644
--- a/tests/dbus/account-basics.cpp
+++ b/tests/dbus/account-basics.cpp
@@ -177,7 +177,7 @@ void TestAccountBasics::initTestCase()
SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
- QCOMPARE(mConn->status(), Connection::StatusConnected);
+ QCOMPARE(mConn->status(), ConnectionStatusConnected);
g_free(name);
g_free(connPath);
diff --git a/tests/dbus/chan-basics.cpp b/tests/dbus/chan-basics.cpp
index 4c1b928a..42480b34 100644
--- a/tests/dbus/chan-basics.cpp
+++ b/tests/dbus/chan-basics.cpp
@@ -32,7 +32,7 @@ public:
{ }
protected Q_SLOTS:
- void expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason);
+ void expectConnReady(Tp::ConnectionStatus, Tp::ConnectionStatusReason);
void expectConnInvalidated();
void expectPendingHandleFinished(Tp::PendingOperation*);
void expectCreateChannelFinished(Tp::PendingOperation *);
@@ -58,19 +58,19 @@ private:
uint mHandle;
};
-void TestChanBasics::expectConnReady(Tp::Connection::Status newStatus,
+void TestChanBasics::expectConnReady(Tp::ConnectionStatus newStatus,
Tp::ConnectionStatusReason newStatusReason)
{
qDebug() << "connection changed to status" << newStatus;
switch (newStatus) {
- case Connection::StatusDisconnected:
+ case ConnectionStatusDisconnected:
qWarning() << "Disconnected";
mLoop->exit(1);
break;
- case Connection::StatusConnecting:
+ case ConnectionStatusConnecting:
/* do nothing */
break;
- case Connection::StatusConnected:
+ case ConnectionStatusConnected:
qDebug() << "Ready";
mLoop->exit(0);
break;
@@ -215,16 +215,16 @@ void TestChanBasics::initTestCase()
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(features), true);
- if (mConn->status() != Connection::StatusConnected) {
+ if (mConn->status() != ConnectionStatusConnected) {
QVERIFY(connect(mConn.data(),
- SIGNAL(statusChanged(Tp::Connection::Status, Tp::ConnectionStatusReason)),
- SLOT(expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason))));
+ SIGNAL(statusChanged(Tp::ConnectionStatus, Tp::ConnectionStatusReason)),
+ SLOT(expectConnReady(Tp::ConnectionStatus, Tp::ConnectionStatusReason))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(disconnect(mConn.data(),
- SIGNAL(statusChanged(Tp::Connection::Status, Tp::ConnectionStatusReason)),
+ SIGNAL(statusChanged(Tp::ConnectionStatus, Tp::ConnectionStatusReason)),
this,
- SLOT(expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason))));
- QCOMPARE(mConn->status(), Connection::StatusConnected);
+ SLOT(expectConnReady(Tp::ConnectionStatus, Tp::ConnectionStatusReason))));
+ QCOMPARE(mConn->status(), ConnectionStatusConnected);
}
}
diff --git a/tests/dbus/chan-conference-draft.cpp b/tests/dbus/chan-conference-draft.cpp
index c351ac3a..7149c5d3 100644
--- a/tests/dbus/chan-conference-draft.cpp
+++ b/tests/dbus/chan-conference-draft.cpp
@@ -132,7 +132,7 @@ void TestConferenceChanDRAFT::initTestCase()
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
QCOMPARE(static_cast<uint>(mConn->status()),
- static_cast<uint>(Connection::StatusConnected));
+ static_cast<uint>(ConnectionStatusConnected));
// create a Channel by magic, rather than doing D-Bus round-trips for it
diff --git a/tests/dbus/chan-conference.cpp b/tests/dbus/chan-conference.cpp
index 56689306..706364da 100644
--- a/tests/dbus/chan-conference.cpp
+++ b/tests/dbus/chan-conference.cpp
@@ -132,7 +132,7 @@ void TestConferenceChan::initTestCase()
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
QCOMPARE(static_cast<uint>(mConn->status()),
- static_cast<uint>(Connection::StatusConnected));
+ static_cast<uint>(ConnectionStatusConnected));
// create a Channel by magic, rather than doing D-Bus round-trips for it
diff --git a/tests/dbus/chan-contact-search.cpp b/tests/dbus/chan-contact-search.cpp
index 4027a7d7..6df3efa6 100644
--- a/tests/dbus/chan-contact-search.cpp
+++ b/tests/dbus/chan-contact-search.cpp
@@ -152,7 +152,7 @@ void TestContactSearchChan::initTestCase()
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
QCOMPARE(static_cast<uint>(mConn->status()),
- static_cast<uint>(Connection::StatusConnected));
+ static_cast<uint>(ConnectionStatusConnected));
QByteArray chan1Path;
mChan1Path = mConnPath + QLatin1String("/ContactSearchChannel/1");
diff --git a/tests/dbus/chan-group.cpp b/tests/dbus/chan-group.cpp
index 1ce3baf7..560dd3cc 100644
--- a/tests/dbus/chan-group.cpp
+++ b/tests/dbus/chan-group.cpp
@@ -219,7 +219,7 @@ void TestChanGroup::initTestCase()
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
QCOMPARE(static_cast<uint>(mConn->status()),
- static_cast<uint>(Connection::StatusConnected));
+ static_cast<uint>(ConnectionStatusConnected));
}
void TestChanGroup::init()
diff --git a/tests/dbus/client-factories.cpp b/tests/dbus/client-factories.cpp
index 369565b7..dddd5c2a 100644
--- a/tests/dbus/client-factories.cpp
+++ b/tests/dbus/client-factories.cpp
@@ -496,7 +496,7 @@ void TestClientFactories::initTestCase()
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
QCOMPARE(static_cast<uint>(mConn->status()),
- static_cast<uint>(Connection::StatusConnected));
+ static_cast<uint>(ConnectionStatusConnected));
// create a Channel by magic, rather than doing D-Bus round-trips for it
diff --git a/tests/dbus/client.cpp b/tests/dbus/client.cpp
index 5ee2d51c..892f8639 100644
--- a/tests/dbus/client.cpp
+++ b/tests/dbus/client.cpp
@@ -470,7 +470,7 @@ void TestClient::initTestCase()
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
QCOMPARE(static_cast<uint>(mConn->status()),
- static_cast<uint>(Connection::StatusConnected));
+ static_cast<uint>(ConnectionStatusConnected));
// create a Channel by magic, rather than doing D-Bus round-trips for it
diff --git a/tests/dbus/conn-basics.cpp b/tests/dbus/conn-basics.cpp
index 9aab75c7..908a1d02 100644
--- a/tests/dbus/conn-basics.cpp
+++ b/tests/dbus/conn-basics.cpp
@@ -30,7 +30,7 @@ public:
{ }
protected Q_SLOTS:
- void expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason);
+ void expectConnReady(Tp::ConnectionStatus, Tp::ConnectionStatusReason);
void expectConnInvalidated();
void expectPresenceAvailable(const Tp::SimplePresence &);
@@ -50,19 +50,19 @@ private:
ConnectionPtr mConn;
};
-void TestConnBasics::expectConnReady(Tp::Connection::Status newStatus,
+void TestConnBasics::expectConnReady(Tp::ConnectionStatus newStatus,
Tp::ConnectionStatusReason newStatusReason)
{
qDebug() << "connection changed to status" << newStatus;
switch (newStatus) {
- case Connection::StatusDisconnected:
+ case ConnectionStatusDisconnected:
qWarning() << "Disconnected";
mLoop->exit(1);
break;
- case Connection::StatusConnecting:
+ case ConnectionStatusConnecting:
/* do nothing */
break;
- case Connection::StatusConnected:
+ case ConnectionStatusConnected:
qDebug() << "Ready";
mLoop->exit(0);
break;
@@ -140,16 +140,16 @@ void TestConnBasics::init()
QCOMPARE(mConn->isReady(), true);
qDebug() << "connection is now ready";
- if (mConn->status() != Connection::StatusConnected) {
+ if (mConn->status() != ConnectionStatusConnected) {
QVERIFY(connect(mConn.data(),
- SIGNAL(statusChanged(Tp::Connection::Status, Tp::ConnectionStatusReason)),
- SLOT(expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason))));
+ SIGNAL(statusChanged(Tp::ConnectionStatus, Tp::ConnectionStatusReason)),
+ SLOT(expectConnReady(Tp::ConnectionStatus, Tp::ConnectionStatusReason))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(disconnect(mConn.data(),
- SIGNAL(statusChanged(Tp::Connection::Status, Tp::ConnectionStatusReason)),
+ SIGNAL(statusChanged(Tp::ConnectionStatus, Tp::ConnectionStatusReason)),
this,
- SLOT(expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason))));
- QCOMPARE(mConn->status(), Connection::StatusConnected);
+ SLOT(expectConnReady(Tp::ConnectionStatus, Tp::ConnectionStatusReason))));
+ QCOMPARE(mConn->status(), ConnectionStatusConnected);
}
}
diff --git a/tests/dbus/conn-capabilities.cpp b/tests/dbus/conn-capabilities.cpp
index b298698c..67727685 100644
--- a/tests/dbus/conn-capabilities.cpp
+++ b/tests/dbus/conn-capabilities.cpp
@@ -105,7 +105,7 @@ void TestConnCapabilities::testCapabilities()
SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
- QCOMPARE(mConn->status(), Connection::StatusConnected);
+ QCOMPARE(mConn->status(), ConnectionStatusConnected);
// Now we should have the real information on what the connection supports
QCOMPARE(mConn->capabilities().textChats(), true);
@@ -128,7 +128,7 @@ void TestConnCapabilities::testCapabilities()
} while (!mConnInvalidated);
QVERIFY(!mConn->isValid());
- QCOMPARE(mConn->status(), Connection::StatusDisconnected);
+ QCOMPARE(mConn->status(), ConnectionStatusDisconnected);
// Check that no support for anything is again reported
QCOMPARE(mConn->capabilities().textChats(), false);
diff --git a/tests/dbus/conn-requests.cpp b/tests/dbus/conn-requests.cpp
index ac9211da..698de5c5 100644
--- a/tests/dbus/conn-requests.cpp
+++ b/tests/dbus/conn-requests.cpp
@@ -186,7 +186,7 @@ void TestConnRequests::initTestCase()
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
- QCOMPARE(mConn->status(), Connection::StatusConnected);
+ QCOMPARE(mConn->status(), ConnectionStatusConnected);
}
void TestConnRequests::init()
diff --git a/tests/dbus/conn-roster-groups.cpp b/tests/dbus/conn-roster-groups.cpp
index 9de36816..8d0cab6b 100644
--- a/tests/dbus/conn-roster-groups.cpp
+++ b/tests/dbus/conn-roster-groups.cpp
@@ -157,7 +157,7 @@ void TestConnRosterGroups::testRosterGroups()
SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
- QCOMPARE(mConn->status(), Connection::StatusConnected);
+ QCOMPARE(mConn->status(), ConnectionStatusConnected);
Features features = Features() << Connection::FeatureRoster << Connection::FeatureRosterGroups;
QVERIFY(connect(mConn->becomeReady(features),
@@ -326,7 +326,7 @@ void TestConnRosterGroups::testNotADeathTrap()
SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
- QCOMPARE(mConn->status(), Connection::StatusConnected);
+ QCOMPARE(mConn->status(), ConnectionStatusConnected);
// As the conn is now ready, the contact building functions shouldn't return an error now
QVERIFY(mConn->contactManager() != 0);
@@ -561,7 +561,7 @@ void TestConnRosterGroups::testNotADeathTrap()
} while (!mConnInvalidated);
QVERIFY(!mConn->isValid());
- QCOMPARE(mConn->status(), Connection::StatusDisconnected);
+ QCOMPARE(mConn->status(), ConnectionStatusDisconnected);
// Now that the conn is invalidated NOTHING should work anymore
QVERIFY(connect(mConn->contactManager()->contactsForIdentifiers(QStringList()),
@@ -637,7 +637,7 @@ void TestConnRosterGroups::cleanup()
mContact.clear();
if (mConn) {
- if (mConn->status() != Connection::StatusDisconnected) {
+ if (mConn->status() != ConnectionStatusDisconnected) {
// Disconnect and wait for the readiness change
QVERIFY(connect(mConn->requestDisconnect(),
SIGNAL(finished(Tp::PendingOperation*)),
diff --git a/tests/dbus/conn-roster.cpp b/tests/dbus/conn-roster.cpp
index 121bdc10..663596e6 100644
--- a/tests/dbus/conn-roster.cpp
+++ b/tests/dbus/conn-roster.cpp
@@ -157,7 +157,7 @@ void TestConnRoster::init()
SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
- QCOMPARE(mConn->status(), Connection::StatusConnected);
+ QCOMPARE(mConn->status(), ConnectionStatusConnected);
}
void TestConnRoster::testRoster()
diff --git a/tests/dbus/contacts-avatar.cpp b/tests/dbus/contacts-avatar.cpp
index 96775991..e13123f9 100644
--- a/tests/dbus/contacts-avatar.cpp
+++ b/tests/dbus/contacts-avatar.cpp
@@ -267,7 +267,7 @@ void TestContactsAvatar::initTestCase()
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
- QCOMPARE(mConn->status(), Connection::StatusConnected);
+ QCOMPARE(mConn->status(), ConnectionStatusConnected);
QVERIFY(mConn->contactManager()->supportedFeatures().contains(Contact::FeatureAvatarData));
}
diff --git a/tests/dbus/contacts-capabilities.cpp b/tests/dbus/contacts-capabilities.cpp
index 7d075a48..856a2e11 100644
--- a/tests/dbus/contacts-capabilities.cpp
+++ b/tests/dbus/contacts-capabilities.cpp
@@ -119,7 +119,7 @@ void TestContactsCapabilities::initTestCase()
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
- QCOMPARE(mConn->status(), Connection::StatusConnected);
+ QCOMPARE(mConn->status(), ConnectionStatusConnected);
QVERIFY(mConn->contactManager()->supportedFeatures().contains(Contact::FeatureCapabilities));
}
diff --git a/tests/dbus/contacts-info.cpp b/tests/dbus/contacts-info.cpp
index cbd3b080..076d808d 100644
--- a/tests/dbus/contacts-info.cpp
+++ b/tests/dbus/contacts-info.cpp
@@ -128,7 +128,7 @@ void TestContactsInfo::initTestCase()
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
- QCOMPARE(mConn->status(), Connection::StatusConnected);
+ QCOMPARE(mConn->status(), ConnectionStatusConnected);
QVERIFY(mConn->contactManager()->supportedFeatures().contains(Contact::FeatureInfo));
}
diff --git a/tests/dbus/contacts-location.cpp b/tests/dbus/contacts-location.cpp
index 8c797a53..85f20163 100644
--- a/tests/dbus/contacts-location.cpp
+++ b/tests/dbus/contacts-location.cpp
@@ -128,7 +128,7 @@ void TestContactsLocation::initTestCase()
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
- QCOMPARE(mConn->status(), Connection::StatusConnected);
+ QCOMPARE(mConn->status(), ConnectionStatusConnected);
QVERIFY(mConn->contactManager()->supportedFeatures().contains(Contact::FeatureLocation));
}
diff --git a/tests/dbus/contacts.cpp b/tests/dbus/contacts.cpp
index 6e6edccb..50bfefce 100644
--- a/tests/dbus/contacts.cpp
+++ b/tests/dbus/contacts.cpp
@@ -37,7 +37,7 @@ public:
}
protected Q_SLOTS:
- void expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason);
+ void expectConnReady(Tp::ConnectionStatus, Tp::ConnectionStatusReason);
void expectConnInvalidated();
void expectPendingContactsFinished(Tp::PendingOperation *);
@@ -65,18 +65,18 @@ private:
Tp::UIntList mInvalidHandles;
};
-void TestContacts::expectConnReady(Tp::Connection::Status newStatus,
+void TestContacts::expectConnReady(Tp::ConnectionStatus newStatus,
Tp::ConnectionStatusReason newStatusReason)
{
switch (newStatus) {
- case Connection::StatusDisconnected:
+ case ConnectionStatusDisconnected:
qWarning() << "Disconnected";
mLoop->exit(1);
break;
- case Connection::StatusConnecting:
+ case ConnectionStatusConnecting:
/* do nothing */
break;
- case Connection::StatusConnected:
+ case ConnectionStatusConnected:
qDebug() << "Ready";
mLoop->exit(0);
break;
@@ -171,16 +171,16 @@ void TestContacts::initTestCase()
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(features), true);
- if (mConn->status() != Connection::StatusConnected) {
+ if (mConn->status() != ConnectionStatusConnected) {
QVERIFY(connect(mConn.data(),
- SIGNAL(statusChanged(Tp::Connection::Status, Tp::ConnectionStatusReason)),
- SLOT(expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason))));
+ SIGNAL(statusChanged(Tp::ConnectionStatus, Tp::ConnectionStatusReason)),
+ SLOT(expectConnReady(Tp::ConnectionStatus, Tp::ConnectionStatusReason))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(disconnect(mConn.data(),
- SIGNAL(statusChanged(Tp::Connection::Status, Tp::ConnectionStatusReason)),
+ SIGNAL(statusChanged(Tp::ConnectionStatus, Tp::ConnectionStatusReason)),
this,
- SLOT(expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason))));
- QCOMPARE(mConn->status(), Connection::StatusConnected);
+ SLOT(expectConnReady(Tp::ConnectionStatus, Tp::ConnectionStatusReason))));
+ QCOMPARE(mConn->status(), ConnectionStatusConnected);
}
}
diff --git a/tests/dbus/handles.cpp b/tests/dbus/handles.cpp
index 65c819cb..ff2007f7 100644
--- a/tests/dbus/handles.cpp
+++ b/tests/dbus/handles.cpp
@@ -31,7 +31,7 @@ public:
{ }
protected Q_SLOTS:
- void expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason);
+ void expectConnReady(Tp::ConnectionStatus, Tp::ConnectionStatusReason);
void expectConnInvalidated();
void expectPendingHandlesFinished(Tp::PendingOperation*);
@@ -51,18 +51,18 @@ private:
ReferencedHandles mHandles;
};
-void TestHandles::expectConnReady(Tp::Connection::Status newStatus,
+void TestHandles::expectConnReady(Tp::ConnectionStatus newStatus,
Tp::ConnectionStatusReason newStatusReason)
{
switch (newStatus) {
- case Connection::StatusDisconnected:
+ case ConnectionStatusDisconnected:
qWarning() << "Disconnected";
mLoop->exit(1);
break;
- case Connection::StatusConnecting:
+ case ConnectionStatusConnecting:
/* do nothing */
break;
- case Connection::StatusConnected:
+ case ConnectionStatusConnected:
qDebug() << "Ready";
mLoop->exit(0);
break;
@@ -151,16 +151,16 @@ void TestHandles::initTestCase()
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
- if (mConn->status() != Connection::StatusConnected) {
+ if (mConn->status() != ConnectionStatusConnected) {
QVERIFY(connect(mConn.data(),
- SIGNAL(statusChanged(Tp::Connection::Status, Tp::ConnectionStatusReason)),
- SLOT(expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason))));
+ SIGNAL(statusChanged(Tp::ConnectionStatus, Tp::ConnectionStatusReason)),
+ SLOT(expectConnReady(Tp::ConnectionStatus, Tp::ConnectionStatusReason))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(disconnect(mConn.data(),
- SIGNAL(statusChanged(Tp::Connection::Status, Tp::ConnectionStatusReason)),
+ SIGNAL(statusChanged(Tp::ConnectionStatus, Tp::ConnectionStatusReason)),
this,
- SLOT(expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason))));
- QCOMPARE(mConn->status(), Connection::StatusConnected);
+ SLOT(expectConnReady(Tp::ConnectionStatus, Tp::ConnectionStatusReason))));
+ QCOMPARE(mConn->status(), ConnectionStatusConnected);
}
}
diff --git a/tests/dbus/streamed-media-chan.cpp b/tests/dbus/streamed-media-chan.cpp
index 57f86a51..159e40d4 100644
--- a/tests/dbus/streamed-media-chan.cpp
+++ b/tests/dbus/streamed-media-chan.cpp
@@ -570,7 +570,7 @@ void TestStreamedMediaChan::initTestCase()
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
QCOMPARE(static_cast<uint>(mConn->status()),
- static_cast<uint>(Connection::StatusConnected));
+ static_cast<uint>(ConnectionStatusConnected));
}
void TestStreamedMediaChan::init()
diff --git a/tests/dbus/text-chan.cpp b/tests/dbus/text-chan.cpp
index 327da967..f161b453 100644
--- a/tests/dbus/text-chan.cpp
+++ b/tests/dbus/text-chan.cpp
@@ -164,7 +164,7 @@ void TestTextChan::initTestCase()
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
QCOMPARE(static_cast<uint>(mConn->status()),
- static_cast<uint>(Connection::StatusConnected));
+ static_cast<uint>(ConnectionStatusConnected));
// create a Channel by magic, rather than doing D-Bus round-trips for it