From af7a3430edfc4deff494c9ec88b803f468b5cf2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Tue, 21 Jul 2020 12:10:32 +0200
Subject: testlib: Add start time and test duration to JUnit XML

As defined by https://llg.cubic.org/docs/junit/

Change-Id: Ic7683f3d49c529674f8467d591528d4a65d3add8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 .../testlib/selftests/expected_cmptest.junitxml    | 58 +++++++++++-----------
 1 file changed, 29 insertions(+), 29 deletions(-)

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

diff --git a/tests/auto/testlib/selftests/expected_cmptest.junitxml b/tests/auto/testlib/selftests/expected_cmptest.junitxml
index 2bdfabd9bb..667cfaad44 100644
--- a/tests/auto/testlib/selftests/expected_cmptest.junitxml
+++ b/tests/auto/testlib/selftests/expected_cmptest.junitxml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Cmptest" tests="28" failures="45" errors="0">
+<testsuite name="tst_Cmptest" timestamp="@TEST_START_TIME@" tests="28" failures="45" errors="0" 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" result="pass"/>
-  <testcase name="compare_unregistered_enums" result="fail">
+  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="compare_unregistered_enums" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="Compared values are not the same"/>
   </testcase>
-  <testcase name="compare_registered_enums" result="fail">
+  <testcase name="compare_registered_enums" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="Compared values are not the same
    Actual   (Qt::Monday): Monday
    Expected (Qt::Sunday): Sunday"/>
   </testcase>
-  <testcase name="compare_class_enums" result="fail">
+  <testcase name="compare_class_enums" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="Compared values are not the same
    Actual   (MyClassEnum::MyClassEnumValue1): MyClassEnumValue1
    Expected (MyClassEnum::MyClassEnumValue2): MyClassEnumValue2"/>
   </testcase>
-  <testcase name="test_windowflags" result="fail">
+  <testcase name="test_windowflags" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="Compared values are not the same
    Actual   (actualWindowFlags)  : Window|WindowSystemMenuHint|WindowStaysOnBottomHint
    Expected (expectedWindowFlags): Window|FramelessWindowHint|WindowSystemMenuHint|WindowStaysOnBottomHint" tag="fail1"/>
@@ -27,7 +27,7 @@
    Actual   (actualWindowFlags)  : Window
    Expected (expectedWindowFlags): Window|FramelessWindowHint" tag="fail2"/>
   </testcase>
-  <testcase name="test_unregistered_flags" result="fail">
+  <testcase name="test_unregistered_flags" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="Compared values are not the same
    Actual   (actualFlags)  : 0x3
    Expected (expectedFlags): 0x5" tag="fail1"/>
@@ -35,10 +35,10 @@
    Actual   (actualFlags)  : 0x1
    Expected (expectedFlags): 0x5" tag="fail2"/>
   </testcase>
-  <testcase name="compare_boolfuncs" result="pass"/>
-  <testcase name="compare_to_nullptr" result="pass"/>
-  <testcase name="compare_pointerfuncs" result="pass"/>
-  <testcase name="compare_tostring" result="fail">
+  <testcase name="compare_boolfuncs" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="compare_to_nullptr" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="compare_pointerfuncs" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="compare_tostring" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="Compared values are not the same
    Actual   (actual)  : QVariant(int,123)
    Expected (expected): QVariant(QString,hi)" tag="int, string"/>
@@ -52,7 +52,7 @@
    Actual   (actual)  : QVariant(PhonyClass,&lt;value not representable as string&gt;)
    Expected (expected): QVariant(PhonyClass,&lt;value not representable as string&gt;)" tag="both non&#x002D;null user type"/>
   </testcase>
-  <testcase name="compareQStringLists" result="fail">
+  <testcase name="compareQStringLists" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="Compared lists differ at index 2.
    Actual   (opA): &quot;string3&quot;
    Expected (opB): &quot;DIFFERS&quot;" tag="last item different"/>
@@ -69,7 +69,7 @@
    Actual   (opA) size: 1
    Expected (opB) size: 12" tag="short list first"/>
   </testcase>
-  <testcase name="compareQListInt" result="fail">
+  <testcase name="compareQListInt" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="Compared lists have different sizes.
    Actual   (actual) size: 2
    Expected (expected) size: 3" tag="size mismatch"/>
@@ -77,7 +77,7 @@
    Actual   (actual): 4
    Expected (expected): 3" tag="value mismatch"/>
   </testcase>
-  <testcase name="compareQListIntToArray" result="fail">
+  <testcase name="compareQListIntToArray" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="Compared lists have different sizes.
    Actual   (actual) size: 2
    Expected (expected) size: 3" tag="size mismatch"/>
@@ -85,7 +85,7 @@
    Actual   (actual): 4
    Expected (expected): 3" tag="value mismatch"/>
   </testcase>
-  <testcase name="compareQListIntToInitializerList" result="fail">
+  <testcase name="compareQListIntToInitializerList" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="Compared lists have different sizes.
    Actual   (actual) size: 2
    Expected (ARG({1, 2, 3})) size: 3" tag="size mismatch"/>
@@ -93,12 +93,12 @@
    Actual   (actual): 4
    Expected (ARG({1, 2, 3})): 3" tag="value mismatch"/>
   </testcase>
-  <testcase name="compareQListDouble" result="fail">
+  <testcase name="compareQListDouble" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="Compared lists differ at index 0.
    Actual   (double1): 1.5
    Expected (double2): 1"/>
   </testcase>
-  <testcase name="compareQColor" result="fail">
+  <testcase name="compareQColor" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="Compared values are not the same
    Actual   (colorA): #ffffff00
    Expected (colorB): #ff00ff00" tag="Qt::yellow vs Qt::green"/>
@@ -106,7 +106,7 @@
    Actual   (colorA): #88ff0000
    Expected (colorB): #ffff0000" tag="0x88ff0000 vs 0xffff0000"/>
   </testcase>
-  <testcase name="compareQPixmaps" result="fail">
+  <testcase name="compareQPixmaps" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="Compared QPixmaps differ.
    Actual   (opA).isNull(): 1
    Expected (opB).isNull(): 0" tag="one null"/>
@@ -121,7 +121,7 @@
    Actual   (opA): 1
    Expected (opB): 2" tag="different dpr"/>
   </testcase>
-  <testcase name="compareQImages" result="fail">
+  <testcase name="compareQImages" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="Compared QImages differ.
    Actual   (opA).isNull(): 1
    Expected (opB).isNull(): 0" tag="one null"/>
@@ -139,7 +139,7 @@
    Actual   (opA): 1
    Expected (opB): 2" tag="different dpr"/>
   </testcase>
-  <testcase name="compareQRegion" result="fail">
+  <testcase name="compareQRegion" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="Compared values are not the same
    Actual   (rA): QRegion(200x50+10+10)
    Expected (rB): QRegion(null)" tag="1&#x002D;empty"/>
@@ -147,34 +147,34 @@
    Actual   (rA): QRegion(200x50+10+10)
    Expected (rB): QRegion(2 rectangles, 50x200+100+200, 200x50+10+10)" tag="different lists"/>
   </testcase>
-  <testcase name="compareQVector2D" result="fail">
+  <testcase name="compareQVector2D" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="Compared values are not the same
    Actual   (v2a): QVector2D(1, 2)
    Expected (v2b): QVector2D(1, 3)"/>
   </testcase>
-  <testcase name="compareQVector3D" result="fail">
+  <testcase name="compareQVector3D" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="Compared values are not the same
    Actual   (v3a): QVector3D(1, 2, 3)
    Expected (v3b): QVector3D(1, 3, 3)"/>
   </testcase>
-  <testcase name="compareQVector4D" result="fail">
+  <testcase name="compareQVector4D" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="Compared values are not the same
    Actual   (v4a): QVector4D(1, 2, 3, 4)
    Expected (v4b): QVector4D(1, 3, 3, 4)"/>
   </testcase>
-  <testcase name="verify" result="fail">
+  <testcase name="verify" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="verify2" result="fail">
+  <testcase name="verify2" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. (42)"/>
   </testcase>
-  <testcase name="tryVerify" result="fail">
+  <testcase name="tryVerify" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="tryVerify2" result="fail">
+  <testcase name="tryVerify2" result="fail" time="@TEST_DURATION@">
     <failure result="fail" message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. (42)"/>
   </testcase>
-  <testcase name="verifyExplicitOperatorBool" result="pass"/>
-  <testcase name="cleanupTestCase" result="pass"/>
+  <testcase name="verifyExplicitOperatorBool" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
   <system-err/>
 </testsuite>
-- 
cgit v1.2.3