Skip to content

Commit 97cdb60

Browse files
committed
Add unit test raw string literals via sed
1 parent d32fdf9 commit 97cdb60

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

test/unit/cli/testloggerfetchcommand.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void TestLoggerFetchCommand::metadataRead()
3939
1000, 1234, (quint32)QDateTime::currentSecsSinceEpoch()
4040
};
4141
LoggerFetchCommand command(this);
42-
QTest::ignoreMessage(QtInfoMsg, QRegularExpression(QStringLiteral(R"(Fetching 1,?234 logger sample/s\.{3})")));
42+
QTest::ignoreMessage(QtInfoMsg, QRegularExpression(uR"(Fetching 1,?234 logger sample/s\.{3})"_s));
4343
command.metadataRead(metadata);
4444
QCOMPARE(command.metadata.status, metadata.status);
4545
QCOMPARE(command.metadata.scale, metadata.scale);

test/unit/lib/testpokitproducts.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void TestPokitProducts::toString_PokitProduct()
4545
QFETCH(QString, expected);
4646

4747
if (expected.isNull()) {
48-
QTest::ignoreMessage(QtWarningMsg, QRegularExpression(QStringLiteral(R"(^Unknown PokitProduct value: \d+$)")));
48+
QTest::ignoreMessage(QtWarningMsg, QRegularExpression(uR"(^Unknown PokitProduct value: \d+$)"_s));
4949
}
5050

5151
QCOMPARE(toString(product), expected);
@@ -214,7 +214,7 @@ void TestPokitProducts::toString_Capacitance()
214214
if (product == PokitProduct::PokitMeter) {
215215
QTest::ignoreMessage(QtWarningMsg, "Pokit Meter has no capacitance support");
216216
} else if (expected.isNull()) {
217-
QTest::ignoreMessage(QtWarningMsg, QRegularExpression(QStringLiteral(R"(^Unknown PokitProduct value: \d+$)")));
217+
QTest::ignoreMessage(QtWarningMsg, QRegularExpression(uR"(^Unknown PokitProduct value: \d+$)"_s));
218218
}
219219

220220
QCOMPARE(CapacitanceRange::toString(product, range), expected);
@@ -242,7 +242,7 @@ void TestPokitProducts::maxValue_Capacitance()
242242
if (product == PokitProduct::PokitMeter) {
243243
QTest::ignoreMessage(QtWarningMsg, "Pokit Meter has no capacitance support");
244244
} else if (!expected) {
245-
QTest::ignoreMessage(QtWarningMsg, QRegularExpression(QStringLiteral(R"(^Unknown PokitProduct value: \d+$)")));
245+
QTest::ignoreMessage(QtWarningMsg, QRegularExpression(uR"(^Unknown PokitProduct value: \d+$)"_s));
246246
}
247247

248248
QCOMPARE(CapacitanceRange::maxValue(product, range), expected);
@@ -270,7 +270,7 @@ void TestPokitProducts::toString_Current()
270270
QFETCH(QString, expected);
271271

272272
if (expected.isNull()) {
273-
QTest::ignoreMessage(QtWarningMsg, QRegularExpression(QStringLiteral(R"(^Unknown PokitProduct value: \d+$)")));
273+
QTest::ignoreMessage(QtWarningMsg, QRegularExpression(uR"(^Unknown PokitProduct value: \d+$)"_s));
274274
}
275275

276276
QCOMPARE(CurrentRange::toString(product, range), expected);
@@ -296,7 +296,7 @@ void TestPokitProducts::maxValue_Current()
296296
QFETCH(quint32, expected);
297297

298298
if (!expected) {
299-
QTest::ignoreMessage(QtWarningMsg, QRegularExpression(QStringLiteral(R"(^Unknown PokitProduct value: \d+$)")));
299+
QTest::ignoreMessage(QtWarningMsg, QRegularExpression(uR"(^Unknown PokitProduct value: \d+$)"_s));
300300
}
301301

302302
QCOMPARE(CurrentRange::maxValue(product, range), expected);
@@ -324,7 +324,7 @@ void TestPokitProducts::toString_Resistance()
324324
QFETCH(QString, expected);
325325

326326
if (expected.isNull()) {
327-
QTest::ignoreMessage(QtWarningMsg, QRegularExpression(QStringLiteral(R"(^Unknown PokitProduct value: \d+$)")));
327+
QTest::ignoreMessage(QtWarningMsg, QRegularExpression(uR"(^Unknown PokitProduct value: \d+$)"_s));
328328
}
329329

330330
QCOMPARE(ResistanceRange::toString(product, range), expected);
@@ -350,7 +350,7 @@ void TestPokitProducts::maxValue_Resistance()
350350
QFETCH(quint32, expected);
351351

352352
if (!expected) {
353-
QTest::ignoreMessage(QtWarningMsg, QRegularExpression(QStringLiteral(R"(^Unknown PokitProduct value: \d+$)")));
353+
QTest::ignoreMessage(QtWarningMsg, QRegularExpression(uR"(^Unknown PokitProduct value: \d+$)"_s));
354354
}
355355

356356
QCOMPARE(ResistanceRange::maxValue(product, range), expected);
@@ -378,7 +378,7 @@ void TestPokitProducts::toString_Voltage()
378378
QFETCH(QString, expected);
379379

380380
if (expected.isNull()) {
381-
QTest::ignoreMessage(QtWarningMsg, QRegularExpression(QStringLiteral(R"(^Unknown PokitProduct value: \d+$)")));
381+
QTest::ignoreMessage(QtWarningMsg, QRegularExpression(uR"(^Unknown PokitProduct value: \d+$)"_s));
382382
}
383383

384384
QCOMPARE(VoltageRange::toString(product, range), expected);
@@ -404,7 +404,7 @@ void TestPokitProducts::maxValue_Voltage()
404404
QFETCH(quint32, expected);
405405

406406
if (!expected) {
407-
QTest::ignoreMessage(QtWarningMsg, QRegularExpression(QStringLiteral(R"(^Unknown PokitProduct value: \d+$)")));
407+
QTest::ignoreMessage(QtWarningMsg, QRegularExpression(uR"(^Unknown PokitProduct value: \d+$)"_s));
408408
}
409409

410410
QCOMPARE(VoltageRange::maxValue(product, range), expected);

0 commit comments

Comments
 (0)