summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2012-02-17 15:11:20 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-20 03:27:02 +0100
commitf64f428b8112fb39558cbfe160693e1e4365f7f4 (patch)
treeb87170dbad94a80e3a76ee98307ab734e0f1749b /src/testlib
parent02140e973b86d1fbb25ec695daa59e6ff97138c5 (diff)
testlib: make XPASS output slightly less confusing.
Prior to this commit, when an unexpected pass occurred the test output showed the message "XPASS : tst_foo::function() 'expr' returned FALSE", where the problem was actually that the expression evaluated to true when it was expected to be false. This commit changes the output to make it clear that the expression evaluated to true unexpectedly. Task-number: QTBUG-22118 Change-Id: Id22c178073d3b75789675ca37a8ef019029b1f91 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/testlib')
-rw-r--r--src/testlib/qtestresult.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp
index 79ea22bb43..14ab29af2b 100644
--- a/src/testlib/qtestresult.cpp
+++ b/src/testlib/qtestresult.cpp
@@ -237,7 +237,10 @@ bool QTestResult::verify(bool statement, const char *statementStr,
QTestLog::info(msg, file, line);
}
- qsnprintf(msg, 1024, "'%s' returned FALSE. (%s)", statementStr, description);
+ const char * format = QTest::expectFailMode
+ ? "'%s' returned TRUE unexpectedly. (%s)"
+ : "'%s' returned FALSE. (%s)";
+ qsnprintf(msg, 1024, format, statementStr, description);
return checkStatement(statement, msg, file, line);
}