feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Autotest: De-duplicate tr() outputs

Browse Source 
Change-Id: I21aa7b835d0eaf613eb7ea51498505e98e0eac0b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Andre Hartmann
2019-01-12 13:48:26 +01:00
committed by André Hartmann
parent 75ffe4c851
commit 50aebba181
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/autotest/qtest/qttestoutputreader.cpp
View File

@@ -162,6 +162,21 @@ TestResultPtr QtTestOutputReader::createDefaultResult() const
return TestResultPtr(result); return TestResultPtr(result);
} }
static QString trQtVersion(const QString &version)
{
return QtTestOutputReader::tr("Qt version: %1").arg(version);
}
static QString trQtBuild(const QString &build)
{
return QtTestOutputReader::tr("Qt build: %1").arg(build);
}
static QString trQtestVersion(const QString &test)
{
return QtTestOutputReader::tr("QTest version: %1").arg(test);
}
void QtTestOutputReader::processXMLOutput(const QByteArray &outputLine) void QtTestOutputReader::processXMLOutput(const QByteArray &outputLine)
{ {
static QStringList validEndTags = {QStringLiteral("Incident"), static QStringList validEndTags = {QStringLiteral("Incident"),
@@ -257,13 +272,13 @@ void QtTestOutputReader::processXMLOutput(const QByteArray &outputLine)
m_description.append(text); m_description.append(text);
break; break;
case QtVersion: case QtVersion:
m_description = tr("Qt version: %1").arg(text.toString()); m_description = trQtVersion(text.toString());
break; break;
case QtBuild: case QtBuild:
m_description = tr("Qt build: %1").arg(text.toString()); m_description = trQtBuild(text.toString());
break; break;
case QTestVersion: case QTestVersion:
m_description = tr("QTest version: %1").arg(text.toString()); m_description = trQtestVersion(text.toString());
break; break;
default: default:
// this must come from plain printf() calls - but this will be ignored anyhow // this must come from plain printf() calls - but this will be ignored anyhow
@@ -490,20 +505,19 @@ void QtTestOutputReader::sendFinishMessage(bool isFunction)
reportResult(testResult); reportResult(testResult);
} }
// TODO factor out tr() strings to avoid duplication (see XML processing of Characters)
void QtTestOutputReader::handleAndSendConfigMessage(const QRegExp &config) void QtTestOutputReader::handleAndSendConfigMessage(const QRegExp &config)
{ {
TestResultPtr testResult = createDefaultResult(); TestResultPtr testResult = createDefaultResult();
testResult->setResult(Result::MessageInternal); testResult->setResult(Result::MessageInternal);
testResult->setDescription(tr("Qt version: %1").arg(config.cap(3))); testResult->setDescription(trQtVersion(config.cap(3)));
reportResult(testResult); reportResult(testResult);
testResult = createDefaultResult(); testResult = createDefaultResult();
testResult->setResult(Result::MessageInternal); testResult->setResult(Result::MessageInternal);
testResult->setDescription(tr("Qt build: %1").arg(config.cap(2))); testResult->setDescription(trQtBuild(config.cap(2)));
reportResult(testResult); reportResult(testResult);
testResult = createDefaultResult(); testResult = createDefaultResult();
testResult->setResult(Result::MessageInternal); testResult->setResult(Result::MessageInternal);
testResult->setDescription(tr("QTest version: %1").arg(config.cap(1))); testResult->setDescription(trQtestVersion(config.cap(1)));
reportResult(testResult); reportResult(testResult);
} }