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

Test skip and fail in cleanup() as well as in cleanupTestCase()

Browse Source 
The skipcleanup and failcleanup tests were actually testing skip and
fail in cleanupTestCase(), not in cleanup(). Add almost-duplicate
tests and clean up so that we now have {fail,skip}cleanup(,testcase}
tests to cover all four cases. Generated expected output. The new
tests (with old names) get their fail or skip - during cleanup() -
reported against the test instead of the cleanupTestCase function.
(Results for {init,cleanup}TestCase() are always reported, even when
these slots are not defined, as no-op passes.)

Pick-to: 6.4
Change-Id: I0988d1696b50c0e2f30c45ddc25e1bd0bfd2151a
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
This commit is contained in:
Edward Welbourne 2022-07-11 14:27:28 +02:00
parent afbae9c2ac
commit 21e9c223b7
34 changed files with 314 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/testlib/selftests/CMakeLists.txt
View File

@ -60,6 +60,7 @@ set(subprograms
expectfail expectfail
extendedcompare extendedcompare
failcleanup failcleanup
failcleanuptestcase
faildatatype faildatatype
failfetchtype failfetchtype
failinit failinit
@ -82,6 +83,7 @@ set(subprograms
singleskip singleskip
skip skip
skipcleanup skipcleanup
skipcleanuptestcase
skipinit skipinit
skipinitdata skipinitdata
sleep sleep

6
tests/auto/testlib/selftests/expected_failcleanup.junitxml
View File

@ -6,8 +6,8 @@
<property name="QtBuild" value=""/> <property name="QtBuild" value=""/>
</properties> </properties>
<testcase name="initTestCase" classname="tst_FailCleanup" time="@TEST_DURATION@"/> <testcase name="initTestCase" classname="tst_FailCleanup" time="@TEST_DURATION@"/>
<testcase name="aTestFunction" classname="tst_FailCleanup" time="@TEST_DURATION@"/> <testcase name="aTestFunction" classname="tst_FailCleanup" time="@TEST_DURATION@">
<testcase name="cleanupTestCase" classname="tst_FailCleanup" time="@TEST_DURATION@"> <failure type="fail" message="&apos;false&apos; returned FALSE. (Fail inside cleanup)"/>
<failure type="fail" message="&apos;false&apos; returned FALSE. (Fail inside cleanupTestCase)"/>
</testcase> </testcase>
<testcase name="cleanupTestCase" classname="tst_FailCleanup" time="@TEST_DURATION@"/>
</testsuite> </testsuite>

10
tests/auto/testlib/selftests/expected_failcleanup.lightxml
View File

@ -8,13 +8,13 @@
<Duration msecs="0"/> <Duration msecs="0"/>
</TestFunction> </TestFunction>
<TestFunction name="aTestFunction"> <TestFunction name="aTestFunction">
<Incident type="pass" file="" line="0" />
<Duration msecs="0"/>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp" line="0"> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp" line="0">
<Description><![CDATA['false' returned FALSE. (Fail inside cleanupTestCase)]]></Description> <Description><![CDATA['false' returned FALSE. (Fail inside cleanup)]]></Description>
</Incident> </Incident>
<Duration msecs="0"/> <Duration msecs="0"/>
</TestFunction> </TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0" />
<Duration msecs="0"/>
</TestFunction>
<Duration msecs="0"/> <Duration msecs="0"/>

8
tests/auto/testlib/selftests/expected_failcleanup.tap
View File

@ -1,19 +1,19 @@
TAP version 13 TAP version 13
# tst_FailCleanup # tst_FailCleanup
ok 1 - initTestCase() ok 1 - initTestCase()
ok 2 - aTestFunction() not ok 2 - aTestFunction()
not ok 3 - cleanupTestCase()
--- ---
type: QVERIFY type: QVERIFY
message: Fail inside cleanupTestCase message: Fail inside cleanup
wanted: true (false) wanted: true (false)
found: false (false) found: false (false)
expected: true (false) expected: true (false)
actual: false (false) actual: false (false)
at: tst_FailCleanup::cleanupTestCase() (qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp:0) at: tst_FailCleanup::aTestFunction() (qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp:0)
file: qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp file: qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp
line: 0 line: 0
... ...
ok 3 - cleanupTestCase()
1..3 1..3
# tests 3 # tests 3
# pass 2 # pass 2

2
tests/auto/testlib/selftests/expected_failcleanup.teamcity
View File

@ -2,8 +2,8 @@
##teamcity[testStarted name='initTestCase()' flowId='tst_FailCleanup'] ##teamcity[testStarted name='initTestCase()' flowId='tst_FailCleanup']
##teamcity[testFinished name='initTestCase()' flowId='tst_FailCleanup'] ##teamcity[testFinished name='initTestCase()' flowId='tst_FailCleanup']
##teamcity[testStarted name='aTestFunction()' flowId='tst_FailCleanup'] ##teamcity[testStarted name='aTestFunction()' flowId='tst_FailCleanup']
##teamcity[testFailed name='aTestFunction()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp(0)|]' details='|'false|' returned FALSE. (Fail inside cleanup)' flowId='tst_FailCleanup']
##teamcity[testFinished name='aTestFunction()' flowId='tst_FailCleanup'] ##teamcity[testFinished name='aTestFunction()' flowId='tst_FailCleanup']
##teamcity[testStarted name='cleanupTestCase()' flowId='tst_FailCleanup'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_FailCleanup']
##teamcity[testFailed name='cleanupTestCase()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp(0)|]' details='|'false|' returned FALSE. (Fail inside cleanupTestCase)' flowId='tst_FailCleanup']
##teamcity[testFinished name='cleanupTestCase()' flowId='tst_FailCleanup'] ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_FailCleanup']
##teamcity[testSuiteFinished name='tst_FailCleanup' flowId='tst_FailCleanup'] ##teamcity[testSuiteFinished name='tst_FailCleanup' flowId='tst_FailCleanup']

4
tests/auto/testlib/selftests/expected_failcleanup.txt
View File

@ -1,8 +1,8 @@
********* Start testing of tst_FailCleanup ********* ********* Start testing of tst_FailCleanup *********
Config: Using QtTest library Config: Using QtTest library
PASS : tst_FailCleanup::initTestCase() PASS : tst_FailCleanup::initTestCase()
PASS : tst_FailCleanup::aTestFunction() FAIL! : tst_FailCleanup::aTestFunction() 'false' returned FALSE. (Fail inside cleanup)
FAIL! : tst_FailCleanup::cleanupTestCase() 'false' returned FALSE. (Fail inside cleanupTestCase)
Loc: [qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp(0)] Loc: [qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp(0)]
PASS : tst_FailCleanup::cleanupTestCase()
Totals: 2 passed, 1 failed, 0 skipped, 0 blacklisted, 0ms Totals: 2 passed, 1 failed, 0 skipped, 0 blacklisted, 0ms
********* Finished testing of tst_FailCleanup ********* ********* Finished testing of tst_FailCleanup *********

8
tests/auto/testlib/selftests/expected_failcleanup.xml
View File

@ -10,13 +10,13 @@
<Duration msecs="0"/> <Duration msecs="0"/>
</TestFunction> </TestFunction>
<TestFunction name="aTestFunction"> <TestFunction name="aTestFunction">
<Incident type="pass" file="" line="0" /> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp" line="0">
<Description><![CDATA['false' returned FALSE. (Fail inside cleanup)]]></Description>
</Incident>
<Duration msecs="0"/> <Duration msecs="0"/>
</TestFunction> </TestFunction>
<TestFunction name="cleanupTestCase"> <TestFunction name="cleanupTestCase">
<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp" line="0"> <Incident type="pass" file="" line="0" />
<Description><![CDATA['false' returned FALSE. (Fail inside cleanupTestCase)]]></Description>
</Incident>
<Duration msecs="0"/> <Duration msecs="0"/>
</TestFunction> </TestFunction>
<Duration msecs="0"/> <Duration msecs="0"/>

13
tests/auto/testlib/selftests/expected_failcleanuptestcase.junitxml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<testsuite name="tst_FailCleanupTestCase" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="1" errors="0" skipped="0" time="@TEST_DURATION@">
<properties>
<property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
<property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
<property name="QtBuild" value=""/>
</properties>
<testcase name="initTestCase" classname="tst_FailCleanupTestCase" time="@TEST_DURATION@"/>
<testcase name="aTestFunction" classname="tst_FailCleanupTestCase" time="@TEST_DURATION@"/>
<testcase name="cleanupTestCase" classname="tst_FailCleanupTestCase" time="@TEST_DURATION@">
<failure type="fail" message="&apos;false&apos; returned FALSE. (Fail inside cleanupTestCase)"/>
</testcase>
</testsuite>

20
tests/auto/testlib/selftests/expected_failcleanuptestcase.lightxml Normal file
View File

@ -0,0 +1,20 @@
<Environment>
<QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
<QtBuild/>
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0" />
<Duration msecs="0"/>
</TestFunction>
<TestFunction name="aTestFunction">
<Incident type="pass" file="" line="0" />
<Duration msecs="0"/>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/failcleanuptestcase/tst_failcleanuptestcase.cpp" line="0">
<Description><![CDATA['false' returned FALSE. (Fail inside cleanupTestCase)]]></Description>
</Incident>
<Duration msecs="0"/>
</TestFunction>
<Duration msecs="0"/>

20
tests/auto/testlib/selftests/expected_failcleanuptestcase.tap Normal file
View File

@ -0,0 +1,20 @@
TAP version 13
# tst_FailCleanupTestCase
ok 1 - initTestCase()
ok 2 - aTestFunction()
not ok 3 - cleanupTestCase()
---
type: QVERIFY
message: Fail inside cleanupTestCase
wanted: true (false)
found: false (false)
expected: true (false)
actual: false (false)
at: tst_FailCleanupTestCase::cleanupTestCase() (qtbase/tests/auto/testlib/selftests/failcleanuptestcase/tst_failcleanuptestcase.cpp:0)
file: qtbase/tests/auto/testlib/selftests/failcleanuptestcase/tst_failcleanuptestcase.cpp
line: 0
...
1..3
# tests 3
# pass 2
# fail 1

9
tests/auto/testlib/selftests/expected_failcleanuptestcase.teamcity Normal file
View File

@ -0,0 +1,9 @@
##teamcity[testSuiteStarted name='tst_FailCleanupTestCase' flowId='tst_FailCleanupTestCase']
##teamcity[testStarted name='initTestCase()' flowId='tst_FailCleanupTestCase']
##teamcity[testFinished name='initTestCase()' flowId='tst_FailCleanupTestCase']
##teamcity[testStarted name='aTestFunction()' flowId='tst_FailCleanupTestCase']
##teamcity[testFinished name='aTestFunction()' flowId='tst_FailCleanupTestCase']
##teamcity[testStarted name='cleanupTestCase()' flowId='tst_FailCleanupTestCase']
##teamcity[testFailed name='cleanupTestCase()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/failcleanuptestcase/tst_failcleanuptestcase.cpp(0)|]' details='|'false|' returned FALSE. (Fail inside cleanupTestCase)' flowId='tst_FailCleanupTestCase']
##teamcity[testFinished name='cleanupTestCase()' flowId='tst_FailCleanupTestCase']
##teamcity[testSuiteFinished name='tst_FailCleanupTestCase' flowId='tst_FailCleanupTestCase']

8
tests/auto/testlib/selftests/expected_failcleanuptestcase.txt Normal file
View File

@ -0,0 +1,8 @@
********* Start testing of tst_FailCleanupTestCase *********
Config: Using QtTest library
PASS : tst_FailCleanupTestCase::initTestCase()
PASS : tst_FailCleanupTestCase::aTestFunction()
FAIL! : tst_FailCleanupTestCase::cleanupTestCase() 'false' returned FALSE. (Fail inside cleanupTestCase)
Loc: [qtbase/tests/auto/testlib/selftests/failcleanuptestcase/tst_failcleanuptestcase.cpp(0)]
Totals: 2 passed, 1 failed, 0 skipped, 0 blacklisted, 0ms
********* Finished testing of tst_FailCleanupTestCase *********

23
tests/auto/testlib/selftests/expected_failcleanuptestcase.xml Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<TestCase name="tst_FailCleanupTestCase">
<Environment>
<QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
<QtBuild/>
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0" />
<Duration msecs="0"/>
</TestFunction>
<TestFunction name="aTestFunction">
<Incident type="pass" file="" line="0" />
<Duration msecs="0"/>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/failcleanuptestcase/tst_failcleanuptestcase.cpp" line="0">
<Description><![CDATA['false' returned FALSE. (Fail inside cleanupTestCase)]]></Description>
</Incident>
<Duration msecs="0"/>
</TestFunction>
<Duration msecs="0"/>
</TestCase>

6
tests/auto/testlib/selftests/expected_skipcleanup.junitxml
View File

@ -6,8 +6,8 @@
<property name="QtBuild" value=""/> <property name="QtBuild" value=""/>
</properties> </properties>
<testcase name="initTestCase" classname="tst_SkipCleanup" time="@TEST_DURATION@"/> <testcase name="initTestCase" classname="tst_SkipCleanup" time="@TEST_DURATION@"/>
<testcase name="aTestFunction" classname="tst_SkipCleanup" time="@TEST_DURATION@"/> <testcase name="aTestFunction" classname="tst_SkipCleanup" time="@TEST_DURATION@">
<testcase name="cleanupTestCase" classname="tst_SkipCleanup" time="@TEST_DURATION@"> <skipped message="Skip inside cleanup."/>
<skipped message="Skip inside cleanupTestCase."/>
</testcase> </testcase>
<testcase name="cleanupTestCase" classname="tst_SkipCleanup" time="@TEST_DURATION@"/>
</testsuite> </testsuite>

10
tests/auto/testlib/selftests/expected_skipcleanup.lightxml
View File

@ -8,13 +8,13 @@
<Duration msecs="0"/> <Duration msecs="0"/>
</TestFunction> </TestFunction>
<TestFunction name="aTestFunction"> <TestFunction name="aTestFunction">
<Incident type="pass" file="" line="0" />
<Duration msecs="0"/>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp" line="0"> <Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp" line="0">
<Description><![CDATA[Skip inside cleanupTestCase.]]></Description> <Description><![CDATA[Skip inside cleanup.]]></Description>
</Incident> </Incident>
<Duration msecs="0"/> <Duration msecs="0"/>
</TestFunction> </TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0" />
<Duration msecs="0"/>
</TestFunction>
<Duration msecs="0"/> <Duration msecs="0"/>

4
tests/auto/testlib/selftests/expected_skipcleanup.tap
View File

@ -1,8 +1,8 @@
TAP version 13 TAP version 13
# tst_SkipCleanup # tst_SkipCleanup
ok 1 - initTestCase() ok 1 - initTestCase()
ok 2 - aTestFunction() ok 2 - aTestFunction() # SKIP Skip inside cleanup.
ok 3 - cleanupTestCase() # SKIP Skip inside cleanupTestCase. ok 3 - cleanupTestCase()
1..3 1..3
# tests 3 # tests 3
# pass 2 # pass 2

2
tests/auto/testlib/selftests/expected_skipcleanup.teamcity
View File

@ -2,8 +2,8 @@
##teamcity[testStarted name='initTestCase()' flowId='tst_SkipCleanup'] ##teamcity[testStarted name='initTestCase()' flowId='tst_SkipCleanup']
##teamcity[testFinished name='initTestCase()' flowId='tst_SkipCleanup'] ##teamcity[testFinished name='initTestCase()' flowId='tst_SkipCleanup']
##teamcity[testStarted name='aTestFunction()' flowId='tst_SkipCleanup'] ##teamcity[testStarted name='aTestFunction()' flowId='tst_SkipCleanup']
##teamcity[testIgnored name='aTestFunction()' message='Skip inside cleanup. |[Loc: qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp(0)|]' flowId='tst_SkipCleanup']
##teamcity[testFinished name='aTestFunction()' flowId='tst_SkipCleanup'] ##teamcity[testFinished name='aTestFunction()' flowId='tst_SkipCleanup']
##teamcity[testStarted name='cleanupTestCase()' flowId='tst_SkipCleanup'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_SkipCleanup']
##teamcity[testIgnored name='cleanupTestCase()' message='Skip inside cleanupTestCase. |[Loc: qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp(0)|]' flowId='tst_SkipCleanup']
##teamcity[testFinished name='cleanupTestCase()' flowId='tst_SkipCleanup'] ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_SkipCleanup']
##teamcity[testSuiteFinished name='tst_SkipCleanup' flowId='tst_SkipCleanup'] ##teamcity[testSuiteFinished name='tst_SkipCleanup' flowId='tst_SkipCleanup']

4
tests/auto/testlib/selftests/expected_skipcleanup.txt
View File

@ -1,8 +1,8 @@
********* Start testing of tst_SkipCleanup ********* ********* Start testing of tst_SkipCleanup *********
Config: Using QtTest library Config: Using QtTest library
PASS : tst_SkipCleanup::initTestCase() PASS : tst_SkipCleanup::initTestCase()
PASS : tst_SkipCleanup::aTestFunction() SKIP : tst_SkipCleanup::aTestFunction() Skip inside cleanup.
SKIP : tst_SkipCleanup::cleanupTestCase() Skip inside cleanupTestCase.
Loc: [qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp(0)] Loc: [qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp(0)]
PASS : tst_SkipCleanup::cleanupTestCase()
Totals: 2 passed, 0 failed, 1 skipped, 0 blacklisted, 0ms Totals: 2 passed, 0 failed, 1 skipped, 0 blacklisted, 0ms
********* Finished testing of tst_SkipCleanup ********* ********* Finished testing of tst_SkipCleanup *********

8
tests/auto/testlib/selftests/expected_skipcleanup.xml
View File

@ -10,13 +10,13 @@
<Duration msecs="0"/> <Duration msecs="0"/>
</TestFunction> </TestFunction>
<TestFunction name="aTestFunction"> <TestFunction name="aTestFunction">
<Incident type="pass" file="" line="0" /> <Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp" line="0">
<Description><![CDATA[Skip inside cleanup.]]></Description>
</Incident>
<Duration msecs="0"/> <Duration msecs="0"/>
</TestFunction> </TestFunction>
<TestFunction name="cleanupTestCase"> <TestFunction name="cleanupTestCase">
<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp" line="0"> <Incident type="pass" file="" line="0" />
<Description><![CDATA[Skip inside cleanupTestCase.]]></Description>
</Incident>
<Duration msecs="0"/> <Duration msecs="0"/>
</TestFunction> </TestFunction>
<Duration msecs="0"/> <Duration msecs="0"/>

13
tests/auto/testlib/selftests/expected_skipcleanuptestcase.junitxml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<testsuite name="tst_SkipCleanupTestCase" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="1" time="@TEST_DURATION@">
<properties>
<property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
<property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
<property name="QtBuild" value=""/>
</properties>
<testcase name="initTestCase" classname="tst_SkipCleanupTestCase" time="@TEST_DURATION@"/>
<testcase name="aTestFunction" classname="tst_SkipCleanupTestCase" time="@TEST_DURATION@"/>
<testcase name="cleanupTestCase" classname="tst_SkipCleanupTestCase" time="@TEST_DURATION@">
<skipped message="Skip inside cleanupTestCase."/>
</testcase>
</testsuite>

20
tests/auto/testlib/selftests/expected_skipcleanuptestcase.lightxml Normal file
View File

@ -0,0 +1,20 @@
<Environment>
<QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
<QtBuild/>
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0" />
<Duration msecs="0"/>
</TestFunction>
<TestFunction name="aTestFunction">
<Incident type="pass" file="" line="0" />
<Duration msecs="0"/>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skipcleanuptestcase/tst_skipcleanuptestcase.cpp" line="0">
<Description><![CDATA[Skip inside cleanupTestCase.]]></Description>
</Incident>
<Duration msecs="0"/>
</TestFunction>
<Duration msecs="0"/>

9
tests/auto/testlib/selftests/expected_skipcleanuptestcase.tap Normal file
View File

@ -0,0 +1,9 @@
TAP version 13
# tst_SkipCleanupTestCase
ok 1 - initTestCase()
ok 2 - aTestFunction()
ok 3 - cleanupTestCase() # SKIP Skip inside cleanupTestCase.
1..3
# tests 3
# pass 2
# fail 0

9
tests/auto/testlib/selftests/expected_skipcleanuptestcase.teamcity Normal file
View File

@ -0,0 +1,9 @@
##teamcity[testSuiteStarted name='tst_SkipCleanupTestCase' flowId='tst_SkipCleanupTestCase']
##teamcity[testStarted name='initTestCase()' flowId='tst_SkipCleanupTestCase']
##teamcity[testFinished name='initTestCase()' flowId='tst_SkipCleanupTestCase']
##teamcity[testStarted name='aTestFunction()' flowId='tst_SkipCleanupTestCase']
##teamcity[testFinished name='aTestFunction()' flowId='tst_SkipCleanupTestCase']
##teamcity[testStarted name='cleanupTestCase()' flowId='tst_SkipCleanupTestCase']
##teamcity[testIgnored name='cleanupTestCase()' message='Skip inside cleanupTestCase. |[Loc: qtbase/tests/auto/testlib/selftests/skipcleanuptestcase/tst_skipcleanuptestcase.cpp(0)|]' flowId='tst_SkipCleanupTestCase']
##teamcity[testFinished name='cleanupTestCase()' flowId='tst_SkipCleanupTestCase']
##teamcity[testSuiteFinished name='tst_SkipCleanupTestCase' flowId='tst_SkipCleanupTestCase']

8
tests/auto/testlib/selftests/expected_skipcleanuptestcase.txt Normal file
View File

@ -0,0 +1,8 @@
********* Start testing of tst_SkipCleanupTestCase *********
Config: Using QtTest library
PASS : tst_SkipCleanupTestCase::initTestCase()
PASS : tst_SkipCleanupTestCase::aTestFunction()
SKIP : tst_SkipCleanupTestCase::cleanupTestCase() Skip inside cleanupTestCase.
Loc: [qtbase/tests/auto/testlib/selftests/skipcleanuptestcase/tst_skipcleanuptestcase.cpp(0)]
Totals: 2 passed, 0 failed, 1 skipped, 0 blacklisted, 0ms
********* Finished testing of tst_SkipCleanupTestCase *********

23
tests/auto/testlib/selftests/expected_skipcleanuptestcase.xml Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<TestCase name="tst_SkipCleanupTestCase">
<Environment>
<QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
<QtBuild/>
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0" />
<Duration msecs="0"/>
</TestFunction>
<TestFunction name="aTestFunction">
<Incident type="pass" file="" line="0" />
<Duration msecs="0"/>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skipcleanuptestcase/tst_skipcleanuptestcase.cpp" line="0">
<Description><![CDATA[Skip inside cleanupTestCase.]]></Description>
</Incident>
<Duration msecs="0"/>
</TestFunction>
<Duration msecs="0"/>
</TestCase>

8
tests/auto/testlib/selftests/failcleanup/CMakeLists.txt
View File

@ -1,12 +1,10 @@
# Generated from failcleanup.pro.
##################################################################### #####################################################################
## failcleanup Binary: ## failcleanup Binary:
##################################################################### #####################################################################
qt_internal_add_executable(failcleanup qt_internal_add_executable(failcleanup
NO_INSTALL # special case NO_INSTALL
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
SOURCES SOURCES
tst_failcleanup.cpp tst_failcleanup.cpp
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
@ -16,6 +14,4 @@ qt_internal_add_executable(failcleanup
## Scopes: ## Scopes:
##################################################################### #####################################################################
# special case begin
qt_internal_apply_testlib_coverage_options(failcleanup) qt_internal_apply_testlib_coverage_options(failcleanup)
# special case end

6
tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp
View File

@ -8,7 +8,7 @@ class tst_FailCleanup: public QObject
Q_OBJECT Q_OBJECT
private slots: private slots:
void aTestFunction() const; void aTestFunction() const;
void cleanupTestCase() const; void cleanup() const;
}; };
void tst_FailCleanup::aTestFunction() const void tst_FailCleanup::aTestFunction() const
@ -16,9 +16,9 @@ void tst_FailCleanup::aTestFunction() const
QVERIFY(true); QVERIFY(true);
} }
void tst_FailCleanup::cleanupTestCase() const void tst_FailCleanup::cleanup() const
{ {
QVERIFY2(false, "Fail inside cleanupTestCase"); QVERIFY2(false, "Fail inside cleanup");
} }
QTEST_APPLESS_MAIN(tst_FailCleanup) QTEST_APPLESS_MAIN(tst_FailCleanup)

17
tests/auto/testlib/selftests/failcleanuptestcase/CMakeLists.txt Normal file
View File

@ -0,0 +1,17 @@
#####################################################################
## failcleanuptestcase Binary:
#####################################################################
qt_internal_add_executable(failcleanuptestcase
NO_INSTALL
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
SOURCES
tst_failcleanuptestcase.cpp
PUBLIC_LIBRARIES
Qt::Test
)
## Scopes:
#####################################################################
qt_internal_apply_testlib_coverage_options(failcleanuptestcase)

25
tests/auto/testlib/selftests/failcleanuptestcase/tst_failcleanuptestcase.cpp Normal file
View File

@ -0,0 +1,25 @@
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include <QTest>
class tst_FailCleanupTestCase: public QObject
{
Q_OBJECT
private slots:
void aTestFunction() const;
void cleanupTestCase() const;
};
void tst_FailCleanupTestCase::aTestFunction() const
{
QVERIFY(true);
}
void tst_FailCleanupTestCase::cleanupTestCase() const
{
QVERIFY2(false, "Fail inside cleanupTestCase");
}
QTEST_APPLESS_MAIN(tst_FailCleanupTestCase)
#include "tst_failcleanuptestcase.moc"

13
tests/auto/testlib/selftests/generate_expected_output.py
View File

@ -32,14 +32,15 @@ TESTS = ['assert', 'badxml', 'benchlibcallgrind', 'benchlibcounting',
'benchlibwalltime', 'blacklisted', 'cmptest', 'commandlinedata', 'benchlibwalltime', 'blacklisted', 'cmptest', 'commandlinedata',
'counting', 'crashes', 'datatable', 'datetime', 'deleteLater', 'counting', 'crashes', 'datatable', 'datetime', 'deleteLater',
'deleteLater_noApp', 'differentexec', 'exceptionthrow', 'expectfail', 'deleteLater_noApp', 'differentexec', 'exceptionthrow', 'expectfail',
"extendedcompare", 'failcleanup', 'faildatatype', 'failfetchtype', 'failinit', "extendedcompare", 'failcleanup', 'failcleanuptestcase',
'failinitdata', 'fetchbogus', 'findtestdata', 'float', 'globaldata', 'faildatatype', 'failfetchtype', 'failinit', 'failinitdata',
'longstring', 'maxwarnings', 'mouse', 'multiexec', 'pairdiagnostics', 'pass', 'fetchbogus', 'findtestdata', 'float', 'globaldata', 'longstring',
'maxwarnings', 'mouse', 'multiexec', 'pairdiagnostics', 'pass',
'printdatatags', 'printdatatagswithglobaltags', 'qexecstringlist', 'printdatatags', 'printdatatagswithglobaltags', 'qexecstringlist',
'signaldumper', 'silent', 'singleskip', 'skip', 'skipcleanup', 'signaldumper', 'silent', 'singleskip', 'skip', 'skipcleanup',
'skipinit', 'skipinitdata', 'sleep', 'strcmp', 'subtest', 'testlib', 'skipcleanuptestcase', 'skipinit', 'skipinitdata', 'sleep', 'strcmp',
'tuplediagnostics', 'verbose1', 'verbose2', 'verifyexceptionthrown', 'subtest', 'testlib', 'tuplediagnostics', 'verbose1', 'verbose2',
'warnings', 'watchdog', 'junit', 'keyboard'] 'verifyexceptionthrown', 'warnings', 'watchdog', 'junit', 'keyboard']
class Fail (Exception): pass class Fail (Exception): pass

8
tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt
View File

@ -1,12 +1,10 @@
# Generated from skipcleanup.pro.
##################################################################### #####################################################################
## skipcleanup Binary: ## skipcleanup Binary:
##################################################################### #####################################################################
qt_internal_add_executable(skipcleanup qt_internal_add_executable(skipcleanup
NO_INSTALL # special case NO_INSTALL
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
SOURCES SOURCES
tst_skipcleanup.cpp tst_skipcleanup.cpp
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
@ -16,6 +14,4 @@ qt_internal_add_executable(skipcleanup
## Scopes: ## Scopes:
##################################################################### #####################################################################
# special case begin
qt_internal_apply_testlib_coverage_options(skipcleanup) qt_internal_apply_testlib_coverage_options(skipcleanup)
# special case end

6
tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp
View File

@ -8,7 +8,7 @@ class tst_SkipCleanup: public QObject
Q_OBJECT Q_OBJECT
private slots: private slots:
void aTestFunction() const; void aTestFunction() const;
void cleanupTestCase() const; void cleanup() const;
}; };
void tst_SkipCleanup::aTestFunction() const void tst_SkipCleanup::aTestFunction() const
@ -16,9 +16,9 @@ void tst_SkipCleanup::aTestFunction() const
QVERIFY(true); QVERIFY(true);
} }
void tst_SkipCleanup::cleanupTestCase() const void tst_SkipCleanup::cleanup() const
{ {
QSKIP("Skip inside cleanupTestCase."); QSKIP("Skip inside cleanup.");
} }
QTEST_APPLESS_MAIN(tst_SkipCleanup) QTEST_APPLESS_MAIN(tst_SkipCleanup)

17
tests/auto/testlib/selftests/skipcleanuptestcase/CMakeLists.txt Normal file
View File

@ -0,0 +1,17 @@
#####################################################################
## skipcleanuptestcase Binary:
#####################################################################
qt_internal_add_executable(skipcleanuptestcase
NO_INSTALL
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
SOURCES
tst_skipcleanuptestcase.cpp
PUBLIC_LIBRARIES
Qt::Test
)
## Scopes:
#####################################################################
qt_internal_apply_testlib_coverage_options(skipcleanuptestcase)

25
tests/auto/testlib/selftests/skipcleanuptestcase/tst_skipcleanuptestcase.cpp Normal file
View File

@ -0,0 +1,25 @@
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include <QTest>
class tst_SkipCleanupTestCase: public QObject
{
Q_OBJECT
private slots:
void aTestFunction() const;
void cleanupTestCase() const;
};
void tst_SkipCleanupTestCase::aTestFunction() const
{
QVERIFY(true);
}
void tst_SkipCleanupTestCase::cleanupTestCase() const
{
QSKIP("Skip inside cleanupTestCase.");
}
QTEST_APPLESS_MAIN(tst_SkipCleanupTestCase)
#include "tst_skipcleanuptestcase.moc"