From efbe62b389e1185f778c08d53c496bc552ff048e Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 4 Apr 2019 13:31:06 +0200 Subject: [PATCH] AutoTest: Fix handling of internal messages When order results by applications is enabled some internal messages might end up in a wrong (or at least useless) position inside the results pane. For non-pure-global results we need to pass the id / application to avoid this. Change-Id: I4221326f9729547a1ee49eeb0ee4f82807444ae7 Reviewed-by: David Schulz --- src/plugins/autotest/gtest/gtestoutputreader.cpp | 4 ++-- src/plugins/autotest/gtest/gtestresult.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/autotest/gtest/gtestoutputreader.cpp b/src/plugins/autotest/gtest/gtestoutputreader.cpp index f1efb479a4d..d66ab7700be 100644 --- a/src/plugins/autotest/gtest/gtestoutputreader.cpp +++ b/src/plugins/autotest/gtest/gtestoutputreader.cpp @@ -87,13 +87,13 @@ void GTestOutputReader::processOutputLine(const QByteArray &outputLineWithNewLin m_description = line; if (m_iteration > 1) m_description.append(' ' + tr("(iteration %1)").arg(m_iteration)); - TestResultPtr testResult = TestResultPtr(new GTestResult(m_projectFile)); + TestResultPtr testResult = TestResultPtr(new GTestResult(id(), m_projectFile, QString())); testResult->setResult(Result::MessageInternal); testResult->setDescription(m_description); reportResult(testResult); m_description.clear(); } else if (disabledTests.exactMatch(line)) { - TestResultPtr testResult = TestResultPtr(new GTestResult(m_projectFile)); + TestResultPtr testResult = TestResultPtr(new GTestResult(id(), m_projectFile, QString())); testResult->setResult(Result::MessageDisabledTests); int disabled = disabledTests.cap(1).toInt(); testResult->setDescription(tr("You have %n disabled test(s).", nullptr, disabled)); diff --git a/src/plugins/autotest/gtest/gtestresult.cpp b/src/plugins/autotest/gtest/gtestresult.cpp index 06ef721951a..51eb81a4556 100644 --- a/src/plugins/autotest/gtest/gtestresult.cpp +++ b/src/plugins/autotest/gtest/gtestresult.cpp @@ -72,7 +72,7 @@ bool GTestResult::isDirectParentOf(const TestResult *other, bool *needsIntermedi if (m_testSetName == gtOther->m_testSetName) { const Result::Type otherResult = other->result(); if (otherResult == Result::MessageInternal || otherResult == Result::MessageLocation) - return result() != Result::MessageLocation; + return result() != Result::MessageInternal && result() != Result::MessageLocation; } if (m_iteration != gtOther->m_iteration) return false;