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

AutoTest: Add handling for system messages

Browse Source 
QTest uses special type for critical and for special internal messages.

Change-Id: I980b2ccd2913012be24183ea503247331eeb97e1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Christian Stenger
2016-07-11 15:13:52 +02:00
parent 48b2af5e77
commit e51443ce62
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/autotest/testresult.cpp
View File

@@ -71,6 +71,8 @@ Result::Type TestResult::resultFromString(const QString &resultString)
return Result::MessageWarn; return Result::MessageWarn;
if (resultString == QLatin1String("qfatal")) if (resultString == QLatin1String("qfatal"))
return Result::MessageFatal; return Result::MessageFatal;
if (resultString == QLatin1String("system"))
return Result::MessageSystem;
if (resultString == QLatin1String("bpass")) if (resultString == QLatin1String("bpass"))
return Result::BlacklistedPass; return Result::BlacklistedPass;
if (resultString == QLatin1String("bfail")) if (resultString == QLatin1String("bfail"))
@@ -113,6 +115,8 @@ QString TestResult::resultToString(const Result::Type type)
return QLatin1String("WARN"); return QLatin1String("WARN");
case Result::MessageFatal: case Result::MessageFatal:
return QLatin1String("FATAL"); return QLatin1String("FATAL");
case Result::MessageSystem:
return QLatin1String("SYSTEM");
case Result::BlacklistedPass: case Result::BlacklistedPass:
return QLatin1String("BPASS"); return QLatin1String("BPASS");
case Result::BlacklistedFail: case Result::BlacklistedFail:
@@ -145,6 +149,7 @@ QColor TestResult::colorForType(const Result::Type type)
case Result::MessageWarn: case Result::MessageWarn:
return creatorTheme->color(Utils::Theme::OutputPanes_TestWarnTextColor); return creatorTheme->color(Utils::Theme::OutputPanes_TestWarnTextColor);
case Result::MessageFatal: case Result::MessageFatal:
case Result::MessageSystem:
return creatorTheme->color(Utils::Theme::OutputPanes_TestFatalTextColor); return creatorTheme->color(Utils::Theme::OutputPanes_TestFatalTextColor);
case Result::BlacklistedPass: case Result::BlacklistedPass:
case Result::BlacklistedFail: case Result::BlacklistedFail:

1
src/plugins/autotest/testresult.h
View File

@@ -49,6 +49,7 @@ enum Type {
MessageInfo, MessageInfo,
MessageWarn, MessageWarn,
MessageFatal, MessageFatal,
MessageSystem,
MessageInternal, INTERNAL_MESSAGES_BEGIN = MessageInternal, MessageInternal, INTERNAL_MESSAGES_BEGIN = MessageInternal,
MessageDisabledTests, MessageDisabledTests,

3
src/plugins/autotest/testresultmodel.cpp
View File

@@ -59,6 +59,7 @@ static QIcon testResultIcon(Result::Type result) {
QIcon(QLatin1String(":/images/debug.png")), // Info get's the same handling as Debug for now QIcon(QLatin1String(":/images/debug.png")), // Info get's the same handling as Debug for now
QIcon(QLatin1String(":/images/warn.png")), QIcon(QLatin1String(":/images/warn.png")),
QIcon(QLatin1String(":/images/fatal.png")), QIcon(QLatin1String(":/images/fatal.png")),
QIcon(QLatin1String(":/images/fatal.png")), // System get's same handling as Fatal for now
}; // provide an icon for unknown?? }; // provide an icon for unknown??
if (result < 0 || result >= Result::MessageInternal) { if (result < 0 || result >= Result::MessageInternal) {
@@ -299,7 +300,7 @@ void TestResultFilterModel::enableAllResultTypes()
<< Result::MessageCurrentTest << Result::MessageTestCaseStart << Result::MessageCurrentTest << Result::MessageTestCaseStart
<< Result::MessageTestCaseSuccess << Result::MessageTestCaseWarn << Result::MessageTestCaseSuccess << Result::MessageTestCaseWarn
<< Result::MessageTestCaseFail << Result::MessageTestCaseEnd << Result::MessageTestCaseFail << Result::MessageTestCaseEnd
<< Result::MessageTestCaseRepetition << Result::MessageInfo; << Result::MessageTestCaseRepetition << Result::MessageInfo << Result::MessageSystem;
invalidateFilter(); invalidateFilter();
} }