AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid using internal testlib API in QDbusConnection autotest.

Browse Source 
QCOMPARE should only be used in a test function because it makes the
test function return if the compare fails.  The test wants to compare
without returning on failure because the compare is inside a helper
function called by many test functions, so the test was calling
testlib's internal QTest::compare_helper() functions instead of
QCOMPARE.

This commit makes this code slightly less objectionable by calling the
public QTest::qCompare() instead.

Change-Id: Ida17a641e89f8a297d6a036449f44b33aa266368
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Jason McDonald 2012-03-05 12:10:32 +10:00 committed by Qt by Nokia
parent 8db8a34f07
commit d423fd0975
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -829,16 +829,8 @@ bool tst_QDBusConnection::callMethod(const QDBusConnection &conn, const QString
QDBusMessage reply = conn.call(msg, QDBus::Block/*WithGui*/);
if (reply.type() != QDBusMessage::ReplyMessage)
return false;
if (MyObject::path == path) {
QTest::compare_helper(true, "COMPARE()", __FILE__, __LINE__);
} else {
QTest::compare_helper(false, "Compared values are not the same",
QTest::toString(MyObject::path), QTest::toString(path),
"MyObject::path", "path", __FILE__, __LINE__);
return false;
}
return true;
QTest::qCompare(MyObject::path, path, "MyObject::path", "path", __FILE__, __LINE__);
return (MyObject::path == path);
}
bool tst_QDBusConnection::callMethodPeer(const QDBusConnection &conn, const QString &path)
@ -848,16 +840,8 @@ bool tst_QDBusConnection::callMethodPeer(const QDBusConnection &conn, const QStr
if (reply.type() != QDBusMessage::ReplyMessage)
return false;
if (MyObject::path == path) {
QTest::compare_helper(true, "COMPARE()", __FILE__, __LINE__);
} else {
QTest::compare_helper(false, "Compared values are not the same",
QTest::toString(MyObject::path), QTest::toString(path),
"MyObject::path", "path", __FILE__, __LINE__);
return false;
}
return true;
QTest::qCompare(MyObject::path, path, "MyObject::path", "path", __FILE__, __LINE__);
return (MyObject::path == path);
}
class TestObject : public QObject