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

AutoTest: Split off TestResult...

Browse Source 
...to avoid dragging around members that are not used in sub-classes.

Change-Id: I3e30b403491b1ae9219a0b461c3034cb854701a6
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Christian Stenger
2016-04-13 10:20:17 +02:00
committed by Christian Stenger
parent b58a10dfff
commit 87a6f003e9
8 changed files with 145 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/autotest/testresultspane.cpp
View File

@@ -388,9 +388,9 @@ void TestResultsPane::onItemActivated(const QModelIndex &index)
if (!index.isValid())
return;
const TestResult tr = m_filterModel->testResult(index);
if (!tr.fileName().isEmpty())
Core::EditorManager::openEditorAt(tr.fileName(), tr.line(), 0);
const TestResult *testResult = m_filterModel->testResult(index);
if (testResult && !testResult->fileName().isEmpty())
Core::EditorManager::openEditorAt(testResult->fileName(), testResult->line(), 0);
}
void TestResultsPane::onRunAllTriggered()
@@ -554,8 +554,9 @@ void TestResultsPane::onCustomContextMenuRequested(const QPoint &pos)
void TestResultsPane::onCopyItemTriggered(const QModelIndex &idx)
{
const TestResult result = m_filterModel->testResult(idx);
QApplication::clipboard()->setText(TestResultDelegate::outputString(result, true));
const TestResult *result = m_filterModel->testResult(idx);
QTC_ASSERT(result, return);
QApplication::clipboard()->setText(result->outputString(true));
}
void TestResultsPane::onCopyWholeTriggered()
@@ -584,9 +585,10 @@ QString TestResultsPane::getWholeOutput(const QModelIndex &parent)
QString output;
for (int row = 0, count = m_model->rowCount(parent); row < count; ++row) {
QModelIndex current = m_model->index(row, 0, parent);
const TestResult result = m_model->testResult(current);
output.append(TestResult::resultToString(result.result())).append(QLatin1Char('\t'));
output.append(TestResultDelegate::outputString(result, true)).append(QLatin1Char('\n'));
const TestResult *result = m_model->testResult(current);
QTC_ASSERT(result, continue);
output.append(TestResult::resultToString(result->result())).append(QLatin1Char('\t'));
output.append(result->outputString(true)).append(QLatin1Char('\n'));
output.append(getWholeOutput(current));
}
return output;