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

Avoid crash when using wrongly created test tree

Browse Source 
Change-Id: I686f0cf285daeb3889161109964efd6e9ac47a40
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Christian Stenger
2015-01-30 12:19:01 +01:00
parent 3629aa9044
commit 834c52f483
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/autotest/testtreemodel.cpp
View File

@@ -420,7 +420,7 @@ QList<TestConfiguration *> TestTreeModel::getAllTestCases() const
QList<TestConfiguration *> TestTreeModel::getSelectedTests() const QList<TestConfiguration *> TestTreeModel::getSelectedTests() const
{ {
QList<TestConfiguration *> result; QList<TestConfiguration *> result;
TestConfiguration *tc; TestConfiguration *testConfiguration = 0;
for (int row = 0, count = m_autoTestRootItem->childCount(); row < count; ++row) { for (int row = 0, count = m_autoTestRootItem->childCount(); row < count; ++row) {
TestTreeItem *child = m_autoTestRootItem->child(row); TestTreeItem *child = m_autoTestRootItem->child(row);
@@ -429,9 +429,9 @@ QList<TestConfiguration *> TestTreeModel::getSelectedTests() const
case Qt::Unchecked: case Qt::Unchecked:
continue; continue;
case Qt::Checked: case Qt::Checked:
tc = new TestConfiguration(child->name(), QStringList(), child->childCount()); testConfiguration = new TestConfiguration(child->name(), QStringList(), child->childCount());
addProjectInformation(tc, child->filePath()); addProjectInformation(testConfiguration, child->filePath());
result << tc; result << testConfiguration;
continue; continue;
case Qt::PartiallyChecked: case Qt::PartiallyChecked:
default: default:
@@ -444,9 +444,9 @@ QList<TestConfiguration *> TestTreeModel::getSelectedTests() const
testCases << grandChild->name(); testCases << grandChild->name();
} }
tc = new TestConfiguration(childName, testCases); testConfiguration = new TestConfiguration(childName, testCases);
addProjectInformation(tc, child->filePath()); addProjectInformation(testConfiguration, child->filePath());
result << tc; result << testConfiguration;
} }
} }
// Quick Tests must be handled differently - need the calling cpp file to use this in // Quick Tests must be handled differently - need the calling cpp file to use this in
@@ -461,7 +461,10 @@ QList<TestConfiguration *> TestTreeModel::getSelectedTests() const
const TestTreeItem *grandChild = unnamed->child(childRow); const TestTreeItem *grandChild = unnamed->child(childRow);
const QString mainFile = grandChild->mainFile(); const QString mainFile = grandChild->mainFile();
if (foundMains.contains(mainFile)) { if (foundMains.contains(mainFile)) {
foundMains[mainFile]->setTestCaseCount(tc->testCaseCount() + 1); QTC_ASSERT(testConfiguration,
qWarning() << "Illegal state (unnamed Quick Test listed as named)";
return QList<TestConfiguration *>());
foundMains[mainFile]->setTestCaseCount(testConfiguration->testCaseCount());
} else { } else {
TestConfiguration *tc = new TestConfiguration(QString(), QStringList()); TestConfiguration *tc = new TestConfiguration(QString(), QStringList());
tc->setTestCaseCount(1); tc->setTestCaseCount(1);