diff options
Diffstat (limited to 'src/testlib')
-rw-r--r-- | src/testlib/qbenchmark_p.h | 4 | ||||
-rw-r--r-- | src/testlib/qteamcitylogger.cpp | 23 | ||||
-rw-r--r-- | src/testlib/qtestcase.cpp | 2 |
3 files changed, 11 insertions, 18 deletions
diff --git a/src/testlib/qbenchmark_p.h b/src/testlib/qbenchmark_p.h index 0b16f624df..797071d7a4 100644 --- a/src/testlib/qbenchmark_p.h +++ b/src/testlib/qbenchmark_p.h @@ -91,8 +91,8 @@ struct QBenchmarkContext QString toString() const { - QString s = QString::fromLatin1("%1,%2,%3").arg(slotName).arg(tag).arg(checkpointIndex); - return s; + return QString::fromLatin1("%1,%2,%3") + .arg(slotName, tag, QString::number(checkpointIndex)); } QBenchmarkContext() : checkpointIndex(-1) {} diff --git a/src/testlib/qteamcitylogger.cpp b/src/testlib/qteamcitylogger.cpp index 1d700d8201..81c2499bcb 100644 --- a/src/testlib/qteamcitylogger.cpp +++ b/src/testlib/qteamcitylogger.cpp @@ -167,17 +167,16 @@ void QTeamCityLogger::addIncident(IncidentTypes type, const char *description, messageText += QString(QLatin1String(" |[Loc: %1(%2)|]")).arg(QString::fromUtf8(file)).arg(line); buf = QString(QLatin1String("##teamcity[testFailed name='%1' message='%2' details='%3']\n")) - .arg(tmpFuncName) - .arg(messageText) - .arg(detailedText); + .arg(tmpFuncName, + messageText, + detailedText); outputString(qPrintable(buf)); } if (!pendingMessages.isEmpty()) { buf = QString(QLatin1String("##teamcity[testStdOut name='%1' out='%2']\n")) - .arg(tmpFuncName) - .arg(pendingMessages); + .arg(tmpFuncName, pendingMessages); outputString(qPrintable(buf)); @@ -209,8 +208,7 @@ void QTeamCityLogger::addMessage(MessageTypes type, const QString &message, escapedMessage.append(QString(QLatin1String(" |[Loc: %1(%2)|]")).arg(QString::fromUtf8(file)).arg(line)); buf = QString(QLatin1String("##teamcity[testIgnored name='%1' message='%2']\n")) - .arg(escapedTestFuncName()) - .arg(escapedMessage); + .arg(escapedTestFuncName(), escapedMessage); outputString(qPrintable(buf)); } @@ -259,10 +257,7 @@ QString QTeamCityLogger::escapedTestFuncName() const : "UnknownTestFunc"; const char *tag = QTestResult::currentDataTag() ? QTestResult::currentDataTag() : ""; - QString str = QString(QLatin1String("%1(%2)")).arg(QString::fromUtf8(fn)).arg(QString::fromUtf8(tag)); - str = tcEscapedString(str); - - return str; + return tcEscapedString(QString::asprintf("%s(%s)", fn, tag)); } void QTeamCityLogger::addPendingMessage(const char *type, const QString &msg, const char *file, int line) @@ -274,16 +269,14 @@ void QTeamCityLogger::addPendingMessage(const char *type, const QString &msg, co if (file) { pendMessage += QString(QLatin1String("%1 |[Loc: %2(%3)|]: %4")) - .arg(QString::fromUtf8(type)) - .arg(QString::fromUtf8(file)) + .arg(QString::fromUtf8(type), QString::fromUtf8(file)) .arg(line) .arg(msg); } else { pendMessage += QString(QLatin1String("%1: %2")) - .arg(QString::fromUtf8(type)) - .arg(msg); + .arg(QString::fromUtf8(type), msg); } pendingMessages.append(pendMessage); diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 98faf55266..e250d36e12 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2096,7 +2096,7 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co // 5. Try current directory if (found.isEmpty()) { - QString candidate = QString::fromLatin1("%1/%2").arg(QDir::currentPath()).arg(base); + const QString candidate = QDir::currentPath() + QLatin1Char('/') + base; if (QFileInfo::exists(candidate)) found = candidate; } |