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

Make selftest for QEXPECT_FAIL more robust.

Browse Source 
Make the test fail if calling QEXPECT_FAIL with the mode set to Abort
does not cause the current test function to abort.  Previously, such an
error would not cause the selftest to fail and someone would have to see
the warning message in the test output to know that there is a problem.

Change-Id: I2bd58fafe6b51ea0ab86fde7c5afb781e4534ee4
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald 2012-01-11 16:26:03 +10:00 committed by Qt by Nokia
parent a59bc6a6e4
commit 29d8d8faec
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
View File

@ -70,7 +70,9 @@ void tst_ExpectFail::expectAndAbort() const
qDebug("begin"); qDebug("begin");
QEXPECT_FAIL("", "This should xfail", Abort); QEXPECT_FAIL("", "This should xfail", Abort);
QVERIFY(false); QVERIFY(false);
qDebug("this should not be reached");
// If we get here the test did not correctly abort on the previous QVERIFY.
QVERIFY2(false, "This should not be reached");
} }
void tst_ExpectFail::xfailWithQString() const void tst_ExpectFail::xfailWithQString() const