[telepathy-qt4/master] conn-capabilities test: Fixed test to work now that capabilities support is part of Connection FeatureCore.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Thu Oct 8 09:42:26 PDT 2009
---
tests/dbus/conn-capabilities.cpp | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/tests/dbus/conn-capabilities.cpp b/tests/dbus/conn-capabilities.cpp
index 2560c5e..b222784 100644
--- a/tests/dbus/conn-capabilities.cpp
+++ b/tests/dbus/conn-capabilities.cpp
@@ -74,17 +74,6 @@ void TestConnCapabilities::initTestCase()
g_free(connPath);
mConn = Connection::create(mConnName, mConnPath);
- QCOMPARE(mConn->isReady(), false);
-
- QVERIFY(connect(mConn->requestConnect(),
- SIGNAL(finished(Tp::PendingOperation*)),
- SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
- QCOMPARE(mLoop->exec(), 0);
- QCOMPARE(mConn->isReady(), true);
-
- QCOMPARE(mConn->status(), static_cast<uint>(Connection::StatusConnected));
-
- QVERIFY(mConn->requestsInterface() != 0);
}
void TestConnCapabilities::init()
@@ -95,10 +84,13 @@ void TestConnCapabilities::init()
void TestConnCapabilities::testCapabilities()
{
QVERIFY(mConn->capabilities() == 0);
- QVERIFY(connect(mConn->becomeReady(),
+ QVERIFY(connect(mConn->requestConnect(),
SIGNAL(finished(Tp::PendingOperation*)),
SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
+ QCOMPARE(mConn->isReady(), true);
+ QCOMPARE(mConn->status(), static_cast<uint>(Connection::StatusConnected));
+ QVERIFY(mConn->requestsInterface() != 0);
QVERIFY(mConn->capabilities() != 0);
QCOMPARE(mConn->capabilities()->supportsTextChats(), true);
QCOMPARE(mConn->capabilities()->supportsTextChatrooms(), false);
--
1.5.6.5
More information about the telepathy-commits
mailing list