77a93e6df3
Skip ends the test (albeit inconclusively). Rearrange the enums in the abstract logger, move code to handle skip between relevant function and tidy up various things that became simpler as a result. Also reorder the message enum, and its switches, to separate testlib's internals from the usual Qt messages, and put each group in ascending order of severity. Task-number: QTBUG-96844 Change-Id: I2c7a634b9f849830d64eafa750155e66e244b729 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
240 lines
10 KiB
Plaintext
240 lines
10 KiB
Plaintext
<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="testPassPass">
|
|
<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 1]]></DataTag>
|
|
<Description><![CDATA[QVERIFY(true)]]></Description>
|
|
</Message>
|
|
<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 1]]></DataTag>
|
|
<Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description>
|
|
</Message>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[row 1]]></DataTag>
|
|
</Incident>
|
|
<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 2]]></DataTag>
|
|
<Description><![CDATA[QVERIFY(true)]]></Description>
|
|
</Message>
|
|
<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 2]]></DataTag>
|
|
<Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description>
|
|
</Message>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[row 2]]></DataTag>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="testPassSkip">
|
|
<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 1]]></DataTag>
|
|
<Description><![CDATA[QVERIFY(true)]]></Description>
|
|
</Message>
|
|
<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 1]]></DataTag>
|
|
<Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description>
|
|
</Message>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[row 1]]></DataTag>
|
|
</Incident>
|
|
<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 2]]></DataTag>
|
|
<Description><![CDATA[Skipping]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="testPassFail">
|
|
<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 1]]></DataTag>
|
|
<Description><![CDATA[QVERIFY(true)]]></Description>
|
|
</Message>
|
|
<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 1]]></DataTag>
|
|
<Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description>
|
|
</Message>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[row 1]]></DataTag>
|
|
</Incident>
|
|
<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 2]]></DataTag>
|
|
<Description><![CDATA[QVERIFY(false)]]></Description>
|
|
</Message>
|
|
<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 2]]></DataTag>
|
|
<Description><![CDATA['false' returned FALSE. ()]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="testSkipPass">
|
|
<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 1]]></DataTag>
|
|
<Description><![CDATA[Skipping]]></Description>
|
|
</Incident>
|
|
<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 2]]></DataTag>
|
|
<Description><![CDATA[QVERIFY(true)]]></Description>
|
|
</Message>
|
|
<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 2]]></DataTag>
|
|
<Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description>
|
|
</Message>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[row 2]]></DataTag>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="testSkipSkip">
|
|
<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 1]]></DataTag>
|
|
<Description><![CDATA[Skipping]]></Description>
|
|
</Incident>
|
|
<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 2]]></DataTag>
|
|
<Description><![CDATA[Skipping]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="testSkipFail">
|
|
<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 1]]></DataTag>
|
|
<Description><![CDATA[Skipping]]></Description>
|
|
</Incident>
|
|
<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 2]]></DataTag>
|
|
<Description><![CDATA[QVERIFY(false)]]></Description>
|
|
</Message>
|
|
<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 2]]></DataTag>
|
|
<Description><![CDATA['false' returned FALSE. ()]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="testFailPass">
|
|
<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 1]]></DataTag>
|
|
<Description><![CDATA[QVERIFY(false)]]></Description>
|
|
</Message>
|
|
<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 1]]></DataTag>
|
|
<Description><![CDATA['false' returned FALSE. ()]]></Description>
|
|
</Incident>
|
|
<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 2]]></DataTag>
|
|
<Description><![CDATA[QVERIFY(true)]]></Description>
|
|
</Message>
|
|
<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 2]]></DataTag>
|
|
<Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description>
|
|
</Message>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[row 2]]></DataTag>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="testFailSkip">
|
|
<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 1]]></DataTag>
|
|
<Description><![CDATA[QVERIFY(false)]]></Description>
|
|
</Message>
|
|
<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 1]]></DataTag>
|
|
<Description><![CDATA['false' returned FALSE. ()]]></Description>
|
|
</Incident>
|
|
<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 2]]></DataTag>
|
|
<Description><![CDATA[Skipping]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="testFailFail">
|
|
<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 1]]></DataTag>
|
|
<Description><![CDATA[QVERIFY(false)]]></Description>
|
|
</Message>
|
|
<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 1]]></DataTag>
|
|
<Description><![CDATA['false' returned FALSE. ()]]></Description>
|
|
</Incident>
|
|
<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 2]]></DataTag>
|
|
<Description><![CDATA[QVERIFY(false)]]></Description>
|
|
</Message>
|
|
<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[row 2]]></DataTag>
|
|
<Description><![CDATA['false' returned FALSE. ()]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="testFailInInit">
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[before]]></DataTag>
|
|
</Incident>
|
|
<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[fail]]></DataTag>
|
|
<Description><![CDATA[Fail in init()]]></Description>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[after]]></DataTag>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="testFailInCleanup">
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[before]]></DataTag>
|
|
</Incident>
|
|
<Message type="qdebug" file="" line="0">
|
|
<DataTag><![CDATA[fail]]></DataTag>
|
|
<Description><![CDATA[This test function should execute and then QFAIL in cleanup()]]></Description>
|
|
</Message>
|
|
<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[fail]]></DataTag>
|
|
<Description><![CDATA[Fail in cleanup()]]></Description>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[after]]></DataTag>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="testSkipInInit">
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[before]]></DataTag>
|
|
</Incident>
|
|
<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[skip]]></DataTag>
|
|
<Description><![CDATA[Skip in init()]]></Description>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[after]]></DataTag>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="testSkipInCleanup">
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[before]]></DataTag>
|
|
</Incident>
|
|
<Message type="qdebug" file="" line="0">
|
|
<DataTag><![CDATA[skip]]></DataTag>
|
|
<Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description>
|
|
</Message>
|
|
<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
|
|
<DataTag><![CDATA[skip]]></DataTag>
|
|
<Description><![CDATA[Skip in cleanup()]]></Description>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[after]]></DataTag>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="cleanupTestCase">
|
|
<Incident type="pass" file="" line="0" />
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<Duration msecs="0"/>
|