diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2022-08-01 17:10:44 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2022-09-22 17:34:51 +0200 |
| commit | 16f5132b2184fc62b2959bd4b13245a72c97042d (patch) | |
| tree | 56ac03f7682afb3b1ddb54b9fcdbef09ffcce0f2 /tests/auto/testlib | |
| parent | 73a2320278e89fbd331616fc0dea0db0c82bb851 (diff) | |
Add test-case for TAP logging glitch
The recently added test for QTestEventLoop produced a message which
the TAP test-logger mis-parses. Since that message shall soon go away
(when I fix the bug the new test exists to verify), modify one of
cmptest's QVERIFY2() messages to trip up the same bug, so we can spot
any regressions on this in future (after the imminent fix to this TAP
issue).
Change-Id: Ibbe9931c01c75df529c9571e2bbdbd34010dd9ec
Reviewed-by: Jason McDonald <macadder1@gmail.com>
Diffstat (limited to 'tests/auto/testlib')
7 files changed, 11 insertions, 7 deletions
diff --git a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp index 072324880e..7a3817c63d 100644 --- a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp +++ b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp @@ -12,6 +12,7 @@ #include <QtGui/QVector3D> #include <QtGui/QVector4D> #endif +using namespace Qt::StringLiterals; /* XPM test data for QPixmap, QImage tests (use drag cursors as example) */ @@ -647,7 +648,10 @@ void tst_Cmptest::verify() void tst_Cmptest::verify2() { QVERIFY2(opaqueFunc() > 2, QByteArray::number(opaqueFunc()).constData()); - QVERIFY2(opaqueFunc() < 2, QByteArray::number(opaqueFunc()).constData()); + QVERIFY2(opaqueFunc() < 2, + // Message with parenthetical part, to catch mis-parses of the + // resulting message: + u"%1 >= 2 (as expected, in fact)"_s.arg(opaqueFunc()).toUtf8().constData()); } class DeferredFlag : public QObject // Can't be const. diff --git a/tests/auto/testlib/selftests/expected_cmptest.junitxml b/tests/auto/testlib/selftests/expected_cmptest.junitxml index 75ec61ba99..7ec9e2e05f 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.junitxml +++ b/tests/auto/testlib/selftests/expected_cmptest.junitxml @@ -295,7 +295,7 @@ <failure type="fail" message="'opaqueFunc() < 2' returned FALSE. ()"/> </testcase> <testcase name="verify2" classname="tst_Cmptest" time="@TEST_DURATION@"> - <failure type="fail" message="'opaqueFunc() < 2' returned FALSE. (42)"/> + <failure type="fail" message="'opaqueFunc() < 2' returned FALSE. (42 >= 2 (as expected, in fact))"/> </testcase> <testcase name="tryVerify" classname="tst_Cmptest" time="@TEST_DURATION@"> <failure type="fail" message="'!c' returned FALSE. ()"/> diff --git a/tests/auto/testlib/selftests/expected_cmptest.lightxml b/tests/auto/testlib/selftests/expected_cmptest.lightxml index 351fad849c..6328632c69 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.lightxml +++ b/tests/auto/testlib/selftests/expected_cmptest.lightxml @@ -396,7 +396,7 @@ </TestFunction> <TestFunction name="verify2"> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> - <Description><![CDATA['opaqueFunc() < 2' returned FALSE. (42)]]></Description> + <Description><![CDATA['opaqueFunc() < 2' returned FALSE. (42 >= 2 (as expected, in fact))]]></Description> </Incident> <Duration msecs="0"/> </TestFunction> diff --git a/tests/auto/testlib/selftests/expected_cmptest.tap b/tests/auto/testlib/selftests/expected_cmptest.tap index 19c90bcb93..65b0504be4 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.tap +++ b/tests/auto/testlib/selftests/expected_cmptest.tap @@ -547,7 +547,7 @@ not ok 65 - verify() not ok 66 - verify2() --- type: QVERIFY - message: 42 + message: as expected, in fact) wanted: true (opaqueFunc() < 2) found: false (opaqueFunc() < 2) expected: true (opaqueFunc() < 2) diff --git a/tests/auto/testlib/selftests/expected_cmptest.teamcity b/tests/auto/testlib/selftests/expected_cmptest.teamcity index 5f1e8374b9..dfc8cdb2ce 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.teamcity +++ b/tests/auto/testlib/selftests/expected_cmptest.teamcity @@ -177,7 +177,7 @@ ##teamcity[testFailed name='verify()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='|'opaqueFunc() < 2|' returned FALSE. ()' flowId='tst_Cmptest'] ##teamcity[testFinished name='verify()' flowId='tst_Cmptest'] ##teamcity[testStarted name='verify2()' flowId='tst_Cmptest'] -##teamcity[testFailed name='verify2()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='|'opaqueFunc() < 2|' returned FALSE. (42)' flowId='tst_Cmptest'] +##teamcity[testFailed name='verify2()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='|'opaqueFunc() < 2|' returned FALSE. (42 >= 2 (as expected, in fact))' flowId='tst_Cmptest'] ##teamcity[testFinished name='verify2()' flowId='tst_Cmptest'] ##teamcity[testStarted name='tryVerify()' flowId='tst_Cmptest'] ##teamcity[testFailed name='tryVerify()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='|'!c|' returned FALSE. ()' flowId='tst_Cmptest'] diff --git a/tests/auto/testlib/selftests/expected_cmptest.txt b/tests/auto/testlib/selftests/expected_cmptest.txt index f323729000..602202bafc 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.txt +++ b/tests/auto/testlib/selftests/expected_cmptest.txt @@ -198,7 +198,7 @@ FAIL! : tst_Cmptest::tryCompare() Compared values are not the same Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::verify() 'opaqueFunc() < 2' returned FALSE. () Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] -FAIL! : tst_Cmptest::verify2() 'opaqueFunc() < 2' returned FALSE. (42) +FAIL! : tst_Cmptest::verify2() 'opaqueFunc() < 2' returned FALSE. (42 >= 2 (as expected, in fact)) Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] QINFO : tst_Cmptest::tryVerify() Should now time out and fail FAIL! : tst_Cmptest::tryVerify() '!c' returned FALSE. () diff --git a/tests/auto/testlib/selftests/expected_cmptest.xml b/tests/auto/testlib/selftests/expected_cmptest.xml index 0bee84c786..a0e8e76179 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.xml +++ b/tests/auto/testlib/selftests/expected_cmptest.xml @@ -398,7 +398,7 @@ </TestFunction> <TestFunction name="verify2"> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> - <Description><![CDATA['opaqueFunc() < 2' returned FALSE. (42)]]></Description> + <Description><![CDATA['opaqueFunc() < 2' returned FALSE. (42 >= 2 (as expected, in fact))]]></Description> </Incident> <Duration msecs="0"/> </TestFunction> |