From 7337b20422aa9afe4a92aaca3807507b0d982244 Mon Sep 17 00:00:00 2001
From: Rhys Weatherley <rhys.weatherley@nokia.com>
Date: Thu, 16 Dec 2010 10:13:29 +1000
Subject: Improve verbose output mode

---
 src/imports/testlib/TestCase.qml          |  8 ++++++--
 src/quicktestlib/quicktestresult.cpp      | 20 +++++++++++++-------
 tests/qmlauto/selftests/tst_selftests.qml |  2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml
index ea9df59..f4ce323 100644
--- a/src/imports/testlib/TestCase.qml
+++ b/src/imports/testlib/TestCase.qml
@@ -135,8 +135,12 @@ Item {
         var act = qtest_formatValue(actual)
         var exp = qtest_formatValue(expected)
         var success = qtest_compareInternal(actual, expected)
-        if (msg === undefined)
-            msg = ""
+        if (msg === undefined) {
+            if (success)
+                msg = "COMPARE()"
+            else
+                msg = "Compared values are not the same"
+        }
         if (!qtest_results.compare(success, msg, act, exp, Qt.qtest_caller_file(), Qt.qtest_caller_line()))
             throw new Error("QtQuickTest::fail")
     }
diff --git a/src/quicktestlib/quicktestresult.cpp b/src/quicktestlib/quicktestresult.cpp
index 285a26b..46b3453 100644
--- a/src/quicktestlib/quicktestresult.cpp
+++ b/src/quicktestlib/quicktestresult.cpp
@@ -398,7 +398,7 @@ void QuickTestResult::fail
 bool QuickTestResult::verify
     (bool success, const QString &message, const QString &file, int line)
 {
-    if (message.isEmpty()) {
+    if (!success && message.isEmpty()) {
         return QTestResult::verify
             (success, "verify()", "",
              qtest_fixFile(file).toLatin1().constData(), line);
@@ -414,12 +414,18 @@ bool QuickTestResult::compare
      const QString &val1, const QString &val2,
      const QString &file, int line)
 {
-    return QTestResult::compare
-        (success, message.toLocal8Bit().constData(),
-         QTest::toString(val1.toLatin1().constData()),
-         QTest::toString(val2.toLatin1().constData()),
-         "", "",
-         qtest_fixFile(file).toLatin1().constData(), line);
+    if (success) {
+        return QTestResult::compare
+            (success, message.toLocal8Bit().constData(),
+             qtest_fixFile(file).toLatin1().constData(), line);
+    } else {
+        return QTestResult::compare
+            (success, message.toLocal8Bit().constData(),
+             QTest::toString(val1.toLatin1().constData()),
+             QTest::toString(val2.toLatin1().constData()),
+             "", "",
+             qtest_fixFile(file).toLatin1().constData(), line);
+    }
 }
 
 void QuickTestResult::skipSingle
diff --git a/tests/qmlauto/selftests/tst_selftests.qml b/tests/qmlauto/selftests/tst_selftests.qml
index c26250d..875a242 100644
--- a/tests/qmlauto/selftests/tst_selftests.qml
+++ b/tests/qmlauto/selftests/tst_selftests.qml
@@ -208,7 +208,7 @@ TestCase {
             testCase.compare("abcdef", 42)
         } catch (e) {
             compare(e.message, "QtQuickTest::fail")
-            compare(functions.failmsg, "")
+            compare(functions.failmsg, "Compared values are not the same")
             compare(functions.actual, "abcdef")
             compare(functions.expected, "42")
             caught = true
-- 
cgit v1.2.3