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

AutoTest: Improve type safety in TestTreeItem

Browse Source 
Ensures that the static_cast<>() in framework() always succeeds.

Change-Id: I6aff0cf12a565bd6f9791c67979698729d7143e5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Bernhard Beschow
2021-01-29 19:32:39 +01:00
parent ed6083b521
commit 0e0c2ca91c
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/autotest/boost/boosttesttreeitem.h
View File

@@ -48,11 +48,11 @@ public:
Q_FLAGS(TestState) Q_FLAGS(TestState)
Q_DECLARE_FLAGS(TestStates, TestState) Q_DECLARE_FLAGS(TestStates, TestState)
explicit BoostTestTreeItem(ITestBase *base, explicit BoostTestTreeItem(ITestFramework *framework,
const QString &name = QString(), const QString &name = QString(),
const QString &filePath = QString(), const QString &filePath = QString(),
Type type = Root) Type type = Root)
: TestTreeItem(base, name, filePath, type) : TestTreeItem(framework, name, filePath, type)
{} {}
public: public:

4
src/plugins/autotest/catch/catchtreeitem.h
View File

@@ -41,9 +41,9 @@ public:
Q_FLAGS(TestState) Q_FLAGS(TestState)
Q_DECLARE_FLAGS(TestStates, TestState) Q_DECLARE_FLAGS(TestStates, TestState)
explicit CatchTreeItem(ITestBase *testBase, const QString &name = QString(), explicit CatchTreeItem(ITestFramework *testFramework, const QString &name = QString(),
const QString &filePath = QString(), Type type = Root) const QString &filePath = QString(), Type type = Root)
: TestTreeItem(testBase, name, filePath, type) {} : TestTreeItem(testFramework, name, filePath, type) {}
void setStates(CatchTreeItem::TestStates state) { m_state = state; } void setStates(CatchTreeItem::TestStates state) { m_state = state; }
CatchTreeItem::TestStates states() const { return m_state; } CatchTreeItem::TestStates states() const { return m_state; }

4
src/plugins/autotest/gtest/gtesttreeitem.h
View File

@@ -46,11 +46,11 @@ public:
Q_FLAGS(TestState) Q_FLAGS(TestState)
Q_DECLARE_FLAGS(TestStates, TestState) Q_DECLARE_FLAGS(TestStates, TestState)
explicit GTestTreeItem(ITestBase *testBase, explicit GTestTreeItem(ITestFramework *testFramework,
const QString &name = QString(), const QString &name = QString(),
const QString &filePath = QString(), const QString &filePath = QString(),
Type type = Root) Type type = Root)
: TestTreeItem(testBase, name, filePath, type), m_state(Enabled) : TestTreeItem(testFramework, name, filePath, type), m_state(Enabled)
{} {}
TestTreeItem *copyWithoutChildren() override; TestTreeItem *copyWithoutChildren() override;

4
src/plugins/autotest/qtest/qttesttreeitem.cpp
View File

@@ -34,9 +34,9 @@
namespace Autotest { namespace Autotest {
namespace Internal { namespace Internal {
QtTestTreeItem::QtTestTreeItem(ITestBase *testBase, const QString &name, QtTestTreeItem::QtTestTreeItem(ITestFramework *testFramework, const QString &name,
const QString &filePath, TestTreeItem::Type type) const QString &filePath, TestTreeItem::Type type)
: TestTreeItem(testBase, name, filePath, type) : TestTreeItem(testFramework, name, filePath, type)
{ {
if (type == TestDataTag) if (type == TestDataTag)
setData(0, Qt::Checked, Qt::CheckStateRole); setData(0, Qt::Checked, Qt::CheckStateRole);

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

@@ -33,7 +33,7 @@ namespace Internal {
class QtTestTreeItem : public TestTreeItem class QtTestTreeItem : public TestTreeItem
{ {
public: public:
explicit QtTestTreeItem(ITestBase *framework, const QString &name = QString(), explicit QtTestTreeItem(ITestFramework *framework, const QString &name = QString(),
const QString &filePath = QString(), Type type = Root); const QString &filePath = QString(), Type type = Root);
TestTreeItem *copyWithoutChildren() override; TestTreeItem *copyWithoutChildren() override;

4
src/plugins/autotest/quick/quicktesttreeitem.h
View File

@@ -33,11 +33,11 @@ namespace Internal {
class QuickTestTreeItem : public TestTreeItem class QuickTestTreeItem : public TestTreeItem
{ {
public: public:
explicit QuickTestTreeItem(ITestBase *testBase, explicit QuickTestTreeItem(ITestFramework *testFramework,
const QString &name = QString(), const QString &name = QString(),
const QString &filePath = QString(), const QString &filePath = QString(),
Type type = Root) Type type = Root)
: TestTreeItem(testBase, name, filePath, type) : TestTreeItem(testFramework, name, filePath, type)
{} {}
TestTreeItem *copyWithoutChildren() override; TestTreeItem *copyWithoutChildren() override;

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

@@ -164,9 +164,9 @@ ITestConfiguration *ITestTreeItem::asConfiguration(TestRunMode mode) const
/****************************** TestTreeItem ********************************************/ /****************************** TestTreeItem ********************************************/
TestTreeItem::TestTreeItem(ITestBase *testBase, const QString &name, TestTreeItem::TestTreeItem(ITestFramework *testFramework, const QString &name,
const QString &filePath, Type type) const QString &filePath, Type type)
: ITestTreeItem(testBase, name, filePath, type) : ITestTreeItem(testFramework, name, filePath, type)
{ {
switch (type) { switch (type) {
case Root: case Root:

2
src/plugins/autotest/testtreeitem.h
View File

@@ -120,7 +120,7 @@ private:
class TestTreeItem : public ITestTreeItem class TestTreeItem : public ITestTreeItem
{ {
public: public:
explicit TestTreeItem(ITestBase *testBase, explicit TestTreeItem(ITestFramework *testFramework,
const QString &name = QString(), const QString &name = QString(),
const QString &filePath = QString(), const QString &filePath = QString(),
Type type = Root); Type type = Root);