diff options
Diffstat (limited to 'src/testlib/qteamcitylogger.cpp')
-rw-r--r-- | src/testlib/qteamcitylogger.cpp | 23 |
1 files changed, 8 insertions, 15 deletions
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); |