qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Friedemann Kleint 2015-07-24 15:42:56 +02:00
parent 752c0d7de0
commit 120867ba7b
5 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp
View File

@ -507,7 +507,7 @@ void tst_QDBusAbstractAdaptor::initTestCase()
// get peer server address
QDBusMessage req = QDBusMessage::createMethodCall(serviceName, objectPath, interfaceName, "address");
QDBusMessage rpl = QDBusConnection::sessionBus().call(req);
QVERIFY(rpl.type() == QDBusMessage::ReplyMessage);
QCOMPARE(rpl.type(), QDBusMessage::ReplyMessage);
QString address = rpl.arguments().at(0).toString();
// connect to peer server
@ -1870,7 +1870,7 @@ void tst_QDBusAbstractAdaptor::methodWithMoreThanOneReturnValue()
QDBusInterface remote(con.baseService(), "/", "local.Interface3", con);
QDBusMessage reply = remote.call(QDBus::BlockWithGui, "methodStringString", testString);
QVERIFY(reply.arguments().count() == 2);
QCOMPARE(reply.arguments().count(), 2);
QDBusReply<int> intreply = reply;
QVERIFY(intreply.isValid());
@ -1892,7 +1892,7 @@ void tst_QDBusAbstractAdaptor::methodWithMoreThanOneReturnValuePeer()
QDBusInterface remote(QString(), "/", "local.Interface3", con);
QDBusMessage reply = remote.call(QDBus::BlockWithGui, "methodStringString", testString);
QVERIFY(reply.arguments().count() == 2);
QCOMPARE(reply.arguments().count(), 2);
QDBusReply<int> intreply = reply;
QVERIFY(intreply.isValid());

36
tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
View File

@ -247,7 +247,7 @@ void tst_QDBusAbstractInterface::initTestCase()
// get peer server address
QDBusMessage req = QDBusMessage::createMethodCall(serviceName, objectPath, interfaceName, "address");
QDBusMessage rpl = con.call(req);
QVERIFY(rpl.type() == QDBusMessage::ReplyMessage);
QCOMPARE(rpl.type(), QDBusMessage::ReplyMessage);
peerAddress = rpl.arguments().at(0).toString();
}
@ -283,7 +283,7 @@ void tst_QDBusAbstractInterface::cleanup()
targetObj.m_complexProp = RegisteredType();
QDBusMessage resetCall = QDBusMessage::createMethodCall(serviceName, objectPath, interfaceName, "reset");
QVERIFY(QDBusConnection::sessionBus().call(resetCall).type() == QDBusMessage::ReplyMessage);
QCOMPARE(QDBusConnection::sessionBus().call(resetCall).type(), QDBusMessage::ReplyMessage);
}
void tst_QDBusAbstractInterface::makeVoidCall()
@ -441,7 +441,7 @@ void tst_QDBusAbstractInterface::makeAsyncStringCallPeer()
QVERIFY2(p, "Not connected to D-Bus");
QDBusMessage reply = p->call(QDBus::BlockWithGui, QLatin1String("voidMethod"));
QVERIFY(reply.type() == QDBusMessage::ReplyMessage);
QCOMPARE(reply.type(), QDBusMessage::ReplyMessage);
QDBusPendingReply<QString> r = p->stringMethod();
r.waitForFinished();
@ -622,7 +622,7 @@ void tst_QDBusAbstractInterface::complexPropRead()
RegisteredType expectedValue = targetObj.m_complexProp = RegisteredType("This is a test");
QVariant v = p->property("complexProp");
QVERIFY(v.userType() == qMetaTypeId<RegisteredType>());
QCOMPARE(v.userType(), qMetaTypeId<RegisteredType>());
QCOMPARE(v.value<RegisteredType>(), targetObj.m_complexProp);
}
@ -694,7 +694,7 @@ void tst_QDBusAbstractInterface::complexPropReadPeer()
RegisteredType expectedValue = RegisteredType("This is a test");
QVariant v = p->property("complexProp");
QVERIFY(v.userType() == qMetaTypeId<RegisteredType>());
QCOMPARE(v.userType(), qMetaTypeId<RegisteredType>());
QCOMPARE(v.value<RegisteredType>(), expectedValue);
}
@ -861,8 +861,8 @@ void tst_QDBusAbstractInterface::getVoidSignal()
QTestEventLoop::instance().enterLoop(2);
QVERIFY(!QTestEventLoop::instance().timeout());
QVERIFY(s.size() == 1);
QVERIFY(s.at(0).size() == 0);
QCOMPARE(s.size(), 1);
QCOMPARE(s.at(0).size(), 0);
}
void tst_QDBusAbstractInterface::getStringSignal_data()
@ -886,8 +886,8 @@ void tst_QDBusAbstractInterface::getStringSignal()
QTestEventLoop::instance().enterLoop(2);
QVERIFY(!QTestEventLoop::instance().timeout());
QVERIFY(s.size() == 1);
QVERIFY(s[0].size() == 1);
QCOMPARE(s.size(), 1);
QCOMPARE(s[0].size(), 1);
QCOMPARE(s[0][0].userType(), int(QVariant::String));
QCOMPARE(s[0][0].toString(), expectedValue);
}
@ -913,8 +913,8 @@ void tst_QDBusAbstractInterface::getComplexSignal()
QTestEventLoop::instance().enterLoop(2);
QVERIFY(!QTestEventLoop::instance().timeout());
QVERIFY(s.size() == 1);
QVERIFY(s[0].size() == 1);
QCOMPARE(s.size(), 1);
QCOMPARE(s[0].size(), 1);
QCOMPARE(s[0][0].userType(), qMetaTypeId<RegisteredType>());
QCOMPARE(s[0][0].value<RegisteredType>(), expectedValue);
}
@ -942,8 +942,8 @@ void tst_QDBusAbstractInterface::getVoidSignalPeer()
QTestEventLoop::instance().enterLoop(2);
QVERIFY(!QTestEventLoop::instance().timeout());
QVERIFY(s.size() == 1);
QVERIFY(s.at(0).size() == 0);
QCOMPARE(s.size(), 1);
QCOMPARE(s.at(0).size(), 0);
}
void tst_QDBusAbstractInterface::getStringSignalPeer_data()
@ -968,8 +968,8 @@ void tst_QDBusAbstractInterface::getStringSignalPeer()
QTestEventLoop::instance().enterLoop(2);
QVERIFY(!QTestEventLoop::instance().timeout());
QVERIFY(s.size() == 1);
QVERIFY(s[0].size() == 1);
QCOMPARE(s.size(), 1);
QCOMPARE(s[0].size(), 1);
QCOMPARE(s[0][0].userType(), int(QVariant::String));
QCOMPARE(s[0][0].toString(), expectedValue);
}
@ -996,8 +996,8 @@ void tst_QDBusAbstractInterface::getComplexSignalPeer()
QTestEventLoop::instance().enterLoop(2);
QVERIFY(!QTestEventLoop::instance().timeout());
QVERIFY(s.size() == 1);
QVERIFY(s[0].size() == 1);
QCOMPARE(s.size(), 1);
QCOMPARE(s[0].size(), 1);
QCOMPARE(s[0][0].userType(), qMetaTypeId<RegisteredType>());
QCOMPARE(s[0][0].value<RegisteredType>(), expectedValue);
}
@ -1039,7 +1039,7 @@ void tst_QDBusAbstractInterface::followSignal()
// now the signal must have been received:
QCOMPARE(s.size(), 1);
QVERIFY(s.at(0).size() == 0);
QCOMPARE(s.at(0).size(), 0);
// cleanup:
con.interface()->unregisterService(serviceToFollow);

10
tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
View File

@ -168,7 +168,7 @@ void tst_QDBusConnection::noConnection()
QVERIFY(con.callWithCallback(msg, &spy, SLOT(asyncReply)) == 0);
QDBusMessage reply = con.call(msg);
QVERIFY(reply.type() == QDBusMessage::ErrorMessage);
QCOMPARE(reply.type(), QDBusMessage::ErrorMessage);
QDBusReply<void> voidreply(reply);
QVERIFY(!voidreply.isValid());
@ -1041,14 +1041,14 @@ void tst_QDBusConnection::callSelfByAnotherName()
break;
case 1:
QVERIFY(con.interface()->registerService(sname).value() == QDBusConnectionInterface::ServiceRegistered);
QCOMPARE(con.interface()->registerService(sname).value(), QDBusConnectionInterface::ServiceRegistered);
break;
case 2: {
// flag is DBUS_NAME_FLAG_DO_NOT_QUEUE = 0x04
// reply is DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER = 1
QDBusReply<uint> reply = con.interface()->call("RequestName", sname, 4u);
QVERIFY(reply.value() == 1);
QCOMPARE(reply.value(), uint(1));
}
}
@ -1071,7 +1071,7 @@ void tst_QDBusConnection::callSelfByAnotherName()
QString(), "test0");
QDBusMessage reply = con.call(msg, QDBus::Block, 1000);
QVERIFY(reply.type() == QDBusMessage::ReplyMessage);
QCOMPARE(reply.type(), QDBusMessage::ReplyMessage);
}
void tst_QDBusConnection::multipleInterfacesInQObject()
@ -1087,7 +1087,7 @@ void tst_QDBusConnection::multipleInterfacesInQObject()
"local.BaseObject", "anotherMethod");
QDBusMessage reply = con.call(msg, QDBus::Block);
QCOMPARE(reply.type(), QDBusMessage::ReplyMessage);
QVERIFY(reply.arguments().count() == 0);
QCOMPARE(reply.arguments().count(), 0);
}
void tst_QDBusConnection::slotsWithLessParameters()

6
tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp
View File

@ -283,7 +283,7 @@ void tst_QDBusInterface::initTestCase()
// get peer server address
QDBusMessage req = QDBusMessage::createMethodCall(serviceName, objectPath, interfaceName, "address");
QDBusMessage rpl = con.call(req);
QVERIFY(rpl.type() == QDBusMessage::ReplyMessage);
QCOMPARE(rpl.type(), QDBusMessage::ReplyMessage);
QString address = rpl.arguments().at(0).toString();
// connect to peer server
@ -292,7 +292,7 @@ void tst_QDBusInterface::initTestCase()
QDBusMessage req2 = QDBusMessage::createMethodCall(serviceName, objectPath, interfaceName, "waitForConnected");
QDBusMessage rpl2 = con.call(req2);
QVERIFY(rpl2.type() == QDBusMessage::ReplyMessage);
QCOMPARE(rpl2.type(), QDBusMessage::ReplyMessage);
QVERIFY2(rpl2.type() == QDBusMessage::ReplyMessage, rpl2.errorMessage().toLatin1());
}
@ -348,7 +348,7 @@ void tst_QDBusInterface::invalidAfterServiceOwnerChanged()
QTestEventLoop::instance().connect(connIface, SIGNAL(serviceOwnerChanged(QString,QString,QString)),
SLOT(exitLoop()));
QVERIFY(connIface->registerService("com.example.Test") == QDBusConnectionInterface::ServiceRegistered);
QCOMPARE(connIface->registerService("com.example.Test").value(), QDBusConnectionInterface::ServiceRegistered);
QTestEventLoop::instance().enterLoop(5);

22
tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
View File

@ -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;