13d2e13290
Added tests for repeated skips and failures (from within void lambdas, to simulate skips and failures from within event handlers). These exhibit yet more ways to count more than one outcome for a test. The new QTest::failOnWarning() can also provoke more than one failure from a single test, and several existing selftests exhibited various ways for the Totals line's counts to add up to more than the number of actual tests run. Fixed counting so that only the first decisive incident is counted. Tests can still report later failure or skipping, but only the first is counted. Added a currentTestState in qtestlog.cpp, by which it keeps track of whether the test has resolved to a result, and clearCurrentTestState() by which other code can reset that at the end of each test. This brought to light various places where test-end clean-up was not being handled - due to failure or skipping in a *_data() method or init, or a skip in cleanup. Fixes: QTBUG-95661 Change-Id: I5d24a37a53d3db225fa602649d8aad8f5ed6c1ad Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
174 lines
7.8 KiB
Plaintext
174 lines
7.8 KiB
Plaintext
TAP version 13
|
|
# tst_ExpectFail
|
|
ok 1 - initTestCase()
|
|
# begin
|
|
not ok 2 - xfailAndContinue() # TODO This should xfail
|
|
---
|
|
at: tst_ExpectFail::xfailAndContinue() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
|
|
file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
|
|
line: 0
|
|
...
|
|
# after
|
|
# begin
|
|
not ok 3 - xfailAndAbort() # TODO This should xfail
|
|
---
|
|
at: tst_ExpectFail::xfailAndAbort() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
|
|
file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
|
|
line: 0
|
|
...
|
|
not ok 4 - xfailContinueSkip() # TODO This should xfail then skip
|
|
---
|
|
at: tst_ExpectFail::xfailContinueSkip() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
|
|
file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
|
|
line: 0
|
|
...
|
|
ok 4 - xfailContinueSkip() # SKIP This skip should be reported and counted
|
|
not ok 5 - xfailAbortSkip() # TODO This should xfail
|
|
---
|
|
at: tst_ExpectFail::xfailAbortSkip() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
|
|
file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
|
|
line: 0
|
|
...
|
|
not ok 6 - xfailTwice()
|
|
---
|
|
# Already expecting a fail
|
|
at: tst_ExpectFail::xfailTwice() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
|
|
file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
|
|
line: 0
|
|
...
|
|
not ok 7 - xfailDataDrivenTwice(Pass Abort)
|
|
---
|
|
# Already expecting a fail
|
|
at: tst_ExpectFail::xfailDataDrivenTwice() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
|
|
file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
|
|
line: 0
|
|
...
|
|
not ok 8 - xfailDataDrivenTwice(Pass Continue)
|
|
---
|
|
# Already expecting a fail
|
|
at: tst_ExpectFail::xfailDataDrivenTwice() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
|
|
file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
|
|
line: 0
|
|
...
|
|
not ok 9 - xfailDataDrivenTwice(Fail Abort)
|
|
---
|
|
# Already expecting a fail
|
|
at: tst_ExpectFail::xfailDataDrivenTwice() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
|
|
file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
|
|
line: 0
|
|
...
|
|
not ok 10 - xfailDataDrivenTwice(Fail Continue)
|
|
---
|
|
# Already expecting a fail
|
|
at: tst_ExpectFail::xfailDataDrivenTwice() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
|
|
file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
|
|
line: 0
|
|
...
|
|
not ok 11 - xfailWithQString() # TODO A string
|
|
---
|
|
at: tst_ExpectFail::xfailWithQString() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
|
|
file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
|
|
line: 0
|
|
...
|
|
ok 12 - xfailDataDrivenWithQString(Pass Abort) # SKIP Each Continue or Pass reports this and increments skip-count
|
|
ok 13 - xfailDataDrivenWithQString(Pass Continue) # SKIP Each Continue or Pass reports this and increments skip-count
|
|
not ok 14 - xfailDataDrivenWithQString(Fail Abort) # TODO A string
|
|
---
|
|
at: tst_ExpectFail::xfailDataDrivenWithQString() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
|
|
file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
|
|
line: 0
|
|
...
|
|
not ok 15 - xfailDataDrivenWithQString(Fail Continue) # TODO A string
|
|
---
|
|
at: tst_ExpectFail::xfailDataDrivenWithQString() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
|
|
file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
|
|
line: 0
|
|
...
|
|
ok 15 - xfailDataDrivenWithQString(Fail Continue) # SKIP Each Continue or Pass reports this and increments skip-count
|
|
ok 16 - xfailDataDrivenWithQVerify(Pass Abort)
|
|
ok 17 - xfailDataDrivenWithQVerify(Pass Continue)
|
|
not ok 18 - xfailDataDrivenWithQVerify(Fail Abort) # TODO This test should xfail
|
|
---
|
|
at: tst_ExpectFail::xfailDataDrivenWithQVerify() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
|
|
file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
|
|
line: 0
|
|
...
|
|
not ok 19 - xfailDataDrivenWithQVerify(Fail Continue) # TODO This test should xfail
|
|
---
|
|
at: tst_ExpectFail::xfailDataDrivenWithQVerify() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
|
|
file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
|
|
line: 0
|
|
...
|
|
ok 20 - xfailDataDrivenWithQCompare(Pass Abort)
|
|
ok 21 - xfailDataDrivenWithQCompare(Pass Continue)
|
|
not ok 22 - xfailDataDrivenWithQCompare(Fail Abort) # TODO This test should xfail
|
|
---
|
|
at: tst_ExpectFail::xfailDataDrivenWithQCompare() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
|
|
file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
|
|
line: 0
|
|
...
|
|
not ok 23 - xfailDataDrivenWithQCompare(Fail Continue) # TODO This test should xfail
|
|
---
|
|
at: tst_ExpectFail::xfailDataDrivenWithQCompare() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
|
|
file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
|
|
line: 0
|
|
...
|
|
# Should pass (*not* xpass), despite test-case name
|
|
ok 24 - xfailOnWrongRow(Fail Abort)
|
|
# Should pass (*not* xpass), despite test-case name
|
|
ok 25 - xfailOnWrongRow(Fail Continue)
|
|
not ok 26 - xfailOnAnyRow(Fail Abort) # TODO This test should xfail
|
|
---
|
|
at: tst_ExpectFail::xfailOnAnyRow() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
|
|
file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
|
|
line: 0
|
|
...
|
|
not ok 27 - xfailOnAnyRow(Fail Continue) # TODO This test should xfail
|
|
---
|
|
at: tst_ExpectFail::xfailOnAnyRow() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
|
|
file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
|
|
line: 0
|
|
...
|
|
# Should fail (*not* xfail), despite test-case name
|
|
not ok 28 - xfailWithoutCheck(Fail Abort)
|
|
---
|
|
# QEXPECT_FAIL was called without any subsequent verification statements
|
|
...
|
|
# Should fail (*not* xfail), despite test-case name
|
|
not ok 29 - xfailWithoutCheck(Fail Continue)
|
|
---
|
|
# QEXPECT_FAIL was called without any subsequent verification statements
|
|
...
|
|
ok 30 - xpassAbort() # TODO 'true' returned TRUE unexpectedly. ()
|
|
ok 31 - xpassAbortSkip() # TODO 'true' returned TRUE unexpectedly. ()
|
|
ok 32 - xpassAbortXfailContinue() # TODO 'true' returned TRUE unexpectedly. ()
|
|
ok 33 - xpassContinue() # TODO 'true' returned TRUE unexpectedly. ()
|
|
# This should be reached
|
|
ok 34 - xpassContinueSkip() # TODO 'true' returned TRUE unexpectedly. ()
|
|
ok 34 - xpassContinueSkip() # SKIP This should be reached but not increment skip-count
|
|
ok 35 - xpassContinueXfailAbort() # TODO 'true' returned TRUE unexpectedly. ()
|
|
not ok 36 - xpassContinueXfailAbort() # TODO This test should xfail but not add to totals
|
|
---
|
|
at: tst_ExpectFail::xpassContinueXfailAbort() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
|
|
file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
|
|
line: 0
|
|
...
|
|
ok 36 - xpassAbortDataDrivenWithQVerify(XPass) # TODO 'true' returned TRUE unexpectedly. ()
|
|
ok 37 - xpassAbortDataDrivenWithQVerify(Pass)
|
|
ok 38 - xpassContinueDataDrivenWithQVerify(XPass) # TODO 'true' returned TRUE unexpectedly. ()
|
|
# Test should Continue past XPASS
|
|
# Test should simply PASS
|
|
ok 39 - xpassContinueDataDrivenWithQVerify(Pass)
|
|
ok 40 - xpassAbortDataDrivenWithQCompare(XPass) # TODO QCOMPARE(1, 1) returned TRUE unexpectedly.
|
|
ok 41 - xpassAbortDataDrivenWithQCompare(Pass)
|
|
ok 42 - xpassContinueDataDrivenWithQCompare(XPass) # TODO QCOMPARE(1, 1) returned TRUE unexpectedly.
|
|
# Test should Continue past XPASS
|
|
# Test should simply PASS
|
|
ok 43 - xpassContinueDataDrivenWithQCompare(Pass)
|
|
# Totals should add up to 44: 23 passed, 17 failed, 4 skipped
|
|
ok 44 - cleanupTestCase()
|
|
1..44
|
|
# tests 44
|
|
# pass 23
|
|
# fail 17
|