From 7684571e108f5d7a803944a1cd78f17b61a29c35 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Tue, 10 Jan 2023 09:36:43 +0100
Subject: [PATCH] AutoTest: Fix handling of data tags with spaces

Change-Id: Ie725d8bf67b6a143f52c84b902b69a077a55a2bc
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/autotest/qtest/qttesttreeitem.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/plugins/autotest/qtest/qttesttreeitem.cpp b/src/plugins/autotest/qtest/qttesttreeitem.cpp
index 222680d4cf1..dcada43181f 100644
--- a/src/plugins/autotest/qtest/qttesttreeitem.cpp
+++ b/src/plugins/autotest/qtest/qttesttreeitem.cpp
@@ -15,6 +15,13 @@
 namespace Autotest {
 namespace Internal {
 
+static QString functionWithDataTagAsArg(const QString &func, const QString &dataTag)
+{
+    if (dataTag.contains(' '))
+        return '"' + func + ':' + dataTag + '"';
+    return func + ':' + dataTag;
+}
+
 QtTestTreeItem::QtTestTreeItem(ITestFramework *testFramework, const QString &name,
                                const Utils::FilePath &filePath, TestTreeItem::Type type)
     : TestTreeItem(testFramework, name, filePath, type)
@@ -140,9 +147,8 @@ ITestConfiguration *QtTestTreeItem::testConfiguration() const
         const TestTreeItem *parent = function ? function->parentItem() : nullptr;
         if (!parent)
             return nullptr;
-        const QString functionWithTag = function->name() + ':' + name();
         config = new QtTestConfiguration(framework());
-        config->setTestCases(QStringList(functionWithTag));
+        config->setTestCases(QStringList(functionWithDataTagAsArg(function->name(), name())));
         config->setProjectFile(parent->proFile());
         config->setProject(project);
         break;
@@ -185,7 +191,7 @@ static void fillTestConfigurationsFromCheckState(const TestTreeItem *item,
                 const QString funcName = grandChild->name();
                 grandChild->forFirstLevelChildren([&testCases, &funcName](ITestTreeItem *dataTag) {
                     if (dataTag->checked() == Qt::Checked)
-                        testCases << funcName + ':' + dataTag->name();
+                        testCases << functionWithDataTagAsArg(funcName, dataTag->name());
                 });
             }
         });
@@ -217,7 +223,7 @@ static void collectFailedTestInfo(TestTreeItem *item, QList<ITestConfiguration *
         } else {
             func->forFirstLevelChildren([&testCases, func](ITestTreeItem *dataTag) {
                 if (dataTag->data(0, FailedRole).toBool())
-                    testCases << func->name() + ':' + dataTag->name();
+                    testCases << functionWithDataTagAsArg(func->name(), dataTag->name());
             });
         }
     });