[Telepathy-commits] [telepathy-qt4/master] Connection: Fixed pinocchio test conn-basics.

[Andre Moreira Magalhaes (andrunko)]

---
 tests/pinocchio/conn-basics.cpp |   55 ++++++++++++++++++++++-----------------
 1 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/tests/pinocchio/conn-basics.cpp b/tests/pinocchio/conn-basics.cpp
index a064183..d1043ab 100644
--- a/tests/pinocchio/conn-basics.cpp
+++ b/tests/pinocchio/conn-basics.cpp
@@ -134,32 +134,36 @@ void TestConnBasics::expectReady(uint newStatus, uint newStatusReason)
 void TestConnBasics::testConnect()
 {
     mConn = new Connection(mConnBusName, mConnObjectPath);
+    QCOMPARE(mConn->isReady(), false);
 
     QCOMPARE(static_cast<uint>(mConn->status()),
         static_cast<uint>(Connection::StatusUnknown));
 
-    QVERIFY(connect(mConn->becomeReady(),
+    qDebug() << "calling Connect()";
+    QVERIFY(connect(mConn->requestConnect(),
             SIGNAL(finished(Telepathy::Client::PendingOperation*)),
             this,
             SLOT(expectSuccessfulCall(Telepathy::Client::PendingOperation*))));
     QCOMPARE(mLoop->exec(), 0);
-    QCOMPARE(mConn->isReady(), true);
 
-    qDebug() << "calling Connect()";
-    QVERIFY(connect(mConn->requestConnect(),
+    QVERIFY(connect(mConn->becomeReady(),
             SIGNAL(finished(Telepathy::Client::PendingOperation*)),
             this,
             SLOT(expectSuccessfulCall(Telepathy::Client::PendingOperation*))));
     QCOMPARE(mLoop->exec(), 0);
+    QCOMPARE(mConn->isReady(), true);
 
-    // Wait for readiness to reach Full
-
-    qDebug() << "waiting for Full readiness";
-    QVERIFY(connect(mConn, SIGNAL(statusChanged(uint, uint)),
-          this, SLOT(expectReady(uint, uint))));
-    QCOMPARE(mLoop->exec(), 0);
-    QVERIFY(disconnect(mConn, SIGNAL(statusChanged(uint, uint)),
-          this, SLOT(expectReady(uint, uint))));
+    if (mConn->status() != Connection::StatusConnected) {
+        QVERIFY(connect(mConn,
+                        SIGNAL(statusChanged(uint, uint)),
+                        SLOT(expectReady(uint, uint))));
+        QCOMPARE(mLoop->exec(), 0);
+        QVERIFY(disconnect(mConn,
+                           SIGNAL(statusChanged(uint, uint)),
+                           this,
+                           SLOT(expectReady(uint, uint))));
+        QCOMPARE(mConn->status(), (uint) Connection::StatusConnected);
+    }
 
     QVERIFY(connect(mConn->becomeReady(Connection::FeatureSelfPresence),
             SIGNAL(finished(Telepathy::Client::PendingOperation*)),
@@ -207,28 +211,31 @@ void TestConnBasics::testAlreadyConnected()
 {
     mConn = new Connection(mConnBusName, mConnObjectPath);
 
-    QVERIFY(connect(mConn->becomeReady(),
+    qDebug() << "calling Connect()";
+    QVERIFY(connect(mConn->requestConnect(),
             SIGNAL(finished(Telepathy::Client::PendingOperation*)),
             this,
             SLOT(expectSuccessfulCall(Telepathy::Client::PendingOperation*))));
     QCOMPARE(mLoop->exec(), 0);
-    QCOMPARE(mConn->isReady(), true);
 
-    qDebug() << "calling Connect()";
-    QVERIFY(connect(mConn->requestConnect(),
+    QVERIFY(connect(mConn->becomeReady(),
             SIGNAL(finished(Telepathy::Client::PendingOperation*)),
             this,
             SLOT(expectSuccessfulCall(Telepathy::Client::PendingOperation*))));
     QCOMPARE(mLoop->exec(), 0);
+    QCOMPARE(mConn->isReady(), true);
 
-    // Wait for readiness to reach Full
-
-    qDebug() << "waiting for Full readiness";
-    QVERIFY(connect(mConn, SIGNAL(statusChanged(uint, uint)),
-          this, SLOT(expectReady(uint, uint))));
-    QCOMPARE(mLoop->exec(), 0);
-    QVERIFY(disconnect(mConn, SIGNAL(statusChanged(uint, uint)),
-          this, SLOT(expectReady(uint, uint))));
+    if (mConn->status() != Connection::StatusConnected) {
+        QVERIFY(connect(mConn,
+                        SIGNAL(statusChanged(uint, uint)),
+                        SLOT(expectReady(uint, uint))));
+        QCOMPARE(mLoop->exec(), 0);
+        QVERIFY(disconnect(mConn,
+                           SIGNAL(statusChanged(uint, uint)),
+                           this,
+                           SLOT(expectReady(uint, uint))));
+        QCOMPARE(mConn->status(), (uint) Connection::StatusConnected);
+    }
 
     // delete proxy, make a new one
     delete mConn;
-- 
1.5.6.5