From 644ac04af0c3ef7d20ddc6077f85547fcba8caf5 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Fri, 31 Jul 2015 17:26:07 -0700
Subject: Change how QDebug escapes QStrings in the output

[ChangeLog][Important Behavior Changes] QDebug output for QStrings
changed compared to Qt 5.5.0 to more closely match the output of
previous Qt versions. Like Qt 5.5.0, QDebug will escape non-printable
characters, the backslash and quote characters, but will no longer
escape the printable characters.

Task-number: QTBUG-47316
Change-Id: I52dd43c12685407bb9a6ffff13f62ef68cbc80c5
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
---
 tests/auto/corelib/io/qdebug/tst_qdebug.cpp        | 40 +++++++++++++++++++---
 .../testlib/selftests/expected_badxml.lightxml     |  2 +-
 tests/auto/testlib/selftests/expected_badxml.xml   |  2 +-
 .../testlib/selftests/expected_badxml.xunitxml     |  4 +--
 4 files changed, 39 insertions(+), 9 deletions(-)

(limited to 'tests/auto')

diff --git a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
index 4e5cfed019..3e19e816c9 100644
--- a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
+++ b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
@@ -379,18 +379,48 @@ void tst_QDebug::qDebugQString() const
     qDebug().noquote().nospace() << qSetFieldWidth(8) << string;
     QCOMPARE(s_msg, "   " + string);
 
-    string = QLatin1String("\nSm\xF8rg\xE5sbord\\");
+    string = "Sm\xc3\xb8rg\xc3\xa5sbord "                               // Latin script
+             "\xce\x91\xce\xb8\xce\xae\xce\xbd\xce\xb1 "                // Greek script
+             "\xd0\x9c\xd0\xbe\xd1\x81\xd0\xba\xd0\xb2\xd0\xb0";        // Cyrillic script
     qDebug().noquote().nospace() << string;
     QCOMPARE(s_msg, string);
 
+    // This string only contains printable characters
     qDebug() << string;
-    QCOMPARE(s_msg, QString("\"\\nSm\\u00F8rg\\u00E5sbord\\\\\""));
+    QCOMPARE(s_msg, '"' + string + '"');
+
+    string = "\n\t\\\"";
+    qDebug().noquote().nospace() << string;
+    QCOMPARE(s_msg, string);
+
+    // This string only contains characters that must be escaped
+    qDebug() << string;
+    QCOMPARE(s_msg, QString("\"\\n\\t\\\\\\\"\""));
+
+    // Unicode escapes, BMP
+    string = "\1"                           // U+0001: START OF HEADING (category Cc)
+             "\x7f"                         // U+007F: DELETE (category Cc)
+             "\xc2\xad"                     // U+00AD: SOFT HYPHEN (category Cf)
+             "\xef\xbb\xbf";                // U+FEFF: ZERO WIDTH NO-BREAK SPACE / BOM (category Cf)
+    qDebug() << string;
+    QCOMPARE(s_msg, QString("\"\\u0001\\u007F\\u00AD\\uFEFF\""));
+
+    // Unicode printable non-BMP
+    string = "\xf0\x90\x80\x80";            // U+10000: LINEAR B SYLLABLE B008 A (category Lo)
+    qDebug() << string;
+    QCOMPARE(s_msg, '"' + string + '"');
+
+    // non-BMP and non-printable
+    string = "\xf3\xa0\x80\x81 "            // U+E0001: LANGUAGE TAG (category Cf)
+             "\xf4\x80\x80\x80";            // U+100000: Plane 16 Private Use (category Co)
+    qDebug() << string;
+    QCOMPARE(s_msg, QString("\"\\U000E0001 \\U00100000\""));
 
-    // surrogate pairs (including broken pairings)
-    ushort utf16[] = { 0xDC00, 0xD800, 0xDC00, 'x', 0xD800, 0xDC00, 0xD800, 0 };
+    // broken surrogate pairs
+    ushort utf16[] = { 0xDC00, 0xD800, 'x', 0xD800, 0 };
     string = QString::fromUtf16(utf16);
     qDebug() << string;
-    QCOMPARE(s_msg, QString("\"\\uDC00\\U00010000x\\U00010000\\uD800\""));
+    QCOMPARE(s_msg, QString("\"\\uDC00\\uD800x\\uD800\""));
 }
 
 void tst_QDebug::qDebugQStringRef() const
diff --git a/tests/auto/testlib/selftests/expected_badxml.lightxml b/tests/auto/testlib/selftests/expected_badxml.lightxml
index e0de44f0be..94f479a79a 100644
--- a/tests/auto/testlib/selftests/expected_badxml.lightxml
+++ b/tests/auto/testlib/selftests/expected_badxml.lightxml
@@ -113,7 +113,7 @@
 </TestFunction>
 <TestFunction name="encoding">
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA["\u00DClrich \u00DCml\u00E4ut"]]></Description>
+    <Description><![CDATA["Ülrich Ümläut"]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
     <Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_badxml.xml b/tests/auto/testlib/selftests/expected_badxml.xml
index 8667c2d9cd..c1266bfeed 100644
--- a/tests/auto/testlib/selftests/expected_badxml.xml
+++ b/tests/auto/testlib/selftests/expected_badxml.xml
@@ -115,7 +115,7 @@
 </TestFunction>
 <TestFunction name="encoding">
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA["\u00DClrich \u00DCml\u00E4ut"]]></Description>
+    <Description><![CDATA["Ülrich Ümläut"]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
     <Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_badxml.xunitxml b/tests/auto/testlib/selftests/expected_badxml.xunitxml
index 46f4be4391..49048fdad6 100644
--- a/tests/auto/testlib/selftests/expected_badxml.xunitxml
+++ b/tests/auto/testlib/selftests/expected_badxml.xunitxml
@@ -30,7 +30,7 @@
     <failure message="failure message" result="fail"/>
   </testcase>
   <testcase result="pass" name="encoding">
-    <!-- message="&quot;\u00DClrich \u00DCml\u00E4ut&quot;" type="qdebug" -->
+    <!-- message="&quot;Ülrich Ümläut&quot;" type="qdebug" -->
   </testcase>
   <testcase result="pass" name="cleanupTestCase"/>
   <system-err>
@@ -46,6 +46,6 @@
 <![CDATA[quotes " text" more text]]>
 <![CDATA[xml close > open < tags < text]]>
 <![CDATA[all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]>
-<![CDATA["\u00DClrich \u00DCml\u00E4ut"]]>
+<![CDATA["Ülrich Ümläut"]]>
   </system-err>
 </testsuite>
-- 
cgit v1.2.3