feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AutoTest: Unify framework and tool naming

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

Change-Id: I3116644ab03cc46c2e9d7e8aa3b8af8a5386dba4
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2022-06-09 15:02:30 +02:00
parent e3bb14d0d2
commit 146c277837
15 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/autotest/boost/boosttestframework.cpp
View File

@@ -41,8 +41,7 @@ ITestTreeItem *BoostTestFramework::createRootNode()
{
return new BoostTestTreeItem(
this,
QCoreApplication::translate("BoostTestFramework",
BoostTest::Constants::FRAMEWORK_SETTINGS_CATEGORY),
displayName(),
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;

1
src/plugins/autotest/boost/boosttestframework.h
View File

@@ -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;

7
src/plugins/autotest/catch/catchframework.cpp
View File

@@ -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);
}

1
src/plugins/autotest/catch/catchframework.h
View File

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

7
src/plugins/autotest/ctest/ctesttool.cpp
View File

@@ -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);
}

1
src/plugins/autotest/ctest/ctesttool.h
View File

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

9
src/plugins/autotest/gtest/gtestframework.cpp
View File

@@ -48,8 +48,7 @@ ITestTreeItem *GTestFramework::createRootNode()
{
return new GTestTreeItem(
this,
QCoreApplication::translate("GTestFramework",
GTest::Constants::FRAMEWORK_SETTINGS_CATEGORY),
displayName(),
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;

1
src/plugins/autotest/gtest/gtestframework.h
View File

@@ -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; }

1
src/plugins/autotest/itestframework.h
View File

@@ -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; }

2
src/plugins/autotest/projectsettingswidget.cpp
View File

@@ -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());

9
src/plugins/autotest/qtest/qttestframework.cpp
View File

@@ -40,8 +40,7 @@ ITestTreeItem *QtTestFramework::createRootNode()
{
return new QtTestTreeItem(
this,
QCoreApplication::translate("QtTestFramework",
QtTest::Constants::FRAMEWORK_SETTINGS_CATEGORY),
displayName(),
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;

1
src/plugins/autotest/qtest/qttestframework.h
View File

@@ -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;

7
src/plugins/autotest/quick/quicktestframework.cpp
View File

@@ -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;

1
src/plugins/autotest/quick/quicktestframework.h
View File

@@ -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;

4
src/plugins/autotest/testsettingspage.cpp
View File

@@ -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());