[Telepathy-commits] [telepathy-qt4/master] conn-basics: add a test for the alternative constructor that specifies a bus

[Simon McVittie]

---
 tests/pinocchio/conn-basics.cpp |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/tests/pinocchio/conn-basics.cpp b/tests/pinocchio/conn-basics.cpp
index dce0a58..6b26f2d 100644
--- a/tests/pinocchio/conn-basics.cpp
+++ b/tests/pinocchio/conn-basics.cpp
@@ -32,6 +32,7 @@ private Q_SLOTS:
 
     void testInitialIntrospection();
     void testConnect();
+    void testSpecifiedBus();
 
     void cleanup();
     void cleanupTestCase();
@@ -73,8 +74,6 @@ void TestConnBasics::initTestCase()
 void TestConnBasics::init()
 {
     initImpl();
-
-    mConn = new Connection(mConnBusName, mConnObjectPath);
 }
 
 
@@ -106,6 +105,8 @@ void TestConnBasics::expectNotYetConnected(uint newReadiness)
 
 void TestConnBasics::testInitialIntrospection()
 {
+    mConn = new Connection(mConnBusName, mConnObjectPath);
+
     QCOMPARE(mConn->readiness(), Connection::ReadinessJustCreated);
     QCOMPARE(static_cast<uint>(mConn->status()),
         static_cast<uint>(Telepathy::ConnectionStatusDisconnected));
@@ -218,6 +219,24 @@ void TestConnBasics::cleanup()
 }
 
 
+void TestConnBasics::testSpecifiedBus()
+{
+    mConn = new Connection(QDBusConnection::sessionBus(),
+        mConnBusName, mConnObjectPath);
+
+    QCOMPARE(mConn->readiness(), Connection::ReadinessJustCreated);
+    QCOMPARE(static_cast<uint>(mConn->status()),
+        static_cast<uint>(Telepathy::ConnectionStatusDisconnected));
+
+    // Wait for introspection to run (readiness changes to NYC)
+    QVERIFY(connect(mConn, SIGNAL(readinessChanged(uint)),
+          this, SLOT(expectNotYetConnected(uint))));
+    QCOMPARE(mLoop->exec(), 0);
+    QVERIFY(disconnect(mConn, SIGNAL(readinessChanged(uint)),
+          this, SLOT(expectNotYetConnected(uint))));
+}
+
+
 void TestConnBasics::cleanupTestCase()
 {
     delete mCM;
-- 
1.5.6.5