1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve coverage of expectfail selftest.

Browse Source 
Add a test for the case where QEXPECT_FAIL is called twice in a row
without an intervening verification step, which is supposed to result in
a failure.

Change-Id: Ie004652a76a2c35c2679945670ff5561e8f5b62e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald 2012-01-12 13:16:44 +10:00 committed by Qt by Nokia
parent ced306d403
commit fa07815892
5 changed files with 49 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/auto/testlib/selftests/expected_expectfail.lightxml
View File

@ -9,7 +9,7 @@
<Message type="qdebug" file="" line="0"> <Message type="qdebug" file="" line="0">
<Description><![CDATA[begin]]></Description> <Description><![CDATA[begin]]></Description>
</Message> </Message>
<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="65"> <Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="66">
<Description><![CDATA[This should xfail]]></Description> <Description><![CDATA[This should xfail]]></Description>
</Incident> </Incident>
<Message type="qdebug" file="" line="0"> <Message type="qdebug" file="" line="0">
@ -21,31 +21,36 @@
<Message type="qdebug" file="" line="0"> <Message type="qdebug" file="" line="0">
<Description><![CDATA[begin]]></Description> <Description><![CDATA[begin]]></Description>
</Message> </Message>
<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="73"> <Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="74">
<Description><![CDATA[This should xfail]]></Description> <Description><![CDATA[This should xfail]]></Description>
</Incident> </Incident>
<Incident type="pass" file="" line="0" /> <Incident type="pass" file="" line="0" />
</TestFunction> </TestFunction>
<TestFunction name="expectTwice">
<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="83">
<Description><![CDATA[Already expecting a fail]]></Description>
</Incident>
</TestFunction>
<TestFunction name="xfailWithQString"> <TestFunction name="xfailWithQString">
<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="82"> <Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="93">
<Description><![CDATA[A string]]></Description> <Description><![CDATA[A string]]></Description>
</Incident> </Incident>
<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="87"> <Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="98">
<Description><![CDATA[Bug 5 (The message)]]></Description> <Description><![CDATA[Bug 5 (The message)]]></Description>
</Incident> </Incident>
<Incident type="pass" file="" line="0" /> <Incident type="pass" file="" line="0" />
</TestFunction> </TestFunction>
<TestFunction name="xpass"> <TestFunction name="xpass">
<Incident type="xpass" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="93"> <Incident type="xpass" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="104">
<Description><![CDATA['true' returned FALSE. ()]]></Description> <Description><![CDATA['true' returned FALSE. ()]]></Description>
</Incident> </Incident>
</TestFunction> </TestFunction>
<TestFunction name="dataDrivenTest"> <TestFunction name="dataDrivenTest">
<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="126"> <Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="137">
<DataTag><![CDATA[Abort]]></DataTag> <DataTag><![CDATA[Abort]]></DataTag>
<Description><![CDATA[This test should xfail]]></Description> <Description><![CDATA[This test should xfail]]></Description>
</Incident> </Incident>
<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="126"> <Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="137">
<DataTag><![CDATA[Continue]]></DataTag> <DataTag><![CDATA[Continue]]></DataTag>
<Description><![CDATA[This test should xfail]]></Description> <Description><![CDATA[This test should xfail]]></Description>
</Incident> </Incident>

18
tests/auto/testlib/selftests/expected_expectfail.txt
View File

@ -3,25 +3,27 @@ Config: Using QTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE
PASS : tst_ExpectFail::initTestCase() PASS : tst_ExpectFail::initTestCase()
QDEBUG : tst_ExpectFail::expectAndContinue() begin QDEBUG : tst_ExpectFail::expectAndContinue() begin
XFAIL : tst_ExpectFail::expectAndContinue() This should xfail XFAIL : tst_ExpectFail::expectAndContinue() This should xfail
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(65)] Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(66)]
QDEBUG : tst_ExpectFail::expectAndContinue() after QDEBUG : tst_ExpectFail::expectAndContinue() after
PASS : tst_ExpectFail::expectAndContinue() PASS : tst_ExpectFail::expectAndContinue()
QDEBUG : tst_ExpectFail::expectAndAbort() begin QDEBUG : tst_ExpectFail::expectAndAbort() begin
XFAIL : tst_ExpectFail::expectAndAbort() This should xfail XFAIL : tst_ExpectFail::expectAndAbort() This should xfail
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(73)] Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(74)]
PASS : tst_ExpectFail::expectAndAbort() PASS : tst_ExpectFail::expectAndAbort()
FAIL! : tst_ExpectFail::expectTwice() Already expecting a fail
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(83)]
XFAIL : tst_ExpectFail::xfailWithQString() A string XFAIL : tst_ExpectFail::xfailWithQString() A string
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(82)] Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(93)]
XFAIL : tst_ExpectFail::xfailWithQString() Bug 5 (The message) XFAIL : tst_ExpectFail::xfailWithQString() Bug 5 (The message)
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(87)] Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(98)]
PASS : tst_ExpectFail::xfailWithQString() PASS : tst_ExpectFail::xfailWithQString()
XPASS : tst_ExpectFail::xpass() 'true' returned FALSE. () XPASS : tst_ExpectFail::xpass() 'true' returned FALSE. ()
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(93)] Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(104)]
XFAIL : tst_ExpectFail::dataDrivenTest(Abort) This test should xfail XFAIL : tst_ExpectFail::dataDrivenTest(Abort) This test should xfail
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(126)] Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(137)]
XFAIL : tst_ExpectFail::dataDrivenTest(Continue) This test should xfail XFAIL : tst_ExpectFail::dataDrivenTest(Continue) This test should xfail
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(126)] Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(137)]
PASS : tst_ExpectFail::dataDrivenTest() PASS : tst_ExpectFail::dataDrivenTest()
PASS : tst_ExpectFail::cleanupTestCase() PASS : tst_ExpectFail::cleanupTestCase()
Totals: 6 passed, 1 failed, 0 skipped Totals: 6 passed, 2 failed, 0 skipped
********* Finished testing of tst_ExpectFail ********* ********* Finished testing of tst_ExpectFail *********

19
tests/auto/testlib/selftests/expected_expectfail.xml
View File

@ -11,7 +11,7 @@
<Message type="qdebug" file="" line="0"> <Message type="qdebug" file="" line="0">
<Description><![CDATA[begin]]></Description> <Description><![CDATA[begin]]></Description>
</Message> </Message>
<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="65"> <Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="66">
<Description><![CDATA[This should xfail]]></Description> <Description><![CDATA[This should xfail]]></Description>
</Incident> </Incident>
<Message type="qdebug" file="" line="0"> <Message type="qdebug" file="" line="0">
@ -23,31 +23,36 @@
<Message type="qdebug" file="" line="0"> <Message type="qdebug" file="" line="0">
<Description><![CDATA[begin]]></Description> <Description><![CDATA[begin]]></Description>
</Message> </Message>
<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="73"> <Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="74">
<Description><![CDATA[This should xfail]]></Description> <Description><![CDATA[This should xfail]]></Description>
</Incident> </Incident>
<Incident type="pass" file="" line="0" /> <Incident type="pass" file="" line="0" />
</TestFunction> </TestFunction>
<TestFunction name="expectTwice">
<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="83">
<Description><![CDATA[Already expecting a fail]]></Description>
</Incident>
</TestFunction>
<TestFunction name="xfailWithQString"> <TestFunction name="xfailWithQString">
<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="82"> <Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="93">
<Description><![CDATA[A string]]></Description> <Description><![CDATA[A string]]></Description>
</Incident> </Incident>
<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="87"> <Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="98">
<Description><![CDATA[Bug 5 (The message)]]></Description> <Description><![CDATA[Bug 5 (The message)]]></Description>
</Incident> </Incident>
<Incident type="pass" file="" line="0" /> <Incident type="pass" file="" line="0" />
</TestFunction> </TestFunction>
<TestFunction name="xpass"> <TestFunction name="xpass">
<Incident type="xpass" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="93"> <Incident type="xpass" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="104">
<Description><![CDATA['true' returned FALSE. ()]]></Description> <Description><![CDATA['true' returned FALSE. ()]]></Description>
</Incident> </Incident>
</TestFunction> </TestFunction>
<TestFunction name="dataDrivenTest"> <TestFunction name="dataDrivenTest">
<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="126"> <Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="137">
<DataTag><![CDATA[Abort]]></DataTag> <DataTag><![CDATA[Abort]]></DataTag>
<Description><![CDATA[This test should xfail]]></Description> <Description><![CDATA[This test should xfail]]></Description>
</Incident> </Incident>
<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="126"> <Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="137">
<DataTag><![CDATA[Continue]]></DataTag> <DataTag><![CDATA[Continue]]></DataTag>
<Description><![CDATA[This test should xfail]]></Description> <Description><![CDATA[This test should xfail]]></Description>
</Incident> </Incident>

5
tests/auto/testlib/selftests/expected_expectfail.xunitxml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<testsuite errors="9" failures="1" tests="7" name="tst_ExpectFail"> <testsuite errors="9" failures="2" tests="8" name="tst_ExpectFail">
<properties> <properties>
<property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
<property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
@ -14,6 +14,9 @@
<!-- message="begin" type="qdebug" --> <!-- message="begin" type="qdebug" -->
<!-- message="This should xfail" type="info" --> <!-- message="This should xfail" type="info" -->
</testcase> </testcase>
<testcase result="fail" name="expectTwice">
<failure message="Already expecting a fail" result="fail"/>
</testcase>
<testcase result="xfail" name="xfailWithQString"> <testcase result="xfail" name="xfailWithQString">
<!-- message="A string" type="info" --> <!-- message="A string" type="info" -->
<!-- message="Bug 5 (The message)" type="info" --> <!-- message="Bug 5 (The message)" type="info" -->

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

@ -52,6 +52,7 @@ class tst_ExpectFail: public QObject
private slots: private slots:
void expectAndContinue() const; void expectAndContinue() const;
void expectAndAbort() const; void expectAndAbort() const;
void expectTwice() const;
void xfailWithQString() const; void xfailWithQString() const;
void xpass() const; void xpass() const;
void dataDrivenTest_data() const; void dataDrivenTest_data() const;
@ -76,6 +77,16 @@ void tst_ExpectFail::expectAndAbort() const
QVERIFY2(false, "This should not be reached"); QVERIFY2(false, "This should not be reached");
} }
void tst_ExpectFail::expectTwice() const
{
QEXPECT_FAIL("", "Calling QEXPECT_FAIL once is fine", Abort);
QEXPECT_FAIL("", "Calling QEXPECT_FAIL when already expecting a failure is "
"an error and should abort this test function", Abort);
// If we get here the test did not correctly abort on the double call to QEXPECT_FAIL.
QVERIFY2(false, "This should not be reached");
}
void tst_ExpectFail::xfailWithQString() const void tst_ExpectFail::xfailWithQString() const
{ {
QEXPECT_FAIL("", QString("A string").toLatin1().constData(), Continue); QEXPECT_FAIL("", QString("A string").toLatin1().constData(), Continue);