dbus/test/qt tst_qdbusconnection.cpp,1.2,1.3

[Harald Fernengel]

Update of /cvs/dbus/dbus/test/qt
In directory gabe:/tmp/cvs-serv15183

Modified Files:
	tst_qdbusconnection.cpp 
Log Message:
convert to QTestLib 4.1


Index: tst_qdbusconnection.cpp
===================================================================
RCS file: /cvs/dbus/dbus/test/qt/tst_qdbusconnection.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tst_qdbusconnection.cpp	30 Sep 2005 15:05:33 -0000	1.2
+++ tst_qdbusconnection.cpp	22 Jan 2006 19:42:18 -0000	1.3
@@ -34,15 +34,15 @@
     QDBusConnection con = QDBusConnection::addConnection(
             QDBusConnection::SessionBus);
 
-    VERIFY(con.isConnected());
+    QVERIFY(con.isConnected());
 
     QDBusMessage msg = QDBusMessage::signal("/org/kde/selftest", "org.kde.selftest",
             "Ping");
     msg << QLatin1String("ping");
 
-    VERIFY(con.send(msg));
+    QVERIFY(con.send(msg));
 
-    QTest::wait(1000);
+    QTest::qWait(1000);
 }
 
 void tst_QDBusConnection::send()
@@ -50,35 +50,35 @@
     QDBusConnection con = QDBusConnection::addConnection(
             QDBusConnection::SessionBus);
 
-    VERIFY(con.isConnected());
+    QVERIFY(con.isConnected());
 
     QDBusMessage msg = QDBusMessage::methodCall("org.freedesktop.DBus",
             "/org/freedesktop/DBus", "org.freedesktop.DBus", "ListNames");
 
     QDBusMessage reply = con.sendWithReply(msg);
 
-    COMPARE(reply.count(), 1);
-    COMPARE(reply.at(0).typeName(), "QStringList");
-    VERIFY(reply.at(0).toStringList().contains(con.baseService()));
+    QCOMPARE(reply.count(), 1);
+    QCOMPARE(reply.at(0).typeName(), "QStringList");
+    QVERIFY(reply.at(0).toStringList().contains(con.baseService()));
 }
 
 void tst_QDBusConnection::sendAsync()
 {
     QDBusConnection con = QDBusConnection::addConnection(QDBusConnection::SessionBus);
-    VERIFY(con.isConnected());
+    QVERIFY(con.isConnected());
 
     QDBusSpy spy;
 
     QDBusMessage msg = QDBusMessage::methodCall("org.freedesktop.DBus",
             "/org/freedesktop/DBus", "org.freedesktop.DBus", "ListNames");
     int msgId = con.sendWithReplyAsync(msg, &spy, SLOT(asyncReply(QDBusMessage)));
-    VERIFY(msgId != 0);
+    QVERIFY(msgId != 0);
 
-    QTest::wait(1000);
+    QTest::qWait(1000);
 
-    COMPARE(spy.args.value(0).typeName(), "QStringList");
-    VERIFY(spy.args.at(0).toStringList().contains(con.baseService()));
-    COMPARE(spy.serial, msgId);
+    QCOMPARE(spy.args.value(0).typeName(), "QStringList");
+    QVERIFY(spy.args.at(0).toStringList().contains(con.baseService()));
+    QCOMPARE(spy.serial, msgId);
 }
 
 void tst_QDBusConnection::connect()
@@ -95,12 +95,12 @@
             "ping");
     msg << QLatin1String("ping");
 
-    VERIFY(con.send(msg));
+    QVERIFY(con.send(msg));
 
-    QTest::wait(1000);
+    QTest::qWait(1000);
 
-    COMPARE(spy.args.count(), 1);
-    COMPARE(spy.args.at(0).toString(), QString("ping"));
+    QCOMPARE(spy.args.count(), 1);
+    QCOMPARE(spy.args.at(0).toString(), QString("ping"));
 }
 
 void tst_QDBusConnection::addConnection()
@@ -109,51 +109,51 @@
         QDBusConnection con = QDBusConnection::addConnection(
                 QDBusConnection::SessionBus, "bubu");
 
-        VERIFY(con.isConnected());
-        VERIFY(!con.lastError().isValid());
+        QVERIFY(con.isConnected());
+        QVERIFY(!con.lastError().isValid());
 
         QDBusConnection con2;
-        VERIFY(!con2.isConnected());
-        VERIFY(!con2.lastError().isValid());
+        QVERIFY(!con2.isConnected());
+        QVERIFY(!con2.lastError().isValid());
 
         con2 = con;
-        VERIFY(con.isConnected());
-        VERIFY(con2.isConnected());
-        VERIFY(!con.lastError().isValid());
-        VERIFY(!con2.lastError().isValid());
+        QVERIFY(con.isConnected());
+        QVERIFY(con2.isConnected());
+        QVERIFY(!con.lastError().isValid());
+        QVERIFY(!con2.lastError().isValid());
     }
 
     {
         QDBusConnection con("bubu");
-        VERIFY(con.isConnected());
-        VERIFY(!con.lastError().isValid());
+        QVERIFY(con.isConnected());
+        QVERIFY(!con.lastError().isValid());
     }
 
     QDBusConnection::closeConnection("bubu");
 
     {
         QDBusConnection con("bubu");
-        VERIFY(!con.isConnected());
-        VERIFY(!con.lastError().isValid());
+        QVERIFY(!con.isConnected());
+        QVERIFY(!con.lastError().isValid());
     }
 
     {
         {
             QDBusConnection con = QDBusConnection::addConnection(
                     QDBusConnection::SessionBus);
-            VERIFY(con.isConnected());
+            QVERIFY(con.isConnected());
         }
 
         {
             QDBusConnection con;
-            VERIFY(con.isConnected());
+            QVERIFY(con.isConnected());
             QDBusConnection::closeConnection();
-            VERIFY(con.isConnected());
+            QVERIFY(con.isConnected());
         }
 
         {
             QDBusConnection con;
-            VERIFY(!con.isConnected());
+            QVERIFY(!con.isConnected());
         }
     }
 }