From 7baa06fe0c7fa1a1d20ae749915a6483621f204e Mon Sep 17 00:00:00 2001
From: Sona Kurazyan <sona.kurazyan@qt.io>
Date: Tue, 26 Apr 2022 17:07:00 +0200
Subject: QtTestLib: replace QLatin1String uses with _L1/_s/QStringLiteral

Task-number: QTBUG-98434
Change-Id: Ie327fd4af1880002e5a1e09b43384f2b709625e7
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
---
 src/testlib/qteamcitylogger.cpp | 46 +++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

(limited to 'src/testlib/qteamcitylogger.cpp')

diff --git a/src/testlib/qteamcitylogger.cpp b/src/testlib/qteamcitylogger.cpp
index 5bd6b4f429..9311f24a57 100644
--- a/src/testlib/qteamcitylogger.cpp
+++ b/src/testlib/qteamcitylogger.cpp
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 namespace QTest {
 
     static const char *incidentType2String(QAbstractTestLogger::IncidentTypes type)
@@ -119,13 +121,13 @@ void QTeamCityLogger::startLogging()
 
     flowID = tcEscapedString(QString::fromUtf8(QTestResult::currentTestObjectName()));
 
-    QString str = QLatin1String("##teamcity[testSuiteStarted name='%1' flowId='%1']\n").arg(flowID);
+    QString str = "##teamcity[testSuiteStarted name='%1' flowId='%1']\n"_L1.arg(flowID);
     outputString(qPrintable(str));
 }
 
 void QTeamCityLogger::stopLogging()
 {
-    QString str = QLatin1String("##teamcity[testSuiteFinished name='%1' flowId='%1']\n").arg(flowID);
+    QString str = "##teamcity[testSuiteFinished name='%1' flowId='%1']\n"_L1.arg(flowID);
     outputString(qPrintable(str));
 
     QAbstractTestLogger::stopLogging();
@@ -153,7 +155,7 @@ void QTeamCityLogger::addIncident(IncidentTypes type, const char *description,
     QString tmpFuncName = escapedTestFuncName();
 
     if (tmpFuncName != currTestFuncName) {
-        buf = QLatin1String("##teamcity[testStarted name='%1' flowId='%2']\n").arg(tmpFuncName, flowID);
+        buf = "##teamcity[testStarted name='%1' flowId='%2']\n"_L1.arg(tmpFuncName, flowID);
         outputString(qPrintable(buf));
     }
 
@@ -168,27 +170,27 @@ void QTeamCityLogger::addIncident(IncidentTypes type, const char *description,
 
     // Test failed
     if (type == Fail || type == XPass) {
-        QString messageText(QLatin1String("Failure!"));
+        QString messageText(u"Failure!"_s);
 
         if (file)
-            messageText += QLatin1String(" |[Loc: %1(%2)|]").arg(QString::fromUtf8(file)).arg(line);
+            messageText += " |[Loc: %1(%2)|]"_L1.arg(QString::fromUtf8(file)).arg(line);
 
-        buf = QLatin1String("##teamcity[testFailed name='%1' message='%2' details='%3' flowId='%4']\n")
+        buf = "##teamcity[testFailed name='%1' message='%2' details='%3' flowId='%4']\n"_L1
                         .arg(tmpFuncName, messageText, detailedText, flowID);
 
         outputString(qPrintable(buf));
     } else if (type == Skip) {
         if (file)
-            detailedText.append(QLatin1String(" |[Loc: %1(%2)|]").arg(QString::fromUtf8(file)).arg(line));
+            detailedText.append(" |[Loc: %1(%2)|]"_L1.arg(QString::fromUtf8(file)).arg(line));
 
-        buf = QLatin1String("##teamcity[testIgnored name='%1' message='%2' flowId='%3']\n")
+        buf = "##teamcity[testIgnored name='%1' message='%2' flowId='%3']\n"_L1
                 .arg(escapedTestFuncName(), detailedText, flowID);
 
         outputString(qPrintable(buf));
     }
 
     if (!pendingMessages.isEmpty()) {
-        buf = QLatin1String("##teamcity[testStdOut name='%1' out='%2' flowId='%3']\n")
+        buf = "##teamcity[testStdOut name='%1' out='%2' flowId='%3']\n"_L1
                 .arg(tmpFuncName, pendingMessages, flowID);
 
         outputString(qPrintable(buf));
@@ -196,7 +198,7 @@ void QTeamCityLogger::addIncident(IncidentTypes type, const char *description,
         pendingMessages.clear();
     }
 
-    buf = QLatin1String("##teamcity[testFinished name='%1' flowId='%2']\n").arg(tmpFuncName, flowID);
+    buf = "##teamcity[testFinished name='%1' flowId='%2']\n"_L1.arg(tmpFuncName, flowID);
     outputString(qPrintable(buf));
 }
 
@@ -223,22 +225,22 @@ QString QTeamCityLogger::tcEscapedString(const QString &str) const
     for (QChar ch : str) {
         switch (ch.toLatin1()) {
         case '\n':
-            formattedString.append(QLatin1String("|n"));
+            formattedString.append("|n"_L1);
             break;
         case '\r':
-            formattedString.append(QLatin1String("|r"));
+            formattedString.append("|r"_L1);
             break;
         case '|':
-            formattedString.append(QLatin1String("||"));
+            formattedString.append("||"_L1);
             break;
         case '[':
-            formattedString.append(QLatin1String("|["));
+            formattedString.append("|["_L1);
             break;
         case ']':
-            formattedString.append(QLatin1String("|]"));
+            formattedString.append("|]"_L1);
             break;
         case '\'':
-            formattedString.append(QLatin1String("|'"));
+            formattedString.append("|'"_L1);
             break;
         default:
             formattedString.append(ch);
@@ -262,16 +264,16 @@ void QTeamCityLogger::addPendingMessage(const char *type, const QString &msg, co
     QString pendMessage;
 
     if (!pendingMessages.isEmpty())
-        pendMessage += QLatin1String("|n");
+        pendMessage += "|n"_L1;
 
     if (file) {
-        pendMessage += QLatin1String("%1 |[Loc: %2(%3)|]: %4")
-                                .arg(QString::fromUtf8(type), QString::fromUtf8(file))
-                                .arg(line)
-                                .arg(msg);
+        pendMessage += "%1 |[Loc: %2(%3)|]: %4"_L1
+                .arg(QString::fromUtf8(type), QString::fromUtf8(file))
+                .arg(line)
+                .arg(msg);
 
     } else {
-        pendMessage += QLatin1String("%1: %2").arg(QString::fromUtf8(type), msg);
+        pendMessage += "%1: %2"_L1.arg(QString::fromUtf8(type), msg);
     }
 
     pendingMessages.append(pendMessage);
-- 
cgit v1.2.3