From e51443ce62d35c6af43818234ba86ce79d1713e6 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 11 Jul 2016 15:13:52 +0200 Subject: [PATCH] AutoTest: Add handling for system messages QTest uses special type for critical and for special internal messages. Change-Id: I980b2ccd2913012be24183ea503247331eeb97e1 Reviewed-by: Nikolai Kosjar --- src/plugins/autotest/testresult.cpp | 5 +++++ src/plugins/autotest/testresult.h | 1 + src/plugins/autotest/testresultmodel.cpp | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/autotest/testresult.cpp b/src/plugins/autotest/testresult.cpp index df89706c8db..aeea2644bd0 100644 --- a/src/plugins/autotest/testresult.cpp +++ b/src/plugins/autotest/testresult.cpp @@ -71,6 +71,8 @@ Result::Type TestResult::resultFromString(const QString &resultString) return Result::MessageWarn; if (resultString == QLatin1String("qfatal")) return Result::MessageFatal; + if (resultString == QLatin1String("system")) + return Result::MessageSystem; if (resultString == QLatin1String("bpass")) return Result::BlacklistedPass; if (resultString == QLatin1String("bfail")) @@ -113,6 +115,8 @@ QString TestResult::resultToString(const Result::Type type) return QLatin1String("WARN"); case Result::MessageFatal: return QLatin1String("FATAL"); + case Result::MessageSystem: + return QLatin1String("SYSTEM"); case Result::BlacklistedPass: return QLatin1String("BPASS"); case Result::BlacklistedFail: @@ -145,6 +149,7 @@ QColor TestResult::colorForType(const Result::Type type) case Result::MessageWarn: return creatorTheme->color(Utils::Theme::OutputPanes_TestWarnTextColor); case Result::MessageFatal: + case Result::MessageSystem: return creatorTheme->color(Utils::Theme::OutputPanes_TestFatalTextColor); case Result::BlacklistedPass: case Result::BlacklistedFail: diff --git a/src/plugins/autotest/testresult.h b/src/plugins/autotest/testresult.h index 86c7f8e3c65..4256aaedf8a 100644 --- a/src/plugins/autotest/testresult.h +++ b/src/plugins/autotest/testresult.h @@ -49,6 +49,7 @@ enum Type { MessageInfo, MessageWarn, MessageFatal, + MessageSystem, MessageInternal, INTERNAL_MESSAGES_BEGIN = MessageInternal, MessageDisabledTests, diff --git a/src/plugins/autotest/testresultmodel.cpp b/src/plugins/autotest/testresultmodel.cpp index 05d53a69563..907951ed24d 100644 --- a/src/plugins/autotest/testresultmodel.cpp +++ b/src/plugins/autotest/testresultmodel.cpp @@ -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/warn.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?? if (result < 0 || result >= Result::MessageInternal) { @@ -299,7 +300,7 @@ void TestResultFilterModel::enableAllResultTypes() << Result::MessageCurrentTest << Result::MessageTestCaseStart << Result::MessageTestCaseSuccess << Result::MessageTestCaseWarn << Result::MessageTestCaseFail << Result::MessageTestCaseEnd - << Result::MessageTestCaseRepetition << Result::MessageInfo; + << Result::MessageTestCaseRepetition << Result::MessageInfo << Result::MessageSystem; invalidateFilter(); }