AutoTest: Extract decision of adding filtered items

The old approach was working due to the fact that all
test frameworks followed a fixed type scheme and tried
to handle differences between the AutoTest plugin and
the "real" world of the test framework internally.
Generalizing this decision does no more make sense when
adding an optional test suite layer.

Change-Id: I4788150a8935d8e35e557df8475aa95c8ca545b4
Reviewed-by: David Schulz <david.schulz@qt.io>

src/plugins/autotest/gtest/gtesttreeitem.cpp

@@ -540,5 +540,10 @@ TestTreeItem *GTestTreeItem::applyFilters()
     return filtered;
 }
 
+bool GTestTreeItem::shouldBeAddedAfterFiltering() const
+{
+    return type() == TestTreeItem::TestFunctionOrSet || childCount();
+}
+
 } // namespace Internal
 } // namespace Autotest

src/plugins/autotest/gtest/gtesttreeitem.h

@@ -74,6 +74,7 @@ public:
     bool isGroupNodeFor(const TestTreeItem *other) const override;
     bool isGroupable() const override;
     TestTreeItem *applyFilters() override;
+    bool shouldBeAddedAfterFiltering() const override;
 private:
     bool modifyTestSetContent(const GTestParseResult *result);
     QList<TestConfiguration *> getTestConfigurations(bool ignoreCheckState) const;

src/plugins/autotest/testtreeitem.h

@@ -126,6 +126,8 @@ public:
     // based on (internal) filters this will be used to filter out sub items (and remove them)
     // returns a copy of the item that contains the filtered out children or nullptr
     virtual TestTreeItem *applyFilters() { return nullptr; }
+    // decide whether an item should still be added to the treemodel
+    virtual bool shouldBeAddedAfterFiltering() const { return true; }
     virtual QSet<QString> internalTargets() const;
 protected:
     void copyBasicDataFrom(const TestTreeItem *other);

src/plugins/autotest/testtreemodel.cpp

@@ -215,7 +215,7 @@ void TestTreeModel::syncTestFrameworks()
 void TestTreeModel::filterAndInsert(TestTreeItem *item, TestTreeItem *root, bool groupingEnabled)
 {
     TestTreeItem *filtered = item->applyFilters();
-    if (item->type() != TestTreeItem::TestCase || item->childCount())
+    if (item->shouldBeAddedAfterFiltering())
         insertItemInParent(item, root, groupingEnabled);
     else // might be that all children have been filtered out
         delete item;