From a2026e4116e325767b899505cf248a75b9647195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Mon, 2 Aug 2021 14:29:28 +0200
Subject: testlib: Write failure details as <failure> content in JUnit reporter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pick-to: 6.2
Change-Id: Ica48769e7dfcabdc4bc8f0ed058bc22e29a0b632
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
---
 src/testlib/qjunittestlogger.cpp                   |  15 +-
 src/testlib/qtestjunitstreamer.cpp                 |  17 +-
 .../testlib/selftests/expected_cmptest.junitxml    | 280 ++++++++++++---------
 .../testlib/selftests/expected_datetime.junitxml   |  21 +-
 .../auto/testlib/selftests/expected_junit.junitxml |   7 +-
 .../testlib/selftests/expected_longstring.junitxml |   7 +-
 .../selftests/expected_pairdiagnostics.junitxml    |  14 +-
 .../testlib/selftests/expected_strcmp.junitxml     |  35 +--
 .../testlib/selftests/expected_subtest.junitxml    |  14 +-
 .../selftests/expected_tuplediagnostics.junitxml   |  14 +-
 10 files changed, 249 insertions(+), 175 deletions(-)

diff --git a/src/testlib/qjunittestlogger.cpp b/src/testlib/qjunittestlogger.cpp
index a120171c3a..10fe8fd81a 100644
--- a/src/testlib/qjunittestlogger.cpp
+++ b/src/testlib/qjunittestlogger.cpp
@@ -258,7 +258,20 @@ void QJUnitTestLogger::addIncident(IncidentTypes type, const char *description,
     if (type == QAbstractTestLogger::Fail || type == QAbstractTestLogger::XPass) {
         QTestElement *failureElement = new QTestElement(QTest::LET_Failure);
         failureElement->addAttribute(QTest::AI_Type, typeBuf);
-        failureElement->addAttribute(QTest::AI_Message, description);
+
+        // Assume the first line is the message, and the remainder are details
+        QString descriptionString = QString::fromUtf8(description);
+        QString message = descriptionString.section(QLatin1Char('\n'), 0, 0);
+        QString details = descriptionString.section(QLatin1Char('\n'), 1);
+
+        failureElement->addAttribute(QTest::AI_Message, message.toUtf8().constData());
+
+        if (!details.isEmpty()) {
+            auto messageElement = new QTestElement(QTest::LET_Message);
+            messageElement->addAttribute(QTest::AI_Message, details.toUtf8().constData());
+            failureElement->addLogElement(messageElement);
+        }
+
         currentLogElement->addLogElement(failureElement);
     }
 
diff --git a/src/testlib/qtestjunitstreamer.cpp b/src/testlib/qtestjunitstreamer.cpp
index 96757f0768..8176205cbb 100644
--- a/src/testlib/qtestjunitstreamer.cpp
+++ b/src/testlib/qtestjunitstreamer.cpp
@@ -83,11 +83,13 @@ void QTestJUnitStreamer::formatStart(const QTestElement *element, QTestCharBuffe
     indentForElement(element, indent, sizeof(indent));
 
     // Messages/errors are written as CDATA within system-out, system-err,
-    // respectively, comments elsewhere
+    // error, and failure respectively, comments elsewhere
     if (element->elementType() == QTest::LET_Message) {
         switch (element->parentElement()->elementType()) {
         case QTest::LET_SystemOutput:
         case QTest::LET_SystemError:
+        case QTest::LET_Failure:
+        case QTest::LET_Error:
             QTest::qt_asprintf(formatted, "%s<![CDATA[", indent);
             break;
         default:
@@ -123,11 +125,12 @@ void QTestJUnitStreamer::formatAttributes(const QTestElement* element, const QTe
 
     QTest::AttributeIndex attrindex = attribute->index();
 
-    // For messages/errors within system-out, system-err, respectively,
-    // we only want to output `message'
+    // For messages we only want to output the `message' attribute value
     if (element && element->elementType() == QTest::LET_Message
         && (element->parentElement()->elementType() == QTest::LET_SystemOutput
-            || element->parentElement()->elementType() == QTest::LET_SystemError)) {
+            || element->parentElement()->elementType() == QTest::LET_SystemError
+            || element->parentElement()->elementType() == QTest::LET_Failure
+            || element->parentElement()->elementType() == QTest::LET_Error)) {
 
         if (attrindex != QTest::AI_Message) return;
 
@@ -146,12 +149,14 @@ void QTestJUnitStreamer::formatAfterAttributes(const QTestElement *element, QTes
     if (!element || !formatted )
         return;
 
-    // Messages/errors are written as CDATA within system-out, system-err,
-    // respectively, comments elsewhere
+    // Messages are written as CDATA within system-out, system-err,
+    // error, and failure respectively, comments elsewhere
     if (element->elementType() == QTest::LET_Message) {
         switch (element->parentElement()->elementType()) {
         case QTest::LET_SystemOutput:
         case QTest::LET_SystemError:
+        case QTest::LET_Failure:
+        case QTest::LET_Error:
             QTest::qt_asprintf(formatted, "]]>\n");
             break;
         default:
diff --git a/tests/auto/testlib/selftests/expected_cmptest.junitxml b/tests/auto/testlib/selftests/expected_cmptest.junitxml
index 153e3878b4..cc1e443205 100644
--- a/tests/auto/testlib/selftests/expected_cmptest.junitxml
+++ b/tests/auto/testlib/selftests/expected_cmptest.junitxml
@@ -7,228 +7,268 @@
   </properties>
   <testcase name="initTestCase" classname="tst_Cmptest" time="@TEST_DURATION@"/>
   <testcase name="compare_unregistered_enums" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (MyUnregisteredEnumValue1): 0
-   Expected (MyUnregisteredEnumValue2): 1"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (MyUnregisteredEnumValue1): 0
+   Expected (MyUnregisteredEnumValue2): 1]]>
+    </failure>
   </testcase>
   <testcase name="compare_registered_enums" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (Qt::Monday): Monday
-   Expected (Qt::Sunday): Sunday"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (Qt::Monday): Monday
+   Expected (Qt::Sunday): Sunday]]>
+    </failure>
   </testcase>
   <testcase name="compare_class_enums" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (MyClassEnum::MyClassEnumValue1): MyClassEnumValue1
-   Expected (MyClassEnum::MyClassEnumValue2): MyClassEnumValue2"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (MyClassEnum::MyClassEnumValue1): MyClassEnumValue1
+   Expected (MyClassEnum::MyClassEnumValue2): MyClassEnumValue2]]>
+    </failure>
   </testcase>
   <testcase name="test_windowflags(pass)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
   <testcase name="test_windowflags(fail1)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (actualWindowFlags)  : Window|WindowSystemMenuHint|WindowStaysOnBottomHint
-   Expected (expectedWindowFlags): Window|FramelessWindowHint|WindowSystemMenuHint|WindowStaysOnBottomHint"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (actualWindowFlags)  : Window|WindowSystemMenuHint|WindowStaysOnBottomHint
+   Expected (expectedWindowFlags): Window|FramelessWindowHint|WindowSystemMenuHint|WindowStaysOnBottomHint]]>
+    </failure>
   </testcase>
   <testcase name="test_windowflags(fail2)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (actualWindowFlags)  : Window
-   Expected (expectedWindowFlags): Window|FramelessWindowHint"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (actualWindowFlags)  : Window
+   Expected (expectedWindowFlags): Window|FramelessWindowHint]]>
+    </failure>
   </testcase>
   <testcase name="test_unregistered_flags(pass)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
   <testcase name="test_unregistered_flags(fail1)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (actualFlags)  : 0x3
-   Expected (expectedFlags): 0x5"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (actualFlags)  : 0x3
+   Expected (expectedFlags): 0x5]]>
+    </failure>
   </testcase>
   <testcase name="test_unregistered_flags(fail2)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (actualFlags)  : 0x1
-   Expected (expectedFlags): 0x5"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (actualFlags)  : 0x1
+   Expected (expectedFlags): 0x5]]>
+    </failure>
   </testcase>
   <testcase name="compare_boolfuncs" classname="tst_Cmptest" time="@TEST_DURATION@"/>
   <testcase name="compare_to_nullptr" classname="tst_Cmptest" time="@TEST_DURATION@"/>
   <testcase name="compare_pointerfuncs" classname="tst_Cmptest" time="@TEST_DURATION@"/>
   <testcase name="compare_tostring(int, string)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (actual)  : QVariant(int,123)
-   Expected (expected): QVariant(QString,hi)"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (actual)  : QVariant(int,123)
+   Expected (expected): QVariant(QString,hi)]]>
+    </failure>
   </testcase>
   <testcase name="compare_tostring(both invalid)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
   <testcase name="compare_tostring(null hash, invalid)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (actual)  : QVariant(QVariantHash)
-   Expected (expected): QVariant()"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (actual)  : QVariant(QVariantHash)
+   Expected (expected): QVariant()]]>
+    </failure>
   </testcase>
   <testcase name="compare_tostring(string, null user type)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (actual)  : QVariant(QString,A simple string)
-   Expected (expected): QVariant(PhonyClass)"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (actual)  : QVariant(QString,A simple string)
+   Expected (expected): QVariant(PhonyClass)]]>
+    </failure>
   </testcase>
   <testcase name="compare_tostring(both non&#x002D;null user type)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (actual)  : QVariant(PhonyClass,&lt;value not representable as string&gt;)
-   Expected (expected): QVariant(PhonyClass,&lt;value not representable as string&gt;)"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (actual)  : QVariant(PhonyClass,<value not representable as string>)
+   Expected (expected): QVariant(PhonyClass,<value not representable as string>)]]>
+    </failure>
   </testcase>
   <testcase name="compareQObjects" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared QObject pointers are not the same
-   Actual   (&amp;object1): QObject/&quot;object1&quot;
-   Expected (&amp;object2): QObject/&quot;object2&quot;"/>
+    <failure type="fail" message="Compared QObject pointers are not the same">
+      <![CDATA[   Actual   (&object1): QObject/"object1"
+   Expected (&object2): QObject/"object2"]]>
+    </failure>
   </testcase>
   <testcase name="compareQStringLists(empty lists)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
   <testcase name="compareQStringLists(equal lists)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
   <testcase name="compareQStringLists(last item different)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared lists differ at index 2.
-   Actual   (opA): &quot;string3&quot;
-   Expected (opB): &quot;DIFFERS&quot;"/>
+    <failure type="fail" message="Compared lists differ at index 2.">
+      <![CDATA[   Actual   (opA): "string3"
+   Expected (opB): "DIFFERS"]]>
+    </failure>
   </testcase>
   <testcase name="compareQStringLists(second&#x002D;last item different)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared lists differ at index 2.
-   Actual   (opA): &quot;string3&quot;
-   Expected (opB): &quot;DIFFERS&quot;"/>
+    <failure type="fail" message="Compared lists differ at index 2.">
+      <![CDATA[   Actual   (opA): "string3"
+   Expected (opB): "DIFFERS"]]>
+    </failure>
   </testcase>
   <testcase name="compareQStringLists(prefix)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared lists have different sizes.
-   Actual   (opA) size: 2
-   Expected (opB) size: 1"/>
+    <failure type="fail" message="Compared lists have different sizes.">
+      <![CDATA[   Actual   (opA) size: 2
+   Expected (opB) size: 1]]>
+    </failure>
   </testcase>
   <testcase name="compareQStringLists(short list second)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared lists have different sizes.
-   Actual   (opA) size: 12
-   Expected (opB) size: 1"/>
+    <failure type="fail" message="Compared lists have different sizes.">
+      <![CDATA[   Actual   (opA) size: 12
+   Expected (opB) size: 1]]>
+    </failure>
   </testcase>
   <testcase name="compareQStringLists(short list first)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared lists have different sizes.
-   Actual   (opA) size: 1
-   Expected (opB) size: 12"/>
+    <failure type="fail" message="Compared lists have different sizes.">
+      <![CDATA[   Actual   (opA) size: 1
+   Expected (opB) size: 12]]>
+    </failure>
   </testcase>
   <testcase name="compareQListInt(match)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
   <testcase name="compareQListInt(size mismatch)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared lists have different sizes.
-   Actual   (actual) size: 2
-   Expected (expected) size: 3"/>
+    <failure type="fail" message="Compared lists have different sizes.">
+      <![CDATA[   Actual   (actual) size: 2
+   Expected (expected) size: 3]]>
+    </failure>
   </testcase>
   <testcase name="compareQListInt(value mismatch)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared lists differ at index 2.
-   Actual   (actual): 4
-   Expected (expected): 3"/>
+    <failure type="fail" message="Compared lists differ at index 2.">
+      <![CDATA[   Actual   (actual): 4
+   Expected (expected): 3]]>
+    </failure>
   </testcase>
   <testcase name="compareQListIntToArray(match)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
   <testcase name="compareQListIntToArray(size mismatch)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared lists have different sizes.
-   Actual   (actual) size: 2
-   Expected (expected) size: 3"/>
+    <failure type="fail" message="Compared lists have different sizes.">
+      <![CDATA[   Actual   (actual) size: 2
+   Expected (expected) size: 3]]>
+    </failure>
   </testcase>
   <testcase name="compareQListIntToArray(value mismatch)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared lists differ at index 2.
-   Actual   (actual): 4
-   Expected (expected): 3"/>
+    <failure type="fail" message="Compared lists differ at index 2.">
+      <![CDATA[   Actual   (actual): 4
+   Expected (expected): 3]]>
+    </failure>
   </testcase>
   <testcase name="compareQListIntToInitializerList(match)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
   <testcase name="compareQListIntToInitializerList(size mismatch)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared lists have different sizes.
-   Actual   (actual) size: 2
-   Expected (ARG({1, 2, 3})) size: 3"/>
+    <failure type="fail" message="Compared lists have different sizes.">
+      <![CDATA[   Actual   (actual) size: 2
+   Expected (ARG({1, 2, 3})) size: 3]]>
+    </failure>
   </testcase>
   <testcase name="compareQListIntToInitializerList(value mismatch)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared lists differ at index 2.
-   Actual   (actual): 4
-   Expected (ARG({1, 2, 3})): 3"/>
+    <failure type="fail" message="Compared lists differ at index 2.">
+      <![CDATA[   Actual   (actual): 4
+   Expected (ARG({1, 2, 3})): 3]]>
+    </failure>
   </testcase>
   <testcase name="compareQListDouble" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared lists differ at index 0.
-   Actual   (double1): 1.5
-   Expected (double2): 1"/>
+    <failure type="fail" message="Compared lists differ at index 0.">
+      <![CDATA[   Actual   (double1): 1.5
+   Expected (double2): 1]]>
+    </failure>
   </testcase>
   <testcase name="compareQColor(Qt::yellow vs &quot;yellow&quot;)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
   <testcase name="compareQColor(Qt::yellow vs Qt::green)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (colorA): #ffffff00
-   Expected (colorB): #ff00ff00"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (colorA): #ffffff00
+   Expected (colorB): #ff00ff00]]>
+    </failure>
   </testcase>
   <testcase name="compareQColor(0x88ff0000 vs 0xffff0000)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (colorA): #88ff0000
-   Expected (colorB): #ffff0000"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (colorA): #88ff0000
+   Expected (colorB): #ffff0000]]>
+    </failure>
   </testcase>
   <testcase name="compareQPixmaps(both null)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
   <testcase name="compareQPixmaps(one null)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared QPixmaps differ.
-   Actual   (opA).isNull(): 1
-   Expected (opB).isNull(): 0"/>
+    <failure type="fail" message="Compared QPixmaps differ.">
+      <![CDATA[   Actual   (opA).isNull(): 1
+   Expected (opB).isNull(): 0]]>
+    </failure>
   </testcase>
   <testcase name="compareQPixmaps(other null)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared QPixmaps differ.
-   Actual   (opA).isNull(): 0
-   Expected (opB).isNull(): 1"/>
+    <failure type="fail" message="Compared QPixmaps differ.">
+      <![CDATA[   Actual   (opA).isNull(): 0
+   Expected (opB).isNull(): 1]]>
+    </failure>
   </testcase>
   <testcase name="compareQPixmaps(equal)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
   <testcase name="compareQPixmaps(different size)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared QPixmaps differ in size.
-   Actual   (opA): 11x20
-   Expected (opB): 20x20"/>
+    <failure type="fail" message="Compared QPixmaps differ in size.">
+      <![CDATA[   Actual   (opA): 11x20
+   Expected (opB): 20x20]]>
+    </failure>
   </testcase>
   <testcase name="compareQPixmaps(different pixels)" classname="tst_Cmptest" time="@TEST_DURATION@">
     <failure type="fail" message="Compared values are not the same"/>
   </testcase>
   <testcase name="compareQPixmaps(different dpr)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared QPixmaps differ in device pixel ratio.
-   Actual   (opA): 1
-   Expected (opB): 2"/>
+    <failure type="fail" message="Compared QPixmaps differ in device pixel ratio.">
+      <![CDATA[   Actual   (opA): 1
+   Expected (opB): 2]]>
+    </failure>
   </testcase>
   <testcase name="compareQImages(both null)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
   <testcase name="compareQImages(one null)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared QImages differ.
-   Actual   (opA).isNull(): 1
-   Expected (opB).isNull(): 0"/>
+    <failure type="fail" message="Compared QImages differ.">
+      <![CDATA[   Actual   (opA).isNull(): 1
+   Expected (opB).isNull(): 0]]>
+    </failure>
   </testcase>
   <testcase name="compareQImages(other null)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared QImages differ.
-   Actual   (opA).isNull(): 0
-   Expected (opB).isNull(): 1"/>
+    <failure type="fail" message="Compared QImages differ.">
+      <![CDATA[   Actual   (opA).isNull(): 0
+   Expected (opB).isNull(): 1]]>
+    </failure>
   </testcase>
   <testcase name="compareQImages(equal)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
   <testcase name="compareQImages(different size)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared QImages differ in size.
-   Actual   (opA): 11x20
-   Expected (opB): 20x20"/>
+    <failure type="fail" message="Compared QImages differ in size.">
+      <![CDATA[   Actual   (opA): 11x20
+   Expected (opB): 20x20]]>
+    </failure>
   </testcase>
   <testcase name="compareQImages(different format)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared QImages differ in format.
-   Actual   (opA): 6
-   Expected (opB): 3"/>
+    <failure type="fail" message="Compared QImages differ in format.">
+      <![CDATA[   Actual   (opA): 6
+   Expected (opB): 3]]>
+    </failure>
   </testcase>
   <testcase name="compareQImages(different pixels)" classname="tst_Cmptest" time="@TEST_DURATION@">
     <failure type="fail" message="Compared values are not the same"/>
   </testcase>
   <testcase name="compareQImages(different dpr)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared QImages differ in device pixel ratio.
-   Actual   (opA): 1
-   Expected (opB): 2"/>
+    <failure type="fail" message="Compared QImages differ in device pixel ratio.">
+      <![CDATA[   Actual   (opA): 1
+   Expected (opB): 2]]>
+    </failure>
   </testcase>
   <testcase name="compareQRegion(equal&#x002D;empty)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
   <testcase name="compareQRegion(1&#x002D;empty)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (rA): QRegion(200x50+10+10)
-   Expected (rB): QRegion(null)"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (rA): QRegion(200x50+10+10)
+   Expected (rB): QRegion(null)]]>
+    </failure>
   </testcase>
   <testcase name="compareQRegion(equal)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
   <testcase name="compareQRegion(different lists)" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (rA): QRegion(200x50+10+10)
-   Expected (rB): QRegion(2 rectangles, 50x200+100+200, 200x50+10+10)"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (rA): QRegion(200x50+10+10)
+   Expected (rB): QRegion(2 rectangles, 50x200+100+200, 200x50+10+10)]]>
+    </failure>
   </testcase>
   <testcase name="compareQVector2D" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (v2a): QVector2D(1, 2)
-   Expected (v2b): QVector2D(1, 3)"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (v2a): QVector2D(1, 2)
+   Expected (v2b): QVector2D(1, 3)]]>
+    </failure>
   </testcase>
   <testcase name="compareQVector3D" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (v3a): QVector3D(1, 2, 3)
-   Expected (v3b): QVector3D(1, 3, 3)"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (v3a): QVector3D(1, 2, 3)
+   Expected (v3b): QVector3D(1, 3, 3)]]>
+    </failure>
   </testcase>
   <testcase name="compareQVector4D" classname="tst_Cmptest" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (v4a): QVector4D(1, 2, 3, 4)
-   Expected (v4b): QVector4D(1, 3, 3, 4)"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (v4a): QVector4D(1, 2, 3, 4)
+   Expected (v4b): QVector4D(1, 3, 3, 4)]]>
+    </failure>
   </testcase>
   <testcase name="verify" classname="tst_Cmptest" time="@TEST_DURATION@">
     <failure type="fail" message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. ()"/>
diff --git a/tests/auto/testlib/selftests/expected_datetime.junitxml b/tests/auto/testlib/selftests/expected_datetime.junitxml
index 610fc13e34..989ebcce34 100644
--- a/tests/auto/testlib/selftests/expected_datetime.junitxml
+++ b/tests/auto/testlib/selftests/expected_datetime.junitxml
@@ -7,20 +7,23 @@
   </properties>
   <testcase name="initTestCase" classname="tst_DateTime" time="@TEST_DURATION@"/>
   <testcase name="dateTime" classname="tst_DateTime" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (local): 2000/05/03 04:03:04.000[UTC+00:02]
-   Expected (utc)  : 2000/05/03 04:03:04.000[UTC]"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (local): 2000/05/03 04:03:04.000[UTC+00:02]
+   Expected (utc)  : 2000/05/03 04:03:04.000[UTC]]]>
+    </failure>
   </testcase>
   <testcase name="qurl(empty urls)" classname="tst_DateTime" time="@TEST_DURATION@"/>
   <testcase name="qurl(empty rhs)" classname="tst_DateTime" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (operandA): http://example.com
-   Expected (operandB): Invalid URL: "/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (operandA): http://example.com
+   Expected (operandB): Invalid URL: ]]>
+    </failure>
   </testcase>
   <testcase name="qurl(empty lhs)" classname="tst_DateTime" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (operandA): Invalid URL: 
-   Expected (operandB): http://example.com"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (operandA): Invalid URL: 
+   Expected (operandB): http://example.com]]>
+    </failure>
   </testcase>
   <testcase name="qurl(same urls)" classname="tst_DateTime" time="@TEST_DURATION@"/>
   <testcase name="cleanupTestCase" classname="tst_DateTime" time="@TEST_DURATION@"/>
diff --git a/tests/auto/testlib/selftests/expected_junit.junitxml b/tests/auto/testlib/selftests/expected_junit.junitxml
index bd2428738a..5ee63b5d92 100644
--- a/tests/auto/testlib/selftests/expected_junit.junitxml
+++ b/tests/auto/testlib/selftests/expected_junit.junitxml
@@ -11,9 +11,10 @@
   </testcase>
   <testcase name="testFunc2" classname="tst_JUnit" time="@TEST_DURATION@">
     <!-- type="qdebug" message="a qDebug() call with comment&#x002D;ending stuff &#x002D;&#x002D;&gt;" -->
-    <failure type="fail" message="Compared values are not the same
-   Actual   (2): 2
-   Expected (3): 3"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (2): 2
+   Expected (3): 3]]>
+    </failure>
   </testcase>
   <testcase name="testFunc3" classname="tst_JUnit" time="@TEST_DURATION@">
     <skipped message="skipping this function!"/>
diff --git a/tests/auto/testlib/selftests/expected_longstring.junitxml b/tests/auto/testlib/selftests/expected_longstring.junitxml
index 613e38688d..67136d4c5e 100644
--- a/tests/auto/testlib/selftests/expected_longstring.junitxml
+++ b/tests/auto/testlib/selftests/expected_longstring.junitxml
@@ -7,15 +7,16 @@
   </properties>
   <testcase name="initTestCase" classname="tst_LongString" time="@TEST_DURATION@"/>
   <testcase name="failWithLongString" classname="tst_LongString" time="@TEST_DURATION@">
-    <failure type="fail" message="Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui.
-
+    <failure type="fail" message="Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui.">
+      <![CDATA[
 Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia.
 
 Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum. Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis hendrerit risus. Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque. Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi.
 
 Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada. Praesent congue erat at massa. Sed cursus turpis vitae tortor. Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci. Phasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc. Vestibulum fringilla pede sit amet augue. In turpis. Pellentesque posuere. Praesent turpis.
 
-Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas."/>
+Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.]]>
+    </failure>
   </testcase>
   <testcase name="cleanupTestCase" classname="tst_LongString" time="@TEST_DURATION@"/>
   <system-out/>
diff --git a/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml b/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml
index b3c115fa48..dfd51a9738 100644
--- a/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml
+++ b/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml
@@ -7,14 +7,16 @@
   </properties>
   <testcase name="initTestCase" classname="tst_PairDiagnostics" time="@TEST_DURATION@"/>
   <testcase name="testQPair" classname="tst_PairDiagnostics" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (pair1): std::pair(1, 1)
-   Expected (pair2): std::pair(1, 2)"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (pair1): std::pair(1, 1)
+   Expected (pair2): std::pair(1, 2)]]>
+    </failure>
   </testcase>
   <testcase name="testStdPair" classname="tst_PairDiagnostics" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (pair1): std::pair(1, 1)
-   Expected (pair2): std::pair(1, 2)"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (pair1): std::pair(1, 1)
+   Expected (pair2): std::pair(1, 2)]]>
+    </failure>
   </testcase>
   <testcase name="cleanupTestCase" classname="tst_PairDiagnostics" time="@TEST_DURATION@"/>
   <system-out/>
diff --git a/tests/auto/testlib/selftests/expected_strcmp.junitxml b/tests/auto/testlib/selftests/expected_strcmp.junitxml
index 96ecd6007f..480514adc7 100644
--- a/tests/auto/testlib/selftests/expected_strcmp.junitxml
+++ b/tests/auto/testlib/selftests/expected_strcmp.junitxml
@@ -11,29 +11,34 @@
     <!-- type="info" message="Next test should fail" -->
     <!-- type="info" message="Next test should fail" -->
     <!-- type="info" message="Next test should fail" -->
-    <failure type="fail" message="Compared values are not the same
-   Actual   (a): &quot;BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB&quot;...
-   Expected (b): &quot;AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA&quot;..."/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (a): "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"...
+   Expected (b): "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"...]]>
+    </failure>
   </testcase>
   <testcase name="failByteArray" classname="tst_StrCmp" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (QByteArray(&quot;abc&quot;)): &quot;abc&quot;
-   Expected (QByteArray(&quot;cba&quot;)): &quot;cba&quot;"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (QByteArray("abc")): "abc"
+   Expected (QByteArray("cba")): "cba"]]>
+    </failure>
   </testcase>
   <testcase name="failByteArrayNull" classname="tst_StrCmp" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (QByteArray(&quot;foo&quot;)): &quot;foo&quot;
-   Expected (QByteArray())     : &quot;&quot;"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (QByteArray("foo")): "foo"
+   Expected (QByteArray())     : ""]]>
+    </failure>
   </testcase>
   <testcase name="failByteArrayEmpty" classname="tst_StrCmp" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (QByteArray(&quot;&quot;))   : &quot;&quot;
-   Expected (QByteArray(&quot;foo&quot;)): &quot;foo&quot;"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (QByteArray(""))   : ""
+   Expected (QByteArray("foo")): "foo"]]>
+    </failure>
   </testcase>
   <testcase name="failByteArraySingleChars" classname="tst_StrCmp" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (QByteArray(&quot;6&quot;)): &quot;6&quot;
-   Expected (QByteArray(&quot;7&quot;)): &quot;7&quot;"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (QByteArray("6")): "6"
+   Expected (QByteArray("7")): "7"]]>
+    </failure>
   </testcase>
   <testcase name="cleanupTestCase" classname="tst_StrCmp" time="@TEST_DURATION@"/>
   <system-out>
diff --git a/tests/auto/testlib/selftests/expected_subtest.junitxml b/tests/auto/testlib/selftests/expected_subtest.junitxml
index a6a3709eda..f5b7bde44d 100644
--- a/tests/auto/testlib/selftests/expected_subtest.junitxml
+++ b/tests/auto/testlib/selftests/expected_subtest.junitxml
@@ -44,17 +44,19 @@
   <testcase name="test3(data1)" classname="tst_Subtest" time="@TEST_DURATION@">
     <!-- type="qdebug" message="init test3 data1" -->
     <!-- type="qdebug" message="test2 test3 data1" -->
-    <failure type="fail" message="Compared values are not the same
-   Actual   (str)              : &quot;hello1&quot;
-   Expected (QString(&quot;hello0&quot;)): &quot;hello0&quot;"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (str)              : "hello1"
+   Expected (QString("hello0")): "hello0"]]>
+    </failure>
     <!-- type="qdebug" message="cleanup test3 data1" -->
   </testcase>
   <testcase name="test3(data2)" classname="tst_Subtest" time="@TEST_DURATION@">
     <!-- type="qdebug" message="init test3 data2" -->
     <!-- type="qdebug" message="test2 test3 data2" -->
-    <failure type="fail" message="Compared values are not the same
-   Actual   (str)              : &quot;hello2&quot;
-   Expected (QString(&quot;hello0&quot;)): &quot;hello0&quot;"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (str)              : "hello2"
+   Expected (QString("hello0")): "hello0"]]>
+    </failure>
     <!-- type="qdebug" message="cleanup test3 data2" -->
   </testcase>
   <testcase name="cleanupTestCase" classname="tst_Subtest" time="@TEST_DURATION@">
diff --git a/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml b/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml
index 9c97826828..e727322307 100644
--- a/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml
+++ b/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml
@@ -8,14 +8,16 @@
   <testcase name="initTestCase" classname="tst_TupleDiagnostics" time="@TEST_DURATION@"/>
   <testcase name="testEmptyTuple" classname="tst_TupleDiagnostics" time="@TEST_DURATION@"/>
   <testcase name="testSimpleTuple" classname="tst_TupleDiagnostics" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (std::tuple&lt;int&gt;{1}): std::tuple(1)
-   Expected (std::tuple&lt;int&gt;{2}): std::tuple(2)"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (std::tuple<int>{1}): std::tuple(1)
+   Expected (std::tuple<int>{2}): std::tuple(2)]]>
+    </failure>
   </testcase>
   <testcase name="testTuple" classname="tst_TupleDiagnostics" time="@TEST_DURATION@">
-    <failure type="fail" message="Compared values are not the same
-   Actual   (tuple1): std::tuple(42, &apos;Y&apos;, &quot;tuple1&quot;)
-   Expected (tuple2): std::tuple(42, &apos;Y&apos;, &quot;tuple2&quot;)"/>
+    <failure type="fail" message="Compared values are not the same">
+      <![CDATA[   Actual   (tuple1): std::tuple(42, 'Y', "tuple1")
+   Expected (tuple2): std::tuple(42, 'Y', "tuple2")]]>
+    </failure>
   </testcase>
   <testcase name="cleanupTestCase" classname="tst_TupleDiagnostics" time="@TEST_DURATION@"/>
   <system-out/>
-- 
cgit v1.2.3