diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-23 15:59:32 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-12-09 20:54:26 +0100 |
commit | 77a93e6df331e5ed22aef4335d8de38abe2ca586 (patch) | |
tree | ace152ec3685282a07f890e4c95aac057693b5e5 /tests/auto/testlib/selftests/expected_verbose1.lightxml | |
parent | 1c24b4b8d9fe16eaa4bc1598df117593d814bf50 (diff) |
Make Skip an incident in test logging
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>
Diffstat (limited to 'tests/auto/testlib/selftests/expected_verbose1.lightxml')
-rw-r--r-- | tests/auto/testlib/selftests/expected_verbose1.lightxml | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tests/auto/testlib/selftests/expected_verbose1.lightxml b/tests/auto/testlib/selftests/expected_verbose1.lightxml index 68730a3293..61d34927c8 100644 --- a/tests/auto/testlib/selftests/expected_verbose1.lightxml +++ b/tests/auto/testlib/selftests/expected_verbose1.lightxml @@ -20,10 +20,10 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassFail"> @@ -37,31 +37,31 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipPass"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipSkip"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +</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> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipFail"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <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> @@ -83,10 +83,10 @@ <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailFail"> @@ -134,10 +134,10 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<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> -</Message> +</Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> @@ -151,10 +151,10 @@ <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description> </Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<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> -</Message> +</Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> |