diff options
| -rw-r--r-- | src/plugins/autotest/autotestplugin.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/autotest/testtreemodel.cpp | 16 | ||||
| -rw-r--r-- | src/plugins/autotest/testtreemodel.h | 8 |
3 files changed, 16 insertions, 16 deletions
diff --git a/src/plugins/autotest/autotestplugin.cpp b/src/plugins/autotest/autotestplugin.cpp index 62381e8261b..7cd1259f25c 100644 --- a/src/plugins/autotest/autotestplugin.cpp +++ b/src/plugins/autotest/autotestplugin.cpp @@ -349,11 +349,11 @@ void AutotestPluginPrivate::onRunFileTriggered() m_testRunner.prepareToRunTests(TestRunMode::Run); } -static QList<ITestConfiguration *> testItemsToTestConfigurations(const QList<TestTreeItem *> &items, +static QList<ITestConfiguration *> testItemsToTestConfigurations(const QList<ITestTreeItem *> &items, TestRunMode mode) { QList<ITestConfiguration *> configs; - for (const TestTreeItem * item : items) { + for (const ITestTreeItem * item : items) { if (ITestConfiguration *currentConfig = item->asConfiguration(mode)) configs << currentConfig; } @@ -369,14 +369,14 @@ void AutotestPluginPrivate::onRunUnderCursorTriggered(TestRunMode mode) if (text.isEmpty()) return; // Do not trigger when no name under cursor - const QList<TestTreeItem *> testsItems = m_testTreeModel.testItemsByName(text); + const QList<ITestTreeItem *> testsItems = m_testTreeModel.testItemsByName(text); if (testsItems.isEmpty()) return; // Wrong location triggered // check whether we have been triggered on a test function definition const int line = currentEditor->currentLine(); const QString &filePath = currentEditor->textDocument()->filePath().toString(); - const QList<TestTreeItem *> filteredItems = Utils::filtered(testsItems, [&](TestTreeItem *it){ + const QList<ITestTreeItem *> filteredItems = Utils::filtered(testsItems, [&](ITestTreeItem *it){ return it->line() == line && it->filePath() == filePath; }); diff --git a/src/plugins/autotest/testtreemodel.cpp b/src/plugins/autotest/testtreemodel.cpp index e736556f437..3ee8acc6d75 100644 --- a/src/plugins/autotest/testtreemodel.cpp +++ b/src/plugins/autotest/testtreemodel.cpp @@ -213,9 +213,9 @@ QList<ITestConfiguration *> TestTreeModel::getTestsForFile(const Utils::FilePath return result; } -static QList<TestTreeItem *> testItemsByName(TestTreeItem *root, const QString &testName) +static QList<ITestTreeItem *> testItemsByName(TestTreeItem *root, const QString &testName) { - QList<TestTreeItem *> result; + QList<ITestTreeItem *> result; root->forFirstLevelChildItems([&testName, &result](TestTreeItem *node) { if (node->type() == TestTreeItem::TestSuite || node->type() == TestTreeItem::TestCase) { @@ -295,9 +295,9 @@ const QList<ITestTreeItem *> TestTreeModel::testToolRootNodes() const return result; } -QList<TestTreeItem *> TestTreeModel::testItemsByName(const QString &testName) +QList<ITestTreeItem *> TestTreeModel::testItemsByName(const QString &testName) { - QList<TestTreeItem *> result; + QList<ITestTreeItem *> result; for (TestTreeItem *frameworkRoot : frameworkRootNodes()) result << Autotest::testItemsByName(frameworkRoot, testName); @@ -784,7 +784,7 @@ int TestTreeModel::autoTestsCount() const return rootNode ? rootNode->childCount() : 0; } -bool TestTreeModel::hasUnnamedQuickTests(const TestTreeItem *rootNode) const +bool TestTreeModel::hasUnnamedQuickTests(const ITestTreeItem* rootNode) const { for (int row = 0, count = rootNode->childCount(); row < count; ++row) { if (rootNode->childAt(row)->name().isEmpty()) @@ -793,7 +793,7 @@ bool TestTreeModel::hasUnnamedQuickTests(const TestTreeItem *rootNode) const return false; } -TestTreeItem *TestTreeModel::unnamedQuickTests() const +ITestTreeItem *TestTreeModel::unnamedQuickTests() const { TestTreeItem *rootNode = quickRootNode(); if (!rootNode) @@ -812,7 +812,7 @@ int TestTreeModel::namedQuickTestsCount() const int TestTreeModel::unnamedQuickTestsCount() const { - if (TestTreeItem *unnamed = unnamedQuickTests()) + if (ITestTreeItem *unnamed = unnamedQuickTests()) return unnamed->childCount(); return 0; } @@ -878,7 +878,7 @@ TestTreeSortFilterModel::TestTreeSortFilterModel(TestTreeModel *sourceModel, QOb setSourceModel(sourceModel); } -void TestTreeSortFilterModel::setSortMode(TestTreeItem::SortMode sortMode) +void TestTreeSortFilterModel::setSortMode(ITestTreeItem::SortMode sortMode) { m_sortMode = sortMode; invalidate(); diff --git a/src/plugins/autotest/testtreemodel.h b/src/plugins/autotest/testtreemodel.h index ad5261e597e..4f844874828 100644 --- a/src/plugins/autotest/testtreemodel.h +++ b/src/plugins/autotest/testtreemodel.h @@ -66,7 +66,7 @@ public: QList<ITestConfiguration *> getSelectedTests() const; QList<ITestConfiguration *> getFailedTests() const; QList<ITestConfiguration *> getTestsForFile(const Utils::FilePath &fileName) const; - QList<TestTreeItem *> testItemsByName(const QString &testName); + QList<ITestTreeItem *> testItemsByName(const QString &testName); void synchronizeTestFrameworks(); void synchronizeTestTools(); void rebuild(const QList<Utils::Id> &frameworkIds); @@ -77,9 +77,9 @@ public: #ifdef WITH_TESTS int autoTestsCount() const; int namedQuickTestsCount() const; - bool hasUnnamedQuickTests(const TestTreeItem *rootNode) const; + bool hasUnnamedQuickTests(const ITestTreeItem *rootNode) const; int unnamedQuickTestsCount() const; - TestTreeItem *unnamedQuickTests() const; + ITestTreeItem *unnamedQuickTests() const; int dataTagsCount() const; int gtestNamesCount() const; QMultiMap<QString, int> gtestNamesAndSets() const; @@ -135,7 +135,7 @@ public: }; explicit TestTreeSortFilterModel(TestTreeModel *sourceModel, QObject *parent = nullptr); - void setSortMode(Autotest::TestTreeItem::SortMode sortMode); + void setSortMode(ITestTreeItem::SortMode sortMode); void setFilterMode(FilterMode filterMode); void toggleFilter(FilterMode filterMode); static FilterMode toFilterMode(int f); |