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

AutoTest: Small refactoring of addTestResult()

Browse Source 
Just some simplifications and restructuring.

Change-Id: I2a2a66808f1721e7ce9dc47e20194d544c093092
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2016-10-31 10:32:34 +01:00
parent 77b8198c2b
commit 5b6e9671d7
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,17 +135,9 @@ TestResultModel::TestResultModel(QObject *parent)
void TestResultModel::addTestResult(const TestResultPtr &testResult, bool autoExpand) void TestResultModel::addTestResult(const TestResultPtr &testResult, bool autoExpand)
{ {
const bool isCurrentTestMssg = testResult->result() == Result::MessageCurrentTest; const QVector<Utils::TreeItem *> &topLevelItems = rootItem()->children();
const int lastRow = topLevelItems.size() - 1;
QVector<Utils::TreeItem *> topLevelItems = rootItem()->children(); if (testResult->result() == Result::MessageCurrentTest) {
int lastRow = topLevelItems.size() - 1;
// we'll add the new item, so raising it's counter
if (!isCurrentTestMssg) {
int count = m_testResultCount.value(testResult->result(), 0);
if (testResult->result() == Result::MessageDisabledTests)
m_disabled += testResult->line();
m_testResultCount.insert(testResult->result(), ++count);
} else {
// MessageCurrentTest should always be the last top level item // MessageCurrentTest should always be the last top level item
if (lastRow >= 0) { if (lastRow >= 0) {
TestResultItem *current = static_cast<TestResultItem *>(topLevelItems.at(lastRow)); TestResultItem *current = static_cast<TestResultItem *>(topLevelItems.at(lastRow));
@@ -161,6 +153,10 @@ void TestResultModel::addTestResult(const TestResultPtr &testResult, bool autoEx
return; return;
} }
if (testResult->result() == Result::MessageDisabledTests)
m_disabled += testResult->line();
m_testResultCount[testResult->result()]++;
TestResultItem *newItem = new TestResultItem(testResult); TestResultItem *newItem = new TestResultItem(testResult);
// FIXME this might be totally wrong... we need some more unique information! // FIXME this might be totally wrong... we need some more unique information!
if (!testResult->name().isEmpty()) { if (!testResult->name().isEmpty()) {
@@ -188,7 +184,7 @@ void TestResultModel::addTestResult(const TestResultPtr &testResult, bool autoEx
return; return;
} }
} }
// there is no MessageCurrentTest at the last row, but we have a toplevel item - just add it
rootItem()->appendChild(newItem); rootItem()->appendChild(newItem);
} }