tests/auto/corelib: Remove some placeholder formatting.

Use QByteArray/QString addition instead in loops and for
test row names.

Change-Id: Ieffb429efdc14aa5932b3fcdef5a18e13a62d35f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>

13 files changed, 55 insertions, 45 deletions

diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
index 7a94d922c9..4a8190da6d 100644
--- a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
@@ -212,12 +212,12 @@ QByteArray verifyZeroTermination(const QByteArray &ba)
 
     const_cast<char *>(baData)[baSize] = 'x';
     if ('x' != ba.constData()[baSize]) {
-        return QString::fromLatin1("*** Failed to replace null-terminator in "
-                "result ('%1') ***").arg(QString::fromLatin1(ba)).toLatin1();
+        return "*** Failed to replace null-terminator in "
+                "result ('" + ba + "') ***";
     }
     if (ba != baCopy) {
-        return QString::fromLatin1( "*** Result ('%1') differs from its copy "
-                "after null-terminator was replaced ***").arg(QString::fromLatin1(ba)).toLatin1();
+        return  "*** Result ('" + ba + "') differs from its copy "
+                "after null-terminator was replaced ***";
     }
     const_cast<char *>(baData)[baSize] = '\0'; // Restore sanity
 
diff --git a/tests/auto/corelib/tools/qchar/tst_qchar.cpp b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
index 3a24c82f9e..c2bef14767 100644
--- a/tests/auto/corelib/tools/qchar/tst_qchar.cpp
+++ b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
@@ -239,8 +239,8 @@ void tst_QChar::isDigit_data()
 
     for (ushort ucs = 0; ucs < 256; ++ucs) {
         bool isDigit = (ucs <= '9' && ucs >= '0');
-        QString tag = QString::fromLatin1("0x%0").arg(QString::number(ucs, 16));
-        QTest::newRow(tag.toLatin1()) << ucs << isDigit;
+        const QByteArray tag = "0x" + QByteArray::number(ucs, 16);
+        QTest::newRow(tag.constData()) << ucs << isDigit;
     }
 }
 
@@ -266,8 +266,8 @@ void tst_QChar::isLetter_data()
     QTest::addColumn<bool>("expected");
 
     for (ushort ucs = 0; ucs < 256; ++ucs) {
-        QString tag = QString::fromLatin1("0x%0").arg(QString::number(ucs, 16));
-        QTest::newRow(tag.toLatin1()) << ucs << isExpectedLetter(ucs);
+        const QByteArray tag = "0x" + QByteArray::number(ucs, 16);
+        QTest::newRow(tag.constData()) << ucs << isExpectedLetter(ucs);
     }
 }
 
@@ -288,8 +288,8 @@ void tst_QChar::isLetterOrNumber_data()
                 || (ucs >= '0' && ucs <= '9')
                 || ucs == 0xB2 || ucs == 0xB3 || ucs == 0xB9
                 || (ucs >= 0xBC && ucs <= 0xBE);
-        QString tag = QString::fromLatin1("0x%0").arg(QString::number(ucs, 16));
-        QTest::newRow(tag.toLatin1()) << ucs << isLetterOrNumber;
+        const QByteArray tag = "0x" + QByteArray::number(ucs, 16);
+        QTest::newRow(tag.constData()) << ucs << isLetterOrNumber;
     }
 }
 
@@ -403,8 +403,8 @@ void tst_QChar::isSpace_data()
 
     for (ushort ucs = 0; ucs < 256; ++ucs) {
         bool isSpace = (ucs <= 0x0D && ucs >= 0x09) || ucs == 0x20 || ucs == 0xA0 || ucs == 0x85;
-        QString tag = QString::fromLatin1("0x%0").arg(QString::number(ucs, 16));
-        QTest::newRow(tag.toLatin1()) << ucs << isSpace;
+        const QByteArray tag = "0x" + QByteArray::number(ucs, 16);
+        QTest::newRow(tag.constData()) << ucs << isSpace;
     }
 }
 
@@ -793,8 +793,10 @@ void tst_QChar::normalization_data()
             }
         }
 
-        QString nm = QString("line #%1 (part %2").arg(linenum).arg(part);
-        QTest::newRow(nm.toLatin1()) << columns << part;
+
+        const QByteArray nm = "line #" + QByteArray::number(linenum) + " (part "
+            + QByteArray::number(part);
+        QTest::newRow(nm.constData()) << columns << part;
     }
 }
 
diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
index 571e8deb00..da5039ce3b 100644
--- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
@@ -1691,13 +1691,15 @@ void tst_QDateTime::operator_insert_extract_data()
     const int thisVersion = tmpDataStream.version();
     for (int version = QDataStream::Qt_1_0; version <= thisVersion; ++version) {
         const QDataStream::Version dataStreamVersion = static_cast<QDataStream::Version>(version);
-        QTest::newRow(QString::fromLatin1("v%1 WA => HAWAII %2").arg(dataStreamVersion).arg(positiveYear.toString()).toLocal8Bit().constData())
+        const QByteArray vN = QByteArray::number(dataStreamVersion);
+        const QByteArray pY = positiveYear.toString().toLatin1();
+        QTest::newRow(('v' + vN + " WA => HAWAII " + pY).constData())
             << positiveYear << westernAustralia << hawaii << dataStreamVersion;
-        QTest::newRow(QString::fromLatin1("v%1 WA => WA %2").arg(dataStreamVersion).arg(positiveYear.toString()).toLocal8Bit().constData())
+        QTest::newRow(('v' + vN + " WA => WA " + pY).constData())
             << positiveYear << westernAustralia << westernAustralia << dataStreamVersion;
-        QTest::newRow(QString::fromLatin1("v%1 HAWAII => WA %2").arg(dataStreamVersion).arg(negativeYear.toString()).toLocal8Bit().constData())
+        QTest::newRow(('v' + vN + " HAWAII => WA " + negativeYear.toString().toLatin1()).constData())
             << negativeYear << hawaii << westernAustralia << dataStreamVersion;
-        QTest::newRow(QString::fromLatin1("v%1 HAWAII => HAWAII %2").arg(dataStreamVersion).arg(positiveYear.toString()).toLocal8Bit().constData())
+        QTest::newRow(('v' + vN + " HAWAII => HAWAII " + pY).constData())
             << positiveYear << hawaii << hawaii << dataStreamVersion;
     }
 }
diff --git a/tests/auto/corelib/tools/qline/tst_qline.cpp b/tests/auto/corelib/tools/qline/tst_qline.cpp
index 20373bfb15..a215464d8a 100644
--- a/tests/auto/corelib/tools/qline/tst_qline.cpp
+++ b/tests/auto/corelib/tools/qline/tst_qline.cpp
@@ -179,7 +179,7 @@ void tst_QLine::testIntersection_data()
         a = a.translated(1, 1);
         b = b.translated(1, 1);
 
-        QTest::newRow(qPrintable(QString::fromLatin1("rotation-%0").arg(i)))
+        QTest::newRow(("rotation-" + QByteArray::number(i)).constData())
             << (double)a.x1() << (double)a.y1() << (double)a.x2() << (double)a.y2()
             << (double)b.x1() << (double)b.y1() << (double)b.x2() << (double)b.y2()
             << int(QLineF::BoundedIntersection)
@@ -332,7 +332,7 @@ void tst_QLine::testAngle_data()
                               << 135.0;
 
     for (int i=0; i<180; ++i) {
-        QTest::newRow(QString("angle:%1").arg(i).toLatin1())
+        QTest::newRow(("angle:" + QByteArray::number(i)).constData())
             << 0.0 << 0.0 << double(cos(i*M_2PI/360)) << double(sin(i*M_2PI/360))
             << 0.0 << 0.0 << 1.0 << 0.0
             << double(i);
@@ -460,7 +460,7 @@ void tst_QLine::testAngleTo_data()
 
     for (int i = 0; i < 360; ++i) {
         const QLineF l = QLineF::fromPolar(1, i);
-        QTest::newRow(QString("angle:%1").arg(i).toLatin1())
+        QTest::newRow(("angle:" + QByteArray::number(i)).constData())
             << qreal(0.0) << qreal(0.0) << qreal(1.0) << qreal(0.0)
             << qreal(0.0) << qreal(0.0) << l.p2().x() << l.p2().y()
             << qreal(i);
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
index 6c4fc5e62b..33c8eb303a 100644
--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
@@ -1697,9 +1697,11 @@ void tst_QLocale::testNames_data()
     for (int i = 0; i < locale_data_count; ++i) {
         const QLocaleData &item = locale_data[i];
 
-        const QString testName = QString::fromLatin1("data_%1 (%2/%3)").arg(i)
-                .arg(QLocale::languageToString((QLocale::Language)item.m_language_id))
-                .arg(QLocale::countryToString((QLocale::Country)item.m_country_id));
+
+        const QString testName = QLatin1String("data_") + QString::number(i) + QLatin1String(" (")
+            + QLocale::languageToString((QLocale::Language)item.m_language_id)
+            + QLatin1Char('/') + QLocale::countryToString((QLocale::Country)item.m_country_id)
+            + QLatin1Char(')');
         QTest::newRow(testName.toLatin1().constData()) << (int)item.m_language_id << (int)item.m_country_id;
     }
 }
diff --git a/tests/auto/corelib/tools/qmap/tst_qmap.cpp b/tests/auto/corelib/tools/qmap/tst_qmap.cpp
index 7cd7d7980f..daaabbb523 100644
--- a/tests/auto/corelib/tools/qmap/tst_qmap.cpp
+++ b/tests/auto/corelib/tools/qmap/tst_qmap.cpp
@@ -1062,7 +1062,7 @@ void tst_QMap::equal_range()
     QCOMPARE(cresult.second, cmap.cend());
 
     for (int i = -10; i < 10; i += 2)
-        map.insert(i, QString("%1").arg(i));
+        map.insert(i, QString::number(i));
 
     result = map.equal_range(0);
     QCOMPARE(result.first, map.find(0));
diff --git a/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp b/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
index 23259e520f..1d8b719d16 100644
--- a/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
+++ b/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
@@ -1370,12 +1370,14 @@ void tst_QRegExp::escapeSequences()
 {
     QString perlSyntaxSpecialChars("0123456789afnrtvbBdDwWsSx\\|[]{}()^$?+*");
     QString w3cXmlSchema11SyntaxSpecialChars("cCiIpP"); // as well as the perl ones
+    QString pattern = QLatin1String("\\?");
     for (int i = ' '; i <= 127; ++i) {
         QLatin1Char c(i);
         if (perlSyntaxSpecialChars.indexOf(c) == -1) {
-            QRegExp rx(QString("\\%1").arg(c), Qt::CaseSensitive, QRegExp::RegExp);
+            pattern[1] = c;
+            QRegExp rx(pattern, Qt::CaseSensitive, QRegExp::RegExp);
             // we'll never have c == 'a' since it's a special character
-            QString s = QString("aaa%1aaa").arg(c);
+            const QString s = QLatin1String("aaa") + c + QLatin1String("aaa");
             QCOMPARE(rx.indexIn(s), 3);
 
             rx.setPatternSyntax(QRegExp::RegExp2);
diff --git a/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp b/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp
index 8ddd4979b6..6be4e69eb7 100644
--- a/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp
+++ b/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp
@@ -656,7 +656,7 @@ void tst_QRegularExpression::normalMatch_data()
     m.captured << "c123def" << "c12" << "3" << "def";
     offset = 2;
     for (int i = 0; i <= offset; ++i) {
-        QTest::newRow(QStringLiteral("match06-offset%1").arg(i).toUtf8().constData())
+        QTest::newRow(("match06-offset" + QByteArray::number(i)).constData())
                 << QRegularExpression("(\\w*)(\\d+)(\\w*)")
                 << QStringLiteral("abc123def").mid(offset - i)
                 << i
@@ -669,7 +669,7 @@ void tst_QRegularExpression::normalMatch_data()
     m.captured << QString("");
     offset = 9;
     for (int i = 0; i <= offset; ++i) {
-        QTest::newRow(QStringLiteral("match07-offset%1").arg(i).toUtf8().constData())
+        QTest::newRow(("match07-offset" + QByteArray::number(i)).constData())
                 << QRegularExpression("\\w*")
                 << QStringLiteral("abc123def").mid(offset - i)
                 << i
@@ -747,7 +747,7 @@ void tst_QRegularExpression::normalMatch_data()
     m.isValid = true;
     offset = 1;
     for (int i = 0; i <= offset; ++i) {
-        QTest::newRow(QStringLiteral("nomatch02-offset%1").arg(i).toUtf8().constData())
+        QTest::newRow(("nomatch02-offset" + QByteArray::number(i)).constData())
             << QRegularExpression("(\\w+) (\\w+)")
             << QStringLiteral("a string").mid(offset - i)
             << i
@@ -759,7 +759,7 @@ void tst_QRegularExpression::normalMatch_data()
     m.isValid = true;
     offset = 9;
     for (int i = 0; i <= offset; ++i) {
-        QTest::newRow(QStringLiteral("nomatch03-offset%1").arg(i).toUtf8().constData())
+        QTest::newRow(("nomatch03-offset" + QByteArray::number(i)).constData())
                 << QRegularExpression("\\w+")
                 << QStringLiteral("abc123def").mid(offset - i)
                 << i
@@ -930,7 +930,7 @@ void tst_QRegularExpression::partialMatch_data()
     m.captured << "def";
     offset = 1;
     for (int i = 0; i <= offset; ++i) {
-        QTest::newRow(QStringLiteral("softmatch08-offset%1").arg(i).toUtf8().constData())
+        QTest::newRow(("softmatch08-offset" + QByteArray::number(i)).constData())
                 << QRegularExpression("abc\\w+X|defY")
                 << QStringLiteral("abcdef").mid(offset - i)
                 << i
@@ -1016,7 +1016,7 @@ void tst_QRegularExpression::partialMatch_data()
     m.captured << "def";
     offset = 1;
     for (int i = 0; i <= offset; ++i) {
-        QTest::newRow(QStringLiteral("hardmatch08-offset%1").arg(i).toUtf8().constData())
+        QTest::newRow(("hardmatch08-offset" + QByteArray::number(i)).constData())
                 << QRegularExpression("abc\\w+X|defY")
                 << QStringLiteral("abcdef").mid(offset - i)
                 << i
diff --git a/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp b/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
index 2695e6238c..b77fe23bd6 100644
--- a/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
+++ b/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
@@ -150,7 +150,7 @@ void tst_QRingBuffer::readPointerAtPositionWriteRead()
     inData.putChar(0x23);
     inData.write("Qt rocks!");
     for (int i = 0; i < 5000; i++)
-        inData.write(QString("Number %1").arg(i).toUtf8());
+        inData.write("Number " + QByteArray::number(i));
     inData.reset();
     QVERIFY(inData.size() > 0);
 
diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
index 124829a11c..6b84fa367b 100644
--- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp
+++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
@@ -63,7 +63,7 @@
 #include <algorithm>
 
 #define CREATE_REF(string)                                              \
-    const QString padded = QString::fromLatin1(" %1 ").arg(string);     \
+    const QString padded = QLatin1Char(' ') + string +  QLatin1Char(' '); \
     QStringRef ref = padded.midRef(1, padded.size() - 2);
 
 namespace {
diff --git a/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
index 15bcb1ee2b..b3599b6a5c 100644
--- a/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
+++ b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
@@ -97,7 +97,7 @@ static QStringRef emptyRef()
 }
 
 #define CREATE_REF(string)                                              \
-    const QString padded = QString::fromLatin1(" %1 ").arg(string);     \
+    const QString padded = QLatin1Char(' ') + string + QLatin1Char(' ');     \
     QStringRef ref = padded.midRef(1, padded.size() - 2);
 
 typedef QList<int> IntList;
@@ -317,8 +317,8 @@ void tst_QStringRef::indexOf()
     QFETCH(bool, bcs);
     QFETCH(int, resultpos);
 
-    const QString haystackPadded = QString::fromLatin1(" %1 ").arg(haystack);
-    const QString needlePadded = QString::fromLatin1(" %1 ").arg(needle);
+    const QString haystackPadded = QLatin1Char(' ') + haystack + QLatin1Char(' ');
+    const QString needlePadded = QLatin1Char(' ') + needle + QLatin1Char(' ');
     const QStringRef haystackRef(&haystackPadded, 1, haystack.size());
     const QStringRef needleRef(&needlePadded, 1, needle.size());
 
@@ -407,8 +407,8 @@ void tst_QStringRef::indexOf2()
     QFETCH(QString, needle);
     QFETCH(int, resultpos);
 
-    const QString haystackPadded = QString::fromLatin1(" %1 ").arg(haystack);
-    const QString needlePadded = QString::fromLatin1(" %1 ").arg(needle);
+    const QString haystackPadded = QLatin1Char(' ') + haystack + QLatin1Char(' ');
+    const QString needlePadded = QLatin1Char(' ') + needle + QLatin1Char(' ');
     const QStringRef haystackRef(&haystackPadded, 1, haystack.size());
     const QStringRef needleRef(&needlePadded, 1, needle.size());
 
@@ -490,8 +490,8 @@ void tst_QStringRef::lastIndexOf()
     QFETCH(int, expected);
     QFETCH(bool, caseSensitive);
 
-    const QString haystackPadded = QString::fromLatin1(" %1 ").arg(haystack);
-    const QString needlePadded = QString::fromLatin1(" %1 ").arg(needle);
+    const QString haystackPadded = QLatin1Char(' ') + haystack + QLatin1Char(' ');
+    const QString needlePadded = QLatin1Char(' ') + needle + QLatin1Char(' ');
     const QStringRef haystackRef(&haystackPadded, 1, haystack.size());
     const QStringRef needleRef(&needlePadded, 1, needle.size());
 
diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp b/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
index 753d61f02c..927c07f9e6 100644
--- a/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
+++ b/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
@@ -166,8 +166,8 @@ static void generateDataFromFile(const QString &fname)
             }
         }
 
-        QString nm = QString("line #%1: %2").arg(linenum).arg(comments);
-        QTest::newRow(nm.toLatin1()) << testString << expectedBreakPositions;
+        const QByteArray nm = "line #" + QByteArray::number(linenum) + ": " + comments.toLatin1();
+        QTest::newRow(nm.constData()) << testString << expectedBreakPositions;
     }
 }
 #endif
diff --git a/tests/auto/corelib/tools/qvector/tst_qvector.cpp b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
index 87822bca6f..bdfb567331 100644
--- a/tests/auto/corelib/tools/qvector/tst_qvector.cpp
+++ b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
@@ -2391,6 +2391,7 @@ void tst_QVector::reallocAfterCopy_data()
     int result1, result2, result3, result4;
     int fill_size;
     for (int i = 70; i <= 100; i += 10) {
+        const QByteArray prefix = "reallocAfterCopy:" + QByteArray::number(i) + ',';
         fill_size = i - 20;
         for (int j = 0; j <= 3; j++) {
             if (j == 0) { // append
@@ -2414,7 +2415,8 @@ void tst_QVector::reallocAfterCopy_data()
                 result3 = i - 10;
                 result4 = i - 20;
             }
-            QTest::newRow(qPrintable(QString("reallocAfterCopy:%1,%2").arg(i).arg(j))) << i << fill_size << j << result1 << result2 << result3 << result4;
+            QTest::newRow((prefix + QByteArray::number(j)).constData())
+                    << i << fill_size << j << result1 << result2 << result3 << result4;
         }
     }
 }