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

AutoTest: Remove unnecessary indirection when creating test tree items

Browse Source 
Change-Id: Id4648196011b6769a2cd51b4daee146068272f00
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2017-01-05 12:03:42 +01:00
parent 13a22f7ef3
commit 40174187cb
9 changed files with 37 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/autotest/gtest/gtestparser.cpp
View File

@@ -34,9 +34,22 @@ namespace Internal {
TestTreeItem *GTestParseResult::createTestTreeItem() const
{
if (itemType == TestTreeItem::TestCase || itemType == TestTreeItem::TestFunctionOrSet)
return GTestTreeItem::createTestItem(this);
return 0;
if (itemType != TestTreeItem::TestCase && itemType != TestTreeItem::TestFunctionOrSet)
return nullptr;
GTestTreeItem *item = new GTestTreeItem(name, fileName, itemType);
item->setProFile(proFile);
item->setLine(line);
item->setColumn(column);
if (parameterized)
item->setState(GTestTreeItem::Parameterized);
if (typed)
item->setState(GTestTreeItem::Typed);
if (disabled)
item->setState(GTestTreeItem::Disabled);
foreach (const TestParseResult *testSet, children)
item->appendChild(testSet->createTestTreeItem());
return item;
}
static bool includesGTest(const CPlusPlus::Document::Ptr &doc,