From d423fd0975569928faeafad28702750407e889ee Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Mon, 5 Mar 2012 12:10:32 +1000 Subject: Avoid using internal testlib API in QDbusConnection autotest. 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 --- .../dbus/qdbusconnection/tst_qdbusconnection.cpp | 24 ++++------------------ 1 file changed, 4 insertions(+), 20 deletions(-) (limited to 'tests/auto/dbus') diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp index e1d128dac7..65b68b7f34 100644 --- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp +++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp @@ -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 -- cgit v1.2.3