From fb16a66b71250f83a9249a0a04064f56d70c9fd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Thu, 29 Jul 2021 17:37:58 +0200
Subject: testlib: Report skipped tests in JUnit reporter as <skipped> elements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Apache Ant and Surefire Maven specs document a <skipped> element that
can be used to signify skipped test, with a corresponding total skipped
test attribute on the <testsuite>.

The element includes an optional message attribute, documented in the
Surefire spec, and in the Ant source code, but not yet documented in
the reverse-engineered Ant spec:

 https://github.com/windyroad/JUnit-Schema/pull/11

Pick-to: 6.2
Task-number: QTBUG-95424
Change-Id: Ib6417a41b9c328836f4017e6ebf7f7e9cd91288d
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 tests/auto/testlib/selftests/expected_skipinit.junitxml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'tests/auto/testlib/selftests/expected_skipinit.junitxml')

diff --git a/tests/auto/testlib/selftests/expected_skipinit.junitxml b/tests/auto/testlib/selftests/expected_skipinit.junitxml
index 803e5e2749..f7d2b5a124 100644
--- a/tests/auto/testlib/selftests/expected_skipinit.junitxml
+++ b/tests/auto/testlib/selftests/expected_skipinit.junitxml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_SkipInit" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="0" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_SkipInit" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="0" errors="0" skipped="1" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
   <testcase name="initTestCase" classname="tst_SkipInit" time="@TEST_DURATION@">
-    <!-- type="skip" message="Skip inside initTestCase. This should skip all tests in the class." -->
+    <skipped message="Skip inside initTestCase. This should skip all tests in the class."/>
   </testcase>
   <testcase name="cleanupTestCase" classname="tst_SkipInit" time="@TEST_DURATION@"/>
-  <system-out>
-<![CDATA[Skip inside initTestCase. This should skip all tests in the class.]]>
-  </system-out>
+  <system-out/>
   <system-err/>
 </testsuite>
-- 
cgit v1.2.3