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

AutoTest: Fix handling of internal messages

Browse Source 
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 <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2019-04-04 13:31:06 +02:00
parent ab26e9b6a5
commit efbe62b389
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/autotest/gtest/gtestoutputreader.cpp
View File

@@ -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));

2
src/plugins/autotest/gtest/gtestresult.cpp
View File

@@ -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;