From d8b143d4b77c45cfe1a40d525be5d0a79a2b07a4 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Mon, 26 Feb 2018 17:46:00 +0100
Subject: qstringapisymmetry: Fix XML parsing failing on invalid encodings

Evaluating testlib's XML output in COIN would fail with:
"XML syntax error on line 7520: invalid UTF-8"
for the toLatin1() tests due to some Latin1/UTF8 mixup.

Add a helper function to convert the data to plain ASCII.

Task-number: QTQAINFRA-1797
Change-Id: I1c64878d4c2a67b8c2689905b5ffe6707b5963c1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 .../qstringapisymmetry/tst_qstringapisymmetry.cpp  | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'tests/auto')

diff --git a/tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp b/tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp
index 61d1f86f00..cb1fd9eb7d 100644
--- a/tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp
+++ b/tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp
@@ -33,6 +33,7 @@
 #include <QString>
 #include <QStringView>
 #include <QChar>
+#include <QScopedArrayPointer>
 #include <QStringRef>
 #include <QLatin1String>
 #include <QVector>
@@ -70,6 +71,19 @@ MAKE_ALL(const char*, QChar)
 #undef MAKE_RELOP
 // END FIXME
 
+// Return a plain ASCII row name consisting of maximum 16 chars and the
+// size for data
+static QByteArray rowName(const QByteArray &data)
+{
+    const int size = data.size();
+    QScopedArrayPointer<char> prettyC(QTest::toPrettyCString(data.constData(), qMin(16, size)));
+    QByteArray result = prettyC.data();
+    result += " (";
+    result += QByteArray::number(size);
+    result += ')';
+    return result;
+}
+
 class tst_QStringApiSymmetry : public QObject
 {
     Q_OBJECT
@@ -1072,7 +1086,7 @@ void tst_QStringApiSymmetry::toLocal8Bit_data()
         QString s;
         for (char c : ba)
             s += QLatin1Char(c);
-        QTest::addRow("\"%s\" (%d)", ba.left(16).constData(), ba.size()) << s << ba;
+        QTest::newRow(rowName(ba).constData()) << s << ba;
     };
 
     QTest::addRow("null") << QString() << QByteArray();
@@ -1107,7 +1121,7 @@ void tst_QStringApiSymmetry::toLatin1_data()
         QString s;
         for (char c : ba)
             s += QLatin1Char(c);
-        QTest::addRow("\"%s\" (%d)", ba.left(16).constData(), ba.size()) << s << ba;
+        QTest::newRow(rowName(ba).constData()) << s << ba;
     };
 
     QTest::addRow("null") << QString() << QByteArray();
@@ -1140,7 +1154,7 @@ void tst_QStringApiSymmetry::toUtf8_data()
     auto add = [](const char *u8) {
         QByteArray ba(u8);
         QString s = ba;
-        QTest::addRow("\"%s\" (%d)", ba.left(16).constData(), ba.size()) << s << ba;
+        QTest::newRow(rowName(ba).constData()) << s << ba;
     };
 
     QTest::addRow("null") << QString() << QByteArray();
@@ -1178,7 +1192,7 @@ void tst_QStringApiSymmetry::toUcs4_data()
             s += QLatin1Char(c);
             ucs4.append(uint(uchar(c)));
         }
-        QTest::addRow("\"%s\" (%d)", ba.left(16).constData(), ba.size()) << s << ucs4;
+        QTest::newRow(rowName(ba).constData()) << s << ucs4;
     };
 
     QTest::addRow("null") << QString() << QVector<uint>();
-- 
cgit v1.2.3