diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-07-28 10:55:06 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-30 09:38:47 +0000 |
commit | 748055f3edeb893feaaf18051d785aa4f7463825 (patch) | |
tree | 51fca09e11adb2158e2ef1021a1d0d269cff2d58 | |
parent | 571e3a476d0ea3ec0cdf6660c371b05408d047e3 (diff) |
testlib: Regenerate test expectations
After c25687fa0b6e4be043e1f8c92c093d8b06ca06c4 and
539553a57216c4ece292ff54fb623807c334cdb6.
Change-Id: I34b436f20b9c480f6948aa97430228936955808e
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit f9170f56c7a0937547fc5dd60e90c52d72260ef8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
8 files changed, 64 insertions, 63 deletions
diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml index e0eed37d3e..a2e67447d5 100644 --- a/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml +++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml @@ -10,7 +10,8 @@ <!-- type="skip" message="This test is only defined for gcc and x86." --> </testcase> <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> - <system-err> + <system-out> <![CDATA[This test is only defined for gcc and x86.]]> - </system-err> + </system-out> + <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_expectfail.lightxml b/tests/auto/testlib/selftests/expected_expectfail.lightxml index 7c91656b89..ad3b54d668 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.lightxml +++ b/tests/auto/testlib/selftests/expected_expectfail.lightxml @@ -116,11 +116,11 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailWithoutVerify"> -<Incident type="fail" file="" line="0"> +<Incident type="fail" file="Unknown File" line="0"> <DataTag><![CDATA[first row]]></DataTag> <Description><![CDATA[QEXPECT_FAIL was called without any subsequent verification statements]]></Description> </Incident> -<Incident type="fail" file="" line="0"> +<Incident type="fail" file="Unknown File" line="0"> <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[QEXPECT_FAIL was called without any subsequent verification statements]]></Description> </Incident> diff --git a/tests/auto/testlib/selftests/expected_expectfail.tap b/tests/auto/testlib/selftests/expected_expectfail.tap index bc449a7452..02ce53d878 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.tap +++ b/tests/auto/testlib/selftests/expected_expectfail.tap @@ -4,77 +4,77 @@ 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:65) + 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: 65 + 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:73) + 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: 73 + line: 0 ... not ok 4 - xfailTwice() --- # Already expecting a fail - at: tst_ExpectFail::xfailTwice() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:83) + 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: 83 + line: 0 ... not ok 5 - xfailWithQString() # TODO A string --- - at: tst_ExpectFail::xfailWithQString() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:92) + 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: 92 + line: 0 ... not ok 5 - xfailWithQString() # TODO Bug 5 (The message) --- - at: tst_ExpectFail::xfailWithQString() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:97) + 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: 97 + line: 0 ... ok 6 - xfailDataDrivenWithQVerify(Pass 1) ok 7 - xfailDataDrivenWithQVerify(Pass 2) not ok 8 - xfailDataDrivenWithQVerify(Abort) # TODO This test should xfail --- - at: tst_ExpectFail::xfailDataDrivenWithQVerify() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:126) + 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: 126 + line: 0 ... not ok 9 - xfailDataDrivenWithQVerify(Continue) # TODO This test should xfail --- - at: tst_ExpectFail::xfailDataDrivenWithQVerify() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:126) + 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: 126 + line: 0 ... ok 10 - xfailDataDrivenWithQCompare(Pass 1) ok 11 - xfailDataDrivenWithQCompare(Pass 2) not ok 12 - xfailDataDrivenWithQCompare(Abort) # TODO This test should xfail --- - at: tst_ExpectFail::xfailDataDrivenWithQCompare() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:160) + 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: 160 + line: 0 ... not ok 13 - xfailDataDrivenWithQCompare(Continue) # TODO This test should xfail --- - at: tst_ExpectFail::xfailDataDrivenWithQCompare() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:160) + 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: 160 + line: 0 ... ok 14 - xfailOnWrongRow(right row) not ok 15 - xfailOnAnyRow(first row) # TODO This test should xfail --- - at: tst_ExpectFail::xfailOnAnyRow() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:195) + 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: 195 + line: 0 ... not ok 16 - xfailOnAnyRow(second row) # TODO This test should xfail --- - at: tst_ExpectFail::xfailOnAnyRow() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:195) + 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: 195 + line: 0 ... not ok 17 - xfailWithoutVerify(first row) --- diff --git a/tests/auto/testlib/selftests/expected_expectfail.teamcity b/tests/auto/testlib/selftests/expected_expectfail.teamcity index 4931adac22..8de1e3b408 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.teamcity +++ b/tests/auto/testlib/selftests/expected_expectfail.teamcity @@ -2,44 +2,44 @@ ##teamcity[testStarted name='initTestCase()' flowId='tst_ExpectFail'] ##teamcity[testFinished name='initTestCase()' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailAndContinue()' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailAndContinue()' out='QDEBUG: begin|nXFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(65)|]: This should xfail|nQDEBUG: after' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailAndContinue()' out='QDEBUG: begin|nXFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This should xfail|nQDEBUG: after' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailAndContinue()' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailAndAbort()' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailAndAbort()' out='QDEBUG: begin|nXFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(73)|]: This should xfail' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailAndAbort()' out='QDEBUG: begin|nXFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This should xfail' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailAndAbort()' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailTwice()' flowId='tst_ExpectFail'] -##teamcity[testFailed name='xfailTwice()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(83)|]' details='Already expecting a fail' flowId='tst_ExpectFail'] +##teamcity[testFailed name='xfailTwice()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' details='Already expecting a fail' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailTwice()' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailWithQString()' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailWithQString()' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(92)|]: A string|nXFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(97)|]: Bug 5 (The message)' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailWithQString()' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: A string|nXFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: Bug 5 (The message)' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailWithQString()' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQVerify(Pass 1)' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailDataDrivenWithQVerify(Pass 1)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQVerify(Pass 2)' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailDataDrivenWithQVerify(Pass 2)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQVerify(Abort)' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailDataDrivenWithQVerify(Abort)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(126)|]: This test should xfail' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailDataDrivenWithQVerify(Abort)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This test should xfail' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailDataDrivenWithQVerify(Abort)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQVerify(Continue)' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailDataDrivenWithQVerify(Continue)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(126)|]: This test should xfail' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailDataDrivenWithQVerify(Continue)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This test should xfail' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailDataDrivenWithQVerify(Continue)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQCompare(Pass 1)' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailDataDrivenWithQCompare(Pass 1)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQCompare(Pass 2)' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailDataDrivenWithQCompare(Pass 2)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQCompare(Abort)' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailDataDrivenWithQCompare(Abort)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(160)|]: This test should xfail' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailDataDrivenWithQCompare(Abort)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This test should xfail' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailDataDrivenWithQCompare(Abort)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQCompare(Continue)' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailDataDrivenWithQCompare(Continue)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(160)|]: This test should xfail' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailDataDrivenWithQCompare(Continue)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This test should xfail' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailDataDrivenWithQCompare(Continue)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailOnWrongRow(right row)' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailOnWrongRow(right row)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailOnAnyRow(first row)' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailOnAnyRow(first row)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(195)|]: This test should xfail' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailOnAnyRow(first row)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This test should xfail' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailOnAnyRow(first row)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailOnAnyRow(second row)' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailOnAnyRow(second row)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(195)|]: This test should xfail' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailOnAnyRow(second row)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This test should xfail' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailOnAnyRow(second row)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailWithoutVerify(first row)' flowId='tst_ExpectFail'] ##teamcity[testFailed name='xfailWithoutVerify(first row)' message='Failure! |[Loc: Unknown File(0)|]' details='QEXPECT_FAIL was called without any subsequent verification statements' flowId='tst_ExpectFail'] @@ -48,15 +48,15 @@ ##teamcity[testFailed name='xfailWithoutVerify(second row)' message='Failure! |[Loc: Unknown File(0)|]' details='QEXPECT_FAIL was called without any subsequent verification statements' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailWithoutVerify(second row)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xpass()' flowId='tst_ExpectFail'] -##teamcity[testFailed name='xpass()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(215)|]' details='|'true|' returned TRUE unexpectedly. ()' flowId='tst_ExpectFail'] +##teamcity[testFailed name='xpass()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' details='|'true|' returned TRUE unexpectedly. ()' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xpass()' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xpassDataDrivenWithQVerify(XPass)' flowId='tst_ExpectFail'] -##teamcity[testFailed name='xpassDataDrivenWithQVerify(XPass)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(237)|]' details='|'true|' returned TRUE unexpectedly. ()' flowId='tst_ExpectFail'] +##teamcity[testFailed name='xpassDataDrivenWithQVerify(XPass)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' details='|'true|' returned TRUE unexpectedly. ()' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xpassDataDrivenWithQVerify(XPass)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xpassDataDrivenWithQVerify(Pass)' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xpassDataDrivenWithQVerify(Pass)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xpassDataDrivenWithQCompare(XPass)' flowId='tst_ExpectFail'] -##teamcity[testFailed name='xpassDataDrivenWithQCompare(XPass)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(258)|]' details='QCOMPARE(1, 1) returned TRUE unexpectedly.' flowId='tst_ExpectFail'] +##teamcity[testFailed name='xpassDataDrivenWithQCompare(XPass)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' details='QCOMPARE(1, 1) returned TRUE unexpectedly.' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xpassDataDrivenWithQCompare(XPass)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xpassDataDrivenWithQCompare(Pass)' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xpassDataDrivenWithQCompare(Pass)' flowId='tst_ExpectFail'] diff --git a/tests/auto/testlib/selftests/expected_expectfail.txt b/tests/auto/testlib/selftests/expected_expectfail.txt index 637ce68451..fed3c451c2 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.txt +++ b/tests/auto/testlib/selftests/expected_expectfail.txt @@ -3,54 +3,54 @@ Config: Using QtTest library PASS : tst_ExpectFail::initTestCase() QDEBUG : tst_ExpectFail::xfailAndContinue() begin XFAIL : tst_ExpectFail::xfailAndContinue() This should xfail - Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(65)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] QDEBUG : tst_ExpectFail::xfailAndContinue() after PASS : tst_ExpectFail::xfailAndContinue() QDEBUG : tst_ExpectFail::xfailAndAbort() begin XFAIL : tst_ExpectFail::xfailAndAbort() This should xfail - Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(73)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xfailAndAbort() FAIL! : tst_ExpectFail::xfailTwice() Already expecting a fail - Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(83)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] XFAIL : tst_ExpectFail::xfailWithQString() A string - Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(92)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] XFAIL : tst_ExpectFail::xfailWithQString() Bug 5 (The message) - Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(97)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xfailWithQString() PASS : tst_ExpectFail::xfailDataDrivenWithQVerify(Pass 1) PASS : tst_ExpectFail::xfailDataDrivenWithQVerify(Pass 2) XFAIL : tst_ExpectFail::xfailDataDrivenWithQVerify(Abort) This test should xfail - Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(126)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xfailDataDrivenWithQVerify(Abort) XFAIL : tst_ExpectFail::xfailDataDrivenWithQVerify(Continue) This test should xfail - Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(126)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xfailDataDrivenWithQVerify(Continue) PASS : tst_ExpectFail::xfailDataDrivenWithQCompare(Pass 1) PASS : tst_ExpectFail::xfailDataDrivenWithQCompare(Pass 2) XFAIL : tst_ExpectFail::xfailDataDrivenWithQCompare(Abort) This test should xfail - Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(160)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xfailDataDrivenWithQCompare(Abort) XFAIL : tst_ExpectFail::xfailDataDrivenWithQCompare(Continue) This test should xfail - Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(160)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xfailDataDrivenWithQCompare(Continue) PASS : tst_ExpectFail::xfailOnWrongRow(right row) XFAIL : tst_ExpectFail::xfailOnAnyRow(first row) This test should xfail - Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(195)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xfailOnAnyRow(first row) XFAIL : tst_ExpectFail::xfailOnAnyRow(second row) This test should xfail - Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(195)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xfailOnAnyRow(second row) FAIL! : tst_ExpectFail::xfailWithoutVerify(first row) QEXPECT_FAIL was called without any subsequent verification statements Loc: [Unknown File(0)] FAIL! : tst_ExpectFail::xfailWithoutVerify(second row) QEXPECT_FAIL was called without any subsequent verification statements Loc: [Unknown File(0)] XPASS : tst_ExpectFail::xpass() 'true' returned TRUE unexpectedly. () - Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(215)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] XPASS : tst_ExpectFail::xpassDataDrivenWithQVerify(XPass) 'true' returned TRUE unexpectedly. () - Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(237)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xpassDataDrivenWithQVerify(Pass) XPASS : tst_ExpectFail::xpassDataDrivenWithQCompare(XPass) QCOMPARE(1, 1) returned TRUE unexpectedly. - Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(258)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xpassDataDrivenWithQCompare(Pass) PASS : tst_ExpectFail::cleanupTestCase() Totals: 18 passed, 6 failed, 0 skipped, 0 blacklisted, 0ms diff --git a/tests/auto/testlib/selftests/expected_expectfail.xml b/tests/auto/testlib/selftests/expected_expectfail.xml index ccfd942c92..48c53804cc 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.xml +++ b/tests/auto/testlib/selftests/expected_expectfail.xml @@ -118,11 +118,11 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailWithoutVerify"> -<Incident type="fail" file="" line="0"> +<Incident type="fail" file="Unknown File" line="0"> <DataTag><![CDATA[first row]]></DataTag> <Description><![CDATA[QEXPECT_FAIL was called without any subsequent verification statements]]></Description> </Incident> -<Incident type="fail" file="" line="0"> +<Incident type="fail" file="Unknown File" line="0"> <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[QEXPECT_FAIL was called without any subsequent verification statements]]></Description> </Incident> diff --git a/tests/auto/testlib/selftests/expected_warnings.lightxml b/tests/auto/testlib/selftests/expected_warnings.lightxml index 9d5a106500..5e77f9ce10 100644 --- a/tests/auto/testlib/selftests/expected_warnings.lightxml +++ b/tests/auto/testlib/selftests/expected_warnings.lightxml @@ -48,7 +48,7 @@ <Message type="info" file="" line="0"> <Description><![CDATA[Did not receive message: "Warning1"]]></Description> </Message> -<Incident type="fail" file="" line="0"> +<Incident type="fail" file="Unknown File" line="0"> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> <Duration msecs="0"/> @@ -57,7 +57,7 @@ <Message type="info" file="" line="0"> <Description><![CDATA[Did not receive any message matching: "Warning\s\d"]]></Description> </Message> -<Incident type="fail" file="" line="0"> +<Incident type="fail" file="Unknown File" line="0"> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> <Duration msecs="0"/> @@ -71,7 +71,7 @@ <DataTag><![CDATA[first row]]></DataTag> <Description><![CDATA[Did not receive message: "Warning1"]]></Description> </Message> -<Incident type="fail" file="" line="0"> +<Incident type="fail" file="Unknown File" line="0"> <DataTag><![CDATA[first row]]></DataTag> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> @@ -83,7 +83,7 @@ <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[Did not receive message: "Warning1"]]></Description> </Message> -<Incident type="fail" file="" line="0"> +<Incident type="fail" file="Unknown File" line="0"> <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> diff --git a/tests/auto/testlib/selftests/expected_warnings.xml b/tests/auto/testlib/selftests/expected_warnings.xml index 1b17dbbf5d..c4d0b2d0ea 100644 --- a/tests/auto/testlib/selftests/expected_warnings.xml +++ b/tests/auto/testlib/selftests/expected_warnings.xml @@ -50,7 +50,7 @@ <Message type="info" file="" line="0"> <Description><![CDATA[Did not receive message: "Warning1"]]></Description> </Message> -<Incident type="fail" file="" line="0"> +<Incident type="fail" file="Unknown File" line="0"> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> <Duration msecs="0"/> @@ -59,7 +59,7 @@ <Message type="info" file="" line="0"> <Description><![CDATA[Did not receive any message matching: "Warning\s\d"]]></Description> </Message> -<Incident type="fail" file="" line="0"> +<Incident type="fail" file="Unknown File" line="0"> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> <Duration msecs="0"/> @@ -73,7 +73,7 @@ <DataTag><![CDATA[first row]]></DataTag> <Description><![CDATA[Did not receive message: "Warning1"]]></Description> </Message> -<Incident type="fail" file="" line="0"> +<Incident type="fail" file="Unknown File" line="0"> <DataTag><![CDATA[first row]]></DataTag> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> @@ -85,7 +85,7 @@ <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[Did not receive message: "Warning1"]]></Description> </Message> -<Incident type="fail" file="" line="0"> +<Incident type="fail" file="Unknown File" line="0"> <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> |