diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-08-03 12:50:26 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-08-10 18:06:36 +0200 |
commit | 308280e7a9277334c2fd3480c3ddc4971d85b920 (patch) | |
tree | abc98a9ee918b715521c4697dbd5d6072f75b85c /tests/auto/testlib/selftests/expected_warnings.junitxml | |
parent | f6c7eb5f0f59f183d327b732a088646f972805d7 (diff) |
testlib: Move stdout/stderr reporting into individual <testcase> elements
The original Ant JUnit reporter only writes <system-err> and <system-out>
to the <testsuite>, but more modern reporters such as Maven Surefire
scopes output to each individual <testcase>.
This is also handled by both the Jenkins JUnit and xUnit plugins, e.g.:
https://github.com/jenkinsci/junit-plugin/commit/145eb5c98
Pick-to: 6.2
Change-Id: I20c87276004a4e0910fc18e05e6ffa0f5e5a7b7c
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/auto/testlib/selftests/expected_warnings.junitxml')
-rw-r--r-- | tests/auto/testlib/selftests/expected_warnings.junitxml | 50 |
1 files changed, 29 insertions, 21 deletions
diff --git a/tests/auto/testlib/selftests/expected_warnings.junitxml b/tests/auto/testlib/selftests/expected_warnings.junitxml index 28ef130839..69000160b3 100644 --- a/tests/auto/testlib/selftests/expected_warnings.junitxml +++ b/tests/auto/testlib/selftests/expected_warnings.junitxml @@ -17,46 +17,54 @@ <!-- type="qdebug" message="Baba" --> <!-- type="qdebug" message="Bubublabla" --> <!-- type="qwarn" message="Babablabla" --> + <system-out> + <![CDATA[Debug]]> + <![CDATA[Debug]]> + <![CDATA[Info]]> + <![CDATA[Info]]> + <![CDATA[Baba]]> + <![CDATA[Baba]]> + <![CDATA[Bubublabla]]> + </system-out> + <system-err> + <![CDATA[Warning]]> + <![CDATA[Warning]]> + <![CDATA[Babablabla]]> + </system-err> </testcase> <testcase name="testMissingWarnings" classname="tst_Warnings" time="@TEST_DURATION@"> <!-- type="info" message="Did not receive message: "Warning0"" --> <!-- type="info" message="Did not receive message: "Warning1"" --> <failure type="fail" message="Not all expected messages were received"/> + <system-out> + <![CDATA[Did not receive message: "Warning0"]]> + <![CDATA[Did not receive message: "Warning1"]]> + </system-out> </testcase> <testcase name="testMissingWarningsRegularExpression" classname="tst_Warnings" time="@TEST_DURATION@"> <!-- type="info" message="Did not receive any message matching: "Warning\s\d"" --> <failure type="fail" message="Not all expected messages were received"/> + <system-out> + <![CDATA[Did not receive any message matching: "Warning\s\d"]]> + </system-out> </testcase> <testcase name="testMissingWarningsWithData(first row)" classname="tst_Warnings" time="@TEST_DURATION@"> <!-- type="info" message="Did not receive message: "Warning0"" --> <!-- type="info" message="Did not receive message: "Warning1"" --> <failure type="fail" message="Not all expected messages were received"/> + <system-out> + <![CDATA[Did not receive message: "Warning0"]]> + <![CDATA[Did not receive message: "Warning1"]]> + </system-out> </testcase> <testcase name="testMissingWarningsWithData(second row)" classname="tst_Warnings" time="@TEST_DURATION@"> <!-- type="info" message="Did not receive message: "Warning0"" --> <!-- type="info" message="Did not receive message: "Warning1"" --> <failure type="fail" message="Not all expected messages were received"/> + <system-out> + <![CDATA[Did not receive message: "Warning0"]]> + <![CDATA[Did not receive message: "Warning1"]]> + </system-out> </testcase> <testcase name="cleanupTestCase" classname="tst_Warnings" time="@TEST_DURATION@"/> - <system-out> - <![CDATA[Debug]]> - <![CDATA[Debug]]> - <![CDATA[Info]]> - <![CDATA[Info]]> - <![CDATA[Baba]]> - <![CDATA[Baba]]> - <![CDATA[Bubublabla]]> - <![CDATA[Did not receive message: "Warning0"]]> - <![CDATA[Did not receive message: "Warning1"]]> - <![CDATA[Did not receive any message matching: "Warning\s\d"]]> - <![CDATA[Did not receive message: "Warning0"]]> - <![CDATA[Did not receive message: "Warning1"]]> - <![CDATA[Did not receive message: "Warning0"]]> - <![CDATA[Did not receive message: "Warning1"]]> - </system-out> - <system-err> - <![CDATA[Warning]]> - <![CDATA[Warning]]> - <![CDATA[Babablabla]]> - </system-err> </testsuite> |