diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-07-24 15:42:56 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-08-19 19:06:39 +0000 |
commit | 120867ba7b052fdf05977e80019915222f5e1138 (patch) | |
tree | bbfd2222dc44758305548cfadbaf155f4b391046 /tests/auto/dbus/qdbuspendingcall | |
parent | 752c0d7de0fb92124e2251a19841e308c6874159 (diff) |
tests/auto/dbus: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).
- Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer).
- Replace Q[TRY]_VERIFY(smartPointer == 0) by
Q[TRY]_VERIFY(smartPointer.isNull()).
- Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and
add casts where necessary. The values will then be logged
should a test fail.
Change-Id: I363776ef664c97bca0071d57cf78a8fe935bce8e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/dbus/qdbuspendingcall')
-rw-r--r-- | tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp index 9c334f77a2..9833d17a1c 100644 --- a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp +++ b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp @@ -174,14 +174,14 @@ void tst_QDBusPendingCall::waitForFinished() QDBusPendingCall ac = sendMessage(); QVERIFY(!ac.isFinished()); QVERIFY(!ac.isError()); - QVERIFY(ac.reply().type() == QDBusMessage::InvalidMessage); + QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage); ac.waitForFinished(); QVERIFY(ac.isFinished()); QVERIFY(!ac.isError()); const QDBusMessage reply = ac.reply(); - QVERIFY(reply.type() == QDBusMessage::ReplyMessage); + QCOMPARE(reply.type(), QDBusMessage::ReplyMessage); QCOMPARE(reply.signature(), QString("as")); const QVariantList args = ac.reply().arguments(); @@ -197,7 +197,7 @@ void tst_QDBusPendingCall::waitForFinished_error() QDBusPendingCall ac = sendError(); QVERIFY(!ac.isFinished()); QVERIFY(!ac.isError()); - QVERIFY(ac.reply().type() == QDBusMessage::InvalidMessage); + QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage); ac.waitForFinished(); QVERIFY(ac.isFinished()); @@ -256,7 +256,7 @@ void tst_QDBusPendingCall::watcher() QDBusPendingCall ac = sendMessage(); QVERIFY(!ac.isFinished()); QVERIFY(!ac.isError()); - QVERIFY(ac.reply().type() == QDBusMessage::InvalidMessage); + QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage); callCount = 0; watchArgument = 0; @@ -286,7 +286,7 @@ void tst_QDBusPendingCall::watcher_error() QDBusPendingCall ac = sendError(); QVERIFY(!ac.isFinished()); QVERIFY(!ac.isError()); - QVERIFY(ac.reply().type() == QDBusMessage::InvalidMessage); + QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage); callCount = 0; watchArgument = 0; @@ -314,7 +314,7 @@ void tst_QDBusPendingCall::watcher_waitForFinished() QDBusPendingCall ac = sendMessage(); QVERIFY(!ac.isFinished()); QVERIFY(!ac.isError()); - QVERIFY(ac.reply().type() == QDBusMessage::InvalidMessage); + QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage); callCount = 0; watchArgument = 0; @@ -353,7 +353,7 @@ void tst_QDBusPendingCall::watcher_waitForFinished_threaded() QDBusPendingCall ac = tst->sendMessage(); // QVERIFY(!ac.isFinished()); // QVERIFY(!ac.isError()); -// QVERIFY(ac.reply().type() == QDBusMessage::InvalidMessage); +// QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage); QDBusPendingCallWatcher watch(ac); tst->connect(&watch, SIGNAL(finished(QDBusPendingCallWatcher*)), @@ -363,7 +363,7 @@ void tst_QDBusPendingCall::watcher_waitForFinished_threaded() // QVERIFY(!ac.isFinished()); // QVERIFY(!ac.isError()); -// QVERIFY(ac.reply().type() == QDBusMessage::InvalidMessage); +// QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage); QCOMPARE(tst->callCount, 0); QCOMPARE(tst->slotCalled, 0); @@ -393,7 +393,7 @@ void tst_QDBusPendingCall::watcher_waitForFinished_alreadyFinished() QDBusPendingCall ac = sendMessage(); QVERIFY(!ac.isFinished()); QVERIFY(!ac.isError()); - QVERIFY(ac.reply().type() == QDBusMessage::InvalidMessage); + QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage); ac.waitForFinished(); QVERIFY(ac.isFinished()); @@ -427,7 +427,7 @@ void tst_QDBusPendingCall::watcher_waitForFinished_alreadyFinished_eventLoop() QDBusPendingCall ac = sendMessage(); QVERIFY(!ac.isFinished()); QVERIFY(!ac.isError()); - QVERIFY(ac.reply().type() == QDBusMessage::InvalidMessage); + QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage); ac.waitForFinished(); QVERIFY(ac.isFinished()); @@ -464,7 +464,7 @@ void tst_QDBusPendingCall::watcher_waitForFinished_error() QDBusPendingCall ac = sendError(); QVERIFY(!ac.isFinished()); QVERIFY(!ac.isError()); - QVERIFY(ac.reply().type() == QDBusMessage::InvalidMessage); + QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage); callCount = 0; watchArgument = 0; |