diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-24 17:41:37 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-12-09 20:54:26 +0100 |
commit | 7586e1980f6b539047d3a4c70e57560c04d2a7ae (patch) | |
tree | 326674a9b94ffb5bb3be4d633d95ed9c381c2d68 /src/testlib/qteamcitylogger.cpp | |
parent | 91e8d8027d6de816b80296c7ff30c942a4c629b8 (diff) |
Use QLatin1String::arg() directly
No need to wrap the QLatin1String in a QString() to get at arg now.
Change-Id: Iac90e052b88077b9c2bd3e7eca6bc31935baa4b8
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/testlib/qteamcitylogger.cpp')
-rw-r--r-- | src/testlib/qteamcitylogger.cpp | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/src/testlib/qteamcitylogger.cpp b/src/testlib/qteamcitylogger.cpp index 3647062170..c124d3ef0e 100644 --- a/src/testlib/qteamcitylogger.cpp +++ b/src/testlib/qteamcitylogger.cpp @@ -112,13 +112,13 @@ void QTeamCityLogger::startLogging() flowID = tcEscapedString(QString::fromUtf8(QTestResult::currentTestObjectName())); - QString str = QString(QLatin1String("##teamcity[testSuiteStarted name='%1' flowId='%1']\n")).arg(flowID); + QString str = QLatin1String("##teamcity[testSuiteStarted name='%1' flowId='%1']\n").arg(flowID); outputString(qPrintable(str)); } void QTeamCityLogger::stopLogging() { - QString str = QString(QLatin1String("##teamcity[testSuiteFinished name='%1' flowId='%1']\n")).arg(flowID); + QString str = QLatin1String("##teamcity[testSuiteFinished name='%1' flowId='%1']\n").arg(flowID); outputString(qPrintable(str)); QAbstractTestLogger::stopLogging(); @@ -146,7 +146,7 @@ void QTeamCityLogger::addIncident(IncidentTypes type, const char *description, QString tmpFuncName = escapedTestFuncName(); if (tmpFuncName != currTestFuncName) { - buf = QString(QLatin1String("##teamcity[testStarted name='%1' flowId='%2']\n")).arg(tmpFuncName, flowID); + buf = QLatin1String("##teamcity[testStarted name='%1' flowId='%2']\n").arg(tmpFuncName, flowID); outputString(qPrintable(buf)); } @@ -157,21 +157,17 @@ void QTeamCityLogger::addIncident(IncidentTypes type, const char *description, return; } - QString detailedText = QString::fromUtf8(description); - detailedText = tcEscapedString(detailedText); + QString detailedText = tcEscapedString(QString::fromUtf8(description)); // Test failed if (type == Fail || type == XPass) { QString messageText(QLatin1String("Failure!")); if (file) - messageText += QString(QLatin1String(" |[Loc: %1(%2)|]")).arg(QString::fromUtf8(file)).arg(line); + messageText += QLatin1String(" |[Loc: %1(%2)|]").arg(QString::fromUtf8(file)).arg(line); - buf = QString(QLatin1String("##teamcity[testFailed name='%1' message='%2' details='%3' flowId='%4']\n")) - .arg(tmpFuncName, - messageText, - detailedText, - flowID); + buf = QLatin1String("##teamcity[testFailed name='%1' message='%2' details='%3' flowId='%4']\n") + .arg(tmpFuncName, messageText, detailedText, flowID); outputString(qPrintable(buf)); } else if (type == Skip) { @@ -185,7 +181,7 @@ void QTeamCityLogger::addIncident(IncidentTypes type, const char *description, } if (!pendingMessages.isEmpty()) { - buf = QString(QLatin1String("##teamcity[testStdOut name='%1' out='%2' flowId='%3']\n")) + buf = QLatin1String("##teamcity[testStdOut name='%1' out='%2' flowId='%3']\n") .arg(tmpFuncName, pendingMessages, flowID); outputString(qPrintable(buf)); @@ -193,7 +189,7 @@ void QTeamCityLogger::addIncident(IncidentTypes type, const char *description, pendingMessages.clear(); } - buf = QString(QLatin1String("##teamcity[testFinished name='%1' flowId='%2']\n")).arg(tmpFuncName, flowID); + buf = QLatin1String("##teamcity[testFinished name='%1' flowId='%2']\n").arg(tmpFuncName, flowID); outputString(qPrintable(buf)); } @@ -262,15 +258,13 @@ void QTeamCityLogger::addPendingMessage(const char *type, const QString &msg, co pendMessage += QLatin1String("|n"); if (file) { - pendMessage += QString(QLatin1String("%1 |[Loc: %2(%3)|]: %4")) + pendMessage += QLatin1String("%1 |[Loc: %2(%3)|]: %4") .arg(QString::fromUtf8(type), QString::fromUtf8(file)) .arg(line) .arg(msg); - } - else { - pendMessage += QString(QLatin1String("%1: %2")) - .arg(QString::fromUtf8(type), msg); + } else { + pendMessage += QLatin1String("%1: %2").arg(QString::fromUtf8(type), msg); } pendingMessages.append(pendMessage); |