summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/tools/qregularexpression
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-10-20 10:08:39 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-10-22 03:54:29 +0000
commit456f721917d07b3dd4259c324ff216f90bd32139 (patch)
treefbc30a9a04ab5be9fc6b332a16910e2cf7fc24d9 /tests/auto/corelib/tools/qregularexpression
parentacdd4850a485a0cb8f8f0502cafd65a9f214b2a9 (diff)
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>
Diffstat (limited to 'tests/auto/corelib/tools/qregularexpression')
-rw-r--r--tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp12
1 files changed, 6 insertions, 6 deletions
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