AutoTest: Limit search for test tree items to respective root

If searching for a test tree item matching a QtTestResult
we can safely limit searching to the subtree holding
QtTests or QuickTests.
Additionally store information whether it is a Quick or
pure Qt test into the result to limit it to a single root.

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

3 files changed, 16 insertions, 5 deletions

diff --git a/src/plugins/autotest/quick/quicktestconfiguration.cpp b/src/plugins/autotest/quick/quicktestconfiguration.cpp
index 6875207bf76..43bfe560b6c 100644
--- a/src/plugins/autotest/quick/quicktestconfiguration.cpp
+++ b/src/plugins/autotest/quick/quicktestconfiguration.cpp
@@ -49,10 +49,13 @@ TestOutputReader *QuickTestConfiguration::outputReader(const QFutureInterface<Te
     auto qtSettings = qSharedPointerCast<QtTestSettings>(manager->settingsForTestFramework(id));
     if (qtSettings.isNull())
         return nullptr;
-    if (qtSettings->useXMLOutput)
-        return new QtTestOutputReader(fi, app, buildDirectory(), projectFile(), QtTestOutputReader::XML);
-    else
-        return new QtTestOutputReader(fi, app, buildDirectory(), projectFile(), QtTestOutputReader::PlainText);
+    if (qtSettings->useXMLOutput) {
+        return new QtTestOutputReader(fi, app, buildDirectory(), projectFile(),
+                                      QtTestOutputReader::XML, TestType::QuickTest);
+    } else {
+        return new QtTestOutputReader(fi, app, buildDirectory(), projectFile(),
+                                      QtTestOutputReader::PlainText, TestType::QuickTest);
+    }
 }
 
 QStringList QuickTestConfiguration::argumentsForTestRunner(QStringList *omitted) const
diff --git a/src/plugins/autotest/quick/quicktestframework.cpp b/src/plugins/autotest/quick/quicktestframework.cpp
index ef5423bb6f8..81642ae6fd1 100644
--- a/src/plugins/autotest/quick/quicktestframework.cpp
+++ b/src/plugins/autotest/quick/quicktestframework.cpp
@@ -43,7 +43,7 @@ TestTreeItem *QuickTestFramework::createRootNode() const
 
 const char *QuickTestFramework::name() const
 {
-    return "QtQuickTest";
+    return QuickTest::Constants::FRAMEWORK_NAME;
 }
 
 unsigned QuickTestFramework::priority() const
diff --git a/src/plugins/autotest/quick/quicktestframework.h b/src/plugins/autotest/quick/quicktestframework.h
index 5ee66141e47..80befb53d10 100644
--- a/src/plugins/autotest/quick/quicktestframework.h
+++ b/src/plugins/autotest/quick/quicktestframework.h
@@ -28,6 +28,14 @@
 #include "../itestframework.h"
 
 namespace Autotest {
+namespace QuickTest {
+namespace Constants {
+
+const char FRAMEWORK_NAME[]              = "QtQuickTest";
+
+} // namespace Constants
+} // namespace QuickTest
+
 namespace Internal {
 
 class QuickTestFramework : public ITestFramework