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

Test: Avoid some Id::withSuffix calls

Browse Source 
Saves cycles and is arguably clearer.

Change-Id: Ib53207704806d4b6ea184633a15ab98fb2eeb89a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-07-28 18:11:19 +02:00
parent 0690b65abc
commit f53e18ee73
15 changed files with 28 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotest/boost/boosttestconstants.h
View File

@@ -9,7 +9,7 @@ namespace Autotest {
namespace BoostTest { namespace BoostTest {
namespace Constants { namespace Constants {
const char FRAMEWORK_NAME[] = "Boost"; const char FRAMEWORK_ID[] = "AutoTest.Framework.Boost";
const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("QtC::Autotest", "Boost Test"); const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("QtC::Autotest", "Boost Test");
const unsigned FRAMEWORK_PRIORITY = 11; const unsigned FRAMEWORK_PRIORITY = 11;
const char BOOST_MASTER_SUITE[] = "Master Test Suite"; const char BOOST_MASTER_SUITE[] = "Master Test Suite";

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

@@ -28,7 +28,7 @@ BoostTestFramework::BoostTestFramework()
{ {
setActive(true); setActive(true);
setSettingsGroups("Autotest", "BoostTest"); setSettingsGroups("Autotest", "BoostTest");
setName(BoostTest::Constants::FRAMEWORK_NAME); setId(BoostTest::Constants::FRAMEWORK_ID);
setDisplayName(Tr::tr(BoostTest::Constants::FRAMEWORK_SETTINGS_CATEGORY)); setDisplayName(Tr::tr(BoostTest::Constants::FRAMEWORK_SETTINGS_CATEGORY));
setPriority(BoostTest::Constants::FRAMEWORK_PRIORITY); setPriority(BoostTest::Constants::FRAMEWORK_PRIORITY);
@@ -144,9 +144,8 @@ class BoostSettingsPage final : public Core::IOptionsPage
public: public:
BoostSettingsPage() BoostSettingsPage()
{ {
setId(Id(Constants::SETTINGSPAGE_PREFIX).withSuffix(QString("%1.%2") setId(Id(Constants::SETTINGSPAGE_PREFIX).withSuffix(QString("%1.Boost")
.arg(BoostTest::Constants::FRAMEWORK_PRIORITY) .arg(BoostTest::Constants::FRAMEWORK_PRIORITY)));
.arg(BoostTest::Constants::FRAMEWORK_NAME)));
setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY); setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);
setDisplayName(Tr::tr(BoostTest::Constants::FRAMEWORK_SETTINGS_CATEGORY)); setDisplayName(Tr::tr(BoostTest::Constants::FRAMEWORK_SETTINGS_CATEGORY));
setSettingsProvider([] { return &theBoostTestFramework() ; }); setSettingsProvider([] { return &theBoostTestFramework() ; });

4
src/plugins/autotest/boost/boosttestresult.cpp
View File

@@ -73,8 +73,8 @@ static ResultHooks::FindTestItemHook findTestItemHook(const FilePath &projectFil
const QString &testSuiteName) const QString &testSuiteName)
{ {
return [=](const TestResult &result) -> ITestTreeItem * { return [=](const TestResult &result) -> ITestTreeItem * {
const Id id = Id(Constants::FRAMEWORK_PREFIX).withSuffix(BoostTest::Constants::FRAMEWORK_NAME); ITestFramework *framework =
ITestFramework *framework = TestFrameworkManager::frameworkForId(id); TestFrameworkManager::frameworkForId(BoostTest::Constants::FRAMEWORK_ID);
QTC_ASSERT(framework, return nullptr); QTC_ASSERT(framework, return nullptr);
const TestTreeItem *rootNode = framework->rootNode(); const TestTreeItem *rootNode = framework->rootNode();
if (!rootNode) if (!rootNode)

2
src/plugins/autotest/catch/catchtestframework.cpp
View File

@@ -29,7 +29,7 @@ CatchFramework::CatchFramework()
setActive(true); setActive(true);
setSettingsGroups("Autotest", "Catch2"); setSettingsGroups("Autotest", "Catch2");
setPriority(12); setPriority(12);
setName("Catch"); setId("AutoTest.Framework.Catch");
setDisplayName(Tr::tr("Catch Test")); setDisplayName(Tr::tr("Catch Test"));
setLayouter([this] { setLayouter([this] {

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

@@ -31,7 +31,7 @@ CTestTool::CTestTool()
setActive(false); setActive(false);
setSettingsGroups("Autotest", "CTest"); setSettingsGroups("Autotest", "CTest");
setAutoApply(false); setAutoApply(false);
setName("CTest"); setId("AutoTest.Framework.CTest");
setDisplayName(Tr::tr("CTest")); setDisplayName(Tr::tr("CTest"));
setLayouter([this] { setLayouter([this] {
@@ -171,7 +171,7 @@ class CTestToolSettingsPage final : public Core::IOptionsPage
public: public:
CTestToolSettingsPage() CTestToolSettingsPage()
{ {
setId(Id(Constants::SETTINGSPAGE_PREFIX).withSuffix(QString("255.CTest"))); setId(Id(Constants::SETTINGSPAGE_PREFIX).withSuffix("255.CTest"));
setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY); setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);
setDisplayName(Tr::tr("CTest")); setDisplayName(Tr::tr("CTest"));
setSettingsProvider([] { return &theCTestTool(); }); setSettingsProvider([] { return &theCTestTool(); });

2
src/plugins/autotest/gtest/gtestconstants.h
View File

@@ -9,7 +9,7 @@ namespace Autotest {
namespace GTest { namespace GTest {
namespace Constants { namespace Constants {
const char FRAMEWORK_NAME[] = "GTest"; const char FRAMEWORK_ID[] = "Autotest.Framework.GTest";
const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("QtC::Autotest", "Google Test"); const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("QtC::Autotest", "Google Test");
const unsigned FRAMEWORK_PRIORITY = 10; const unsigned FRAMEWORK_PRIORITY = 10;
const char DEFAULT_FILTER[] = "*.*"; const char DEFAULT_FILTER[] = "*.*";

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

@@ -32,7 +32,7 @@ GTestFramework::GTestFramework()
{ {
setActive(true); setActive(true);
setSettingsGroups("Autotest", "GTest"); setSettingsGroups("Autotest", "GTest");
setName(GTest::Constants::FRAMEWORK_NAME); setId(GTest::Constants::FRAMEWORK_ID);
setDisplayName(Tr::tr(GTest::Constants::FRAMEWORK_SETTINGS_CATEGORY)); setDisplayName(Tr::tr(GTest::Constants::FRAMEWORK_SETTINGS_CATEGORY));
setPriority(GTest::Constants::FRAMEWORK_PRIORITY); setPriority(GTest::Constants::FRAMEWORK_PRIORITY);
@@ -130,8 +130,7 @@ GTestFramework::GTestFramework()
== GTest::Constants::GTestFilter); == GTest::Constants::GTestFilter);
}); });
connect(this, &AspectContainer::applied, this, [] { connect(this, &AspectContainer::applied, this, [] {
Id id = Id(Constants::FRAMEWORK_PREFIX).withSuffix(GTest::Constants::FRAMEWORK_NAME); TestTreeModel::instance()->rebuild({GTest::Constants::FRAMEWORK_ID});
TestTreeModel::instance()->rebuild({id});
}); });
} }
@@ -178,9 +177,8 @@ class GTestSettingsPage final : public Core::IOptionsPage
public: public:
GTestSettingsPage() GTestSettingsPage()
{ {
setId(Id(Constants::SETTINGSPAGE_PREFIX).withSuffix(QString("%1.%2") setId(Id(Constants::SETTINGSPAGE_PREFIX).withSuffix(QString("%1.GTest")
.arg(GTest::Constants::FRAMEWORK_PRIORITY) .arg(GTest::Constants::FRAMEWORK_PRIORITY)));
.arg(GTest::Constants::FRAMEWORK_NAME)));
setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY); setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);
setDisplayName(Tr::tr(GTest::Constants::FRAMEWORK_SETTINGS_CATEGORY)); setDisplayName(Tr::tr(GTest::Constants::FRAMEWORK_SETTINGS_CATEGORY));
setSettingsProvider([] { return &theGTestFramework(); }); setSettingsProvider([] { return &theGTestFramework(); });

3
src/plugins/autotest/gtest/gtestresult.cpp
View File

@@ -84,8 +84,7 @@ static ResultHooks::FindTestItemHook findTestItemHook(const FilePath &projectFil
const QString &testCaseName) const QString &testCaseName)
{ {
return [=](const TestResult &result) -> ITestTreeItem * { return [=](const TestResult &result) -> ITestTreeItem * {
const Id id = Id(Constants::FRAMEWORK_PREFIX).withSuffix(GTest::Constants::FRAMEWORK_NAME); ITestFramework *framework = TestFrameworkManager::frameworkForId(GTest::Constants::FRAMEWORK_ID);
ITestFramework *framework = TestFrameworkManager::frameworkForId(id);
QTC_ASSERT(framework, return nullptr); QTC_ASSERT(framework, return nullptr);
const TestTreeItem *rootNode = framework->rootNode(); const TestTreeItem *rootNode = framework->rootNode();
if (!rootNode) if (!rootNode)

5
src/plugins/autotest/itestframework.cpp
View File

@@ -15,11 +15,6 @@ namespace Autotest {
ITestBase::ITestBase() ITestBase::ITestBase()
{} {}
Id ITestBase::id() const
{
return Id(Constants::FRAMEWORK_PREFIX).withSuffix(name());
}
void ITestBase::resetRootNode() void ITestBase::resetRootNode()
{ {
if (!m_rootNode) if (!m_rootNode)

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

@@ -30,10 +30,9 @@ public:
ITestBase(); ITestBase();
virtual ~ITestBase() = default; virtual ~ITestBase() = default;
const char *name() const { return m_name; }
QString displayName() const { return m_displayName; } QString displayName() const { return m_displayName; }
TestBaseType type() const { return m_type; } TestBaseType type() const { return m_type; }
Utils::Id id() const; Utils::Id id() const { return m_id; }
int priority() const { return m_priority; } int priority() const { return m_priority; }
bool active() const { return m_active; } bool active() const { return m_active; }
@@ -48,7 +47,7 @@ protected:
void setPriority(int priority) { m_priority = priority; } void setPriority(int priority) { m_priority = priority; }
void setDisplayName(const QString &displayName) { m_displayName = displayName; } void setDisplayName(const QString &displayName) { m_displayName = displayName; }
void setType(const TestBaseType type) { m_type = type; } void setType(const TestBaseType type) { m_type = type; }
void setName(const char *name) { m_name = name; } void setId(const Utils::Id id) { m_id = id; }
virtual ITestTreeItem *createRootNode() = 0; virtual ITestTreeItem *createRootNode() = 0;
@@ -58,7 +57,7 @@ private:
TestBaseType m_type = None; TestBaseType m_type = None;
int m_priority = 0; int m_priority = 0;
QString m_displayName; QString m_displayName;
const char *m_name = nullptr; Utils::Id m_id;
friend class ITestFramework; friend class ITestFramework;
friend class ITestTool; friend class ITestTool;

2
src/plugins/autotest/qtest/qttestconstants.h
View File

@@ -9,7 +9,7 @@ namespace Autotest {
namespace QtTest { namespace QtTest {
namespace Constants { namespace Constants {
const char FRAMEWORK_NAME[] = "QtTest"; const char FRAMEWORK_ID[] = "AutoTest.Framework.QtTest";
const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("QtC::Autotest", "Qt Test"); const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("QtC::Autotest", "Qt Test");
const unsigned FRAMEWORK_PRIORITY = 1; const unsigned FRAMEWORK_PRIORITY = 1;

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

@@ -28,7 +28,7 @@ QtTestFramework &theQtTestFramework()
QtTestFramework::QtTestFramework() QtTestFramework::QtTestFramework()
{ {
setActive(true); setActive(true);
setName(QtTest::Constants::FRAMEWORK_NAME); setId(QtTest::Constants::FRAMEWORK_ID);
setDisplayName(Tr::tr(QtTest::Constants::FRAMEWORK_SETTINGS_CATEGORY)); setDisplayName(Tr::tr(QtTest::Constants::FRAMEWORK_SETTINGS_CATEGORY));
setPriority(QtTest::Constants::FRAMEWORK_PRIORITY); setPriority(QtTest::Constants::FRAMEWORK_PRIORITY);
setSettingsGroups("Autotest", "QtTest"); setSettingsGroups("Autotest", "QtTest");
@@ -144,9 +144,8 @@ class QtTestSettingPage final : public Core::IOptionsPage
public: public:
QtTestSettingPage() QtTestSettingPage()
{ {
setId(Id(Constants::SETTINGSPAGE_PREFIX).withSuffix(QString("%1.%2") setId(Id(Constants::SETTINGSPAGE_PREFIX).withSuffix(QString("%1.QtTest")
.arg(QtTest::Constants::FRAMEWORK_PRIORITY) .arg(QtTest::Constants::FRAMEWORK_PRIORITY)));
.arg(QtTest::Constants::FRAMEWORK_NAME)));
setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY); setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);
setDisplayName(Tr::tr(QtTest::Constants::FRAMEWORK_SETTINGS_CATEGORY)); setDisplayName(Tr::tr(QtTest::Constants::FRAMEWORK_SETTINGS_CATEGORY));
setSettingsProvider([] { return &theQtTestFramework(); }); setSettingsProvider([] { return &theQtTestFramework(); });

8
src/plugins/autotest/qtest/qttestresult.cpp
View File

@@ -130,8 +130,8 @@ static ResultHooks::FindTestItemHook findTestItemHook(const FilePath &projectFil
{ {
return [=](const TestResult &result) -> ITestTreeItem * { return [=](const TestResult &result) -> ITestTreeItem * {
const Id id = type == TestType::QtTest const Id id = type == TestType::QtTest
? Id(Constants::FRAMEWORK_PREFIX).withSuffix(QtTest::Constants::FRAMEWORK_NAME) ? Id(QtTest::Constants::FRAMEWORK_ID)
: Id(Constants::FRAMEWORK_PREFIX).withSuffix(QuickTest::Constants::FRAMEWORK_NAME); : Id(QuickTest::Constants::FRAMEWORK_ID);
ITestFramework *framework = TestFrameworkManager::frameworkForId(id); ITestFramework *framework = TestFrameworkManager::frameworkForId(id);
QTC_ASSERT(framework, return nullptr); QTC_ASSERT(framework, return nullptr);
const TestTreeItem *rootNode = framework->rootNode(); const TestTreeItem *rootNode = framework->rootNode();
@@ -151,8 +151,8 @@ struct QtTestData
TestType m_type; TestType m_type;
QString m_function; QString m_function;
QString m_dataTag; QString m_dataTag;
bool isTestFunction() const { return !m_function.isEmpty() && m_dataTag.isEmpty(); }; bool isTestFunction() const { return !m_function.isEmpty() && m_dataTag.isEmpty(); }
bool isDataTag() const { return !m_function.isEmpty() && !m_dataTag.isEmpty(); }; bool isDataTag() const { return !m_function.isEmpty() && !m_dataTag.isEmpty(); }
}; };
static ResultHooks::DirectParentHook directParentHook(const QString &functionName, static ResultHooks::DirectParentHook directParentHook(const QString &functionName,

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

@@ -18,7 +18,7 @@ QuickTestFramework &theQuickTestFramework()
QuickTestFramework::QuickTestFramework() QuickTestFramework::QuickTestFramework()
{ {
setName(QuickTest::Constants::FRAMEWORK_NAME); setId(QuickTest::Constants::FRAMEWORK_ID);
setDisplayName(Tr::tr("Quick Test")); setDisplayName(Tr::tr("Quick Test"));
setPriority(5); setPriority(5);
} }

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

@@ -11,7 +11,7 @@ namespace Autotest {
namespace QuickTest { namespace QuickTest {
namespace Constants { namespace Constants {
const char FRAMEWORK_NAME[] = "QtQuickTest"; const char FRAMEWORK_ID[] = "Autotest.Framework.QtQuickTest";
} // namespace Constants } // namespace Constants
} // namespace QuickTest } // namespace QuickTest