AutoTest: Unify framework and tool naming

Use the same name for the test framework or tool across
Qt Creator.

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

src/plugins/autotest/boost/boosttestframework.cpp

@@ -41,8 +41,7 @@ ITestTreeItem *BoostTestFramework::createRootNode()
 {
     return new BoostTestTreeItem(
                 this,
-                QCoreApplication::translate("BoostTestFramework",
+                displayName(),
-                                            BoostTest::Constants::FRAMEWORK_SETTINGS_CATEGORY),
                 Utils::FilePath(), ITestTreeItem::Root);
 }
 
@@ -51,6 +50,12 @@ const char *BoostTestFramework::name() const
     return BoostTest::Constants::FRAMEWORK_NAME;
 }
 
+QString BoostTestFramework::displayName() const
+{
+    return QCoreApplication::translate("BoostTestFramework",
+                                       BoostTest::Constants::FRAMEWORK_SETTINGS_CATEGORY);
+}
+
 unsigned BoostTestFramework::priority() const
 {
     return BoostTest::Constants::FRAMEWORK_PRIORITY;

src/plugins/autotest/boost/boosttestframework.h

@@ -39,6 +39,7 @@ public:
 
 private:
     const char *name() const override;
+    QString displayName() const override;
     unsigned priority() const override;
     ITestSettings *testSettings() override { return &m_settings; }
     ITestParser *createTestParser() override;

src/plugins/autotest/catch/catchframework.cpp

@@ -35,6 +35,11 @@ const char *CatchFramework::name() const
     return "Catch";
 }
 
+QString CatchFramework::displayName() const
+{
+    return QCoreApplication::translate("CatchFramework", "Catch Test");
+}
+
 unsigned CatchFramework::priority() const
 {
     return 12;
@@ -48,7 +53,7 @@ ITestParser *CatchFramework::createTestParser()
 ITestTreeItem *CatchFramework::createRootNode()
 {
     return new CatchTreeItem(this,
-                             QCoreApplication::translate("CatchFramework", "Catch Test"),
+                             displayName(),
                              Utils::FilePath(), ITestTreeItem::Root);
 }
 

src/plugins/autotest/catch/catchframework.h

@@ -37,6 +37,7 @@ public:
     CatchFramework() : ITestFramework(true) {}
 
     const char *name() const override;
+    QString displayName() const override;
     unsigned priority() const override;
 
 protected:

src/plugins/autotest/ctest/ctesttool.cpp

@@ -50,10 +50,15 @@ const char *CTestTool::name() const
     return "CTest";
 }
 
+QString CTestTool::displayName() const
+{
+    return QCoreApplication::translate("CTestTool", "CTest");
+}
+
 ITestTreeItem *CTestTool::createRootNode()
 {
     return new CTestTreeItem(this,
-                             QCoreApplication::translate("CTestTool", "CTest"),
+                             displayName(),
                              Utils::FilePath(), ITestTreeItem::Root);
 }
 

src/plugins/autotest/ctest/ctesttool.h

@@ -42,6 +42,7 @@ public:
 
 protected:
     const char *name() const final;
+    QString displayName() const final;
     ITestTreeItem *createRootNode() final;
 
 private:

src/plugins/autotest/gtest/gtestframework.cpp

@@ -48,8 +48,7 @@ ITestTreeItem *GTestFramework::createRootNode()
 {
     return new GTestTreeItem(
                 this,
-                QCoreApplication::translate("GTestFramework",
+                displayName(),
-                                            GTest::Constants::FRAMEWORK_SETTINGS_CATEGORY),
                 Utils::FilePath(), ITestTreeItem::Root);
 }
 
@@ -58,6 +57,12 @@ const char *GTestFramework::name() const
     return GTest::Constants::FRAMEWORK_NAME;
 }
 
+QString GTestFramework:: displayName() const
+{
+    return QCoreApplication::translate("GTestFramework",
+                                       GTest::Constants::FRAMEWORK_SETTINGS_CATEGORY);
+}
+
 unsigned GTestFramework::priority() const
 {
     return GTest::Constants::FRAMEWORK_PRIORITY;

src/plugins/autotest/gtest/gtestframework.h

@@ -42,6 +42,7 @@ public:
 
 private:
     const char *name() const override;
+    QString displayName() const override;
     unsigned priority() const override;
     QString groupingToolTip() const override;
     ITestSettings *testSettings() override { return &m_settings; }

src/plugins/autotest/itestframework.h

@@ -53,6 +53,7 @@ public:
     virtual ~ITestBase() = default;
 
     virtual const char *name() const = 0;
+    virtual QString displayName() const = 0;
     virtual unsigned priority() const = 0;          // should this be modifyable?
     TestBaseType type() const { return m_type; }
 

src/plugins/autotest/projectsettingswidget.cpp

@@ -127,7 +127,7 @@ void ProjectTestSettingsWidget::populateFrameworks(const QHash<ITestFramework *,
     Utils::sort(sortedFrameworks, &ITestFramework::priority);
 
     auto generateItem = [this](ITestBase *frameworkOrTestTool, bool checked) {
-        auto item = new QTreeWidgetItem(m_activeFrameworks, {QLatin1String(frameworkOrTestTool->name())});
+        auto item = new QTreeWidgetItem(m_activeFrameworks, {frameworkOrTestTool->displayName()});
         item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable);
         item->setCheckState(0, checked ? Qt::Checked : Qt::Unchecked);
         item->setData(0, BaseIdRole, frameworkOrTestTool->id().toSetting());

src/plugins/autotest/qtest/qttestframework.cpp

@@ -40,8 +40,7 @@ ITestTreeItem *QtTestFramework::createRootNode()
 {
     return new QtTestTreeItem(
                 this,
-                QCoreApplication::translate("QtTestFramework",
+                displayName(),
-                                            QtTest::Constants::FRAMEWORK_SETTINGS_CATEGORY),
                 Utils::FilePath(), ITestTreeItem::Root);
 }
 
@@ -50,6 +49,12 @@ const char *QtTestFramework::name() const
     return QtTest::Constants::FRAMEWORK_NAME;
 }
 
+QString QtTestFramework::displayName() const
+{
+    return QCoreApplication::translate("QtTestFramework",
+                                       QtTest::Constants::FRAMEWORK_SETTINGS_CATEGORY);
+}
+
 unsigned QtTestFramework::priority() const
 {
     return QtTest::Constants::FRAMEWORK_PRIORITY;

src/plugins/autotest/qtest/qttestframework.h

@@ -39,6 +39,7 @@ public:
 
 private:
     const char *name() const override;
+    QString displayName() const override;
     unsigned priority() const override;
     ITestParser *createTestParser() override;
     ITestTreeItem *createRootNode() override;

src/plugins/autotest/quick/quicktestframework.cpp

@@ -41,7 +41,7 @@ ITestParser *QuickTestFramework::createTestParser()
 
 ITestTreeItem *QuickTestFramework::createRootNode()
 {
-    return new QuickTestTreeItem(this, QCoreApplication::translate("QuickTestFramework", "Quick Test"),
+    return new QuickTestTreeItem(this, displayName(),
                                  Utils::FilePath(), ITestTreeItem::Root);
 }
 
@@ -50,6 +50,11 @@ const char *QuickTestFramework::name() const
     return QuickTest::Constants::FRAMEWORK_NAME;
 }
 
+QString QuickTestFramework::displayName() const
+{
+    return QCoreApplication::translate("QuickTestFramework", "Quick Test");
+}
+
 unsigned QuickTestFramework::priority() const
 {
     return 5;

src/plugins/autotest/quick/quicktestframework.h

@@ -43,6 +43,7 @@ class QuickTestFramework : public ITestFramework
 public:
     QuickTestFramework() : ITestFramework(true) {}
     const char *name() const override;
+    QString displayName() const override;
     unsigned priority() const override;
     ITestSettings *testSettings() override;
 

src/plugins/autotest/testsettingspage.cpp

@@ -115,7 +115,7 @@ void TestSettingsWidget::populateFrameworksListWidget(const QHash<Utils::Id, boo
     m_ui.frameworkTreeWidget->clear();
     for (const ITestFramework *framework : registered) {
         const Utils::Id id = framework->id();
-        auto item = new QTreeWidgetItem(m_ui.frameworkTreeWidget, QStringList(QLatin1String(framework->name())));
+        auto item = new QTreeWidgetItem(m_ui.frameworkTreeWidget, {framework->displayName()});
         item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable);
         item->setCheckState(0, frameworks.value(id) ? Qt::Checked : Qt::Unchecked);
         item->setData(0, BaseId, id.toSetting());
@@ -132,7 +132,7 @@ void TestSettingsWidget::populateFrameworksListWidget(const QHash<Utils::Id, boo
     const TestTools &registeredTools = TestFrameworkManager::registeredTestTools();
     for (const ITestTool *testTool : registeredTools) {
         const Utils::Id id = testTool->id();
-        auto item = new QTreeWidgetItem(m_ui.frameworkTreeWidget, {QLatin1String(testTool->name())});
+        auto item = new QTreeWidgetItem(m_ui.frameworkTreeWidget, {testTool->displayName()});
         item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable);
         item->setCheckState(0, testTools.value(id) ? Qt::Checked : Qt::Unchecked);
         item->setData(0, BaseId, id.toSetting());