AutoTest: Modernize code a bit

Change-Id: Ie56f6e5cb8a4f1962bd8df5e57214911ae609921
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2016-09-29 12:15:43 +02:00
parent 8b579fca6a
commit b0bf07c64a
44 changed files with 207 additions and 235 deletions

View File

@@ -48,34 +48,34 @@ TestResult::TestResult(const QString &name)
const QString TestResult::outputString(bool selected) const
{
return selected ? m_description : m_description.split(QLatin1Char('\n')).first();
return selected ? m_description : m_description.split('\n').first();
}
Result::Type TestResult::resultFromString(const QString &resultString)
{
if (resultString == QLatin1String("pass"))
if (resultString == "pass")
return Result::Pass;
if (resultString == QLatin1String("fail"))
if (resultString == "fail")
return Result::Fail;
if (resultString == QLatin1String("xfail"))
if (resultString == "xfail")
return Result::ExpectedFail;
if (resultString == QLatin1String("xpass"))
if (resultString == "xpass")
return Result::UnexpectedPass;
if (resultString == QLatin1String("skip"))
if (resultString == "skip")
return Result::Skip;
if (resultString == QLatin1String("qdebug"))
if (resultString == "qdebug")
return Result::MessageDebug;
if (resultString == QLatin1String("qinfo"))
if (resultString == "qinfo")
return Result::MessageInfo;
if (resultString == QLatin1String("warn") || resultString == QLatin1String("qwarn"))
if (resultString == "warn" || resultString == "qwarn")
return Result::MessageWarn;
if (resultString == QLatin1String("qfatal"))
if (resultString == "qfatal")
return Result::MessageFatal;
if (resultString == QLatin1String("system"))
if (resultString == "system")
return Result::MessageSystem;
if (resultString == QLatin1String("bpass"))
if (resultString == "bpass")
return Result::BlacklistedPass;
if (resultString == QLatin1String("bfail"))
if (resultString == "bfail")
return Result::BlacklistedFail;
qDebug("Unexpected test result: %s", qPrintable(resultString));
return Result::Invalid;