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

AutoTest: Some code cosmetics

Browse Source 
Change-Id: I568194134bbd84f517f27a31a440f1061f91e971
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2024-06-28 16:54:57 +02:00
parent 9671c426e4
commit af4da1277d
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/autotest/autotestplugin.cpp
View File

@@ -72,6 +72,7 @@
#endif #endif
using namespace Core; using namespace Core;
using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
namespace Autotest::Internal { namespace Autotest::Internal {
@@ -104,7 +105,7 @@ public:
}; };
static AutotestPluginPrivate *dd = nullptr; static AutotestPluginPrivate *dd = nullptr;
static QHash<ProjectExplorer::Project *, TestProjectSettings *> s_projectSettings; static QHash<Project *, TestProjectSettings *> s_projectSettings;
AutotestPluginPrivate::AutotestPluginPrivate() AutotestPluginPrivate::AutotestPluginPrivate()
{ {
@@ -126,12 +127,11 @@ AutotestPluginPrivate::AutotestPluginPrivate()
m_testTreeModel.synchronizeTestFrameworks(); m_testTreeModel.synchronizeTestFrameworks();
m_testTreeModel.synchronizeTestTools(); m_testTreeModel.synchronizeTestTools();
auto sessionManager = ProjectExplorer::ProjectManager::instance(); auto projectManager = ProjectManager::instance();
connect(sessionManager, &ProjectExplorer::ProjectManager::startupProjectChanged, connect(projectManager, &ProjectManager::startupProjectChanged,
this, [this] { m_runconfigCache.clear(); }); this, [this] { m_runconfigCache.clear(); });
connect(sessionManager, &ProjectExplorer::ProjectManager::aboutToRemoveProject, connect(projectManager, &ProjectManager::aboutToRemoveProject, this, [](Project *project) {
this, [](ProjectExplorer::Project *project) {
const auto it = s_projectSettings.constFind(project); const auto it = s_projectSettings.constFind(project);
if (it != s_projectSettings.constEnd()) { if (it != s_projectSettings.constEnd()) {
delete it.value(); delete it.value();
@@ -150,7 +150,7 @@ AutotestPluginPrivate::~AutotestPluginPrivate()
delete m_resultsPane; delete m_resultsPane;
} }
TestProjectSettings *projectSettings(ProjectExplorer::Project *project) TestProjectSettings *projectSettings(Project *project)
{ {
auto &settings = s_projectSettings[project]; auto &settings = s_projectSettings[project];
if (!settings) if (!settings)
@@ -241,7 +241,6 @@ void AutotestPluginPrivate::initializeMenuEntries()
dd->m_testCodeParser.updateTestTree(); dd->m_testCodeParser.updateTestTree();
}); });
using namespace ProjectExplorer;
connect(BuildManager::instance(), &BuildManager::buildStateChanged, connect(BuildManager::instance(), &BuildManager::buildStateChanged,
this, &updateMenuItemsEnabledState); this, &updateMenuItemsEnabledState);
connect(BuildManager::instance(), &BuildManager::buildQueueFinished, connect(BuildManager::instance(), &BuildManager::buildQueueFinished,
@@ -400,7 +399,7 @@ void AutotestPluginPrivate::onDisableTemporarily(bool disable)
TestFrameworks activeTestFrameworks() TestFrameworks activeTestFrameworks()
{ {
ProjectExplorer::Project *project = ProjectExplorer::ProjectManager::startupProject(); Project *project = ProjectManager::startupProject();
TestFrameworks sorted; TestFrameworks sorted;
if (!project || projectSettings(project)->useGlobalSettings()) { if (!project || projectSettings(project)->useGlobalSettings()) {
sorted = Utils::filtered(TestFrameworkManager::registeredFrameworks(), sorted = Utils::filtered(TestFrameworkManager::registeredFrameworks(),
@@ -418,8 +417,8 @@ TestFrameworks activeTestFrameworks()
void updateMenuItemsEnabledState() void updateMenuItemsEnabledState()
{ {
const ProjectExplorer::Project *project = ProjectExplorer::ProjectManager::startupProject(); const Project *project = ProjectManager::startupProject();
const ProjectExplorer::Target *target = project ? project->activeTarget() : nullptr; const Target *target = project ? project->activeTarget() : nullptr;
const bool disabled = dd->m_testCodeParser.state() == TestCodeParser::DisabledTemporarily; const bool disabled = dd->m_testCodeParser.state() == TestCodeParser::DisabledTemporarily;
const bool canScan = disabled || (!dd->m_testRunner.isTestRunning() const bool canScan = disabled || (!dd->m_testRunner.isTestRunning()
&& dd->m_testCodeParser.state() == TestCodeParser::Idle); && dd->m_testCodeParser.state() == TestCodeParser::Idle);
@@ -428,7 +427,7 @@ void updateMenuItemsEnabledState()
const bool canRun = !disabled && hasTests && canScan const bool canRun = !disabled && hasTests && canScan
&& project && !project->needsConfiguration() && project && !project->needsConfiguration()
&& target && target->activeRunConfiguration() && target && target->activeRunConfiguration()
&& !ProjectExplorer::BuildManager::isBuilding(); && !BuildManager::isBuilding();
const bool canRunFailed = canRun && dd->m_testTreeModel.hasFailedTests(); const bool canRunFailed = canRun && dd->m_testTreeModel.hasFailedTests();
ActionManager::command(Constants::ACTION_RUN_ALL_ID)->action()->setEnabled(canRun); ActionManager::command(Constants::ACTION_RUN_ALL_ID)->action()->setEnabled(canRun);
@@ -487,7 +486,7 @@ QString wildcardPatternFromString(const QString &original)
return pattern; return pattern;
} }
bool ChoicePair::matches(const ProjectExplorer::RunConfiguration *rc) const bool ChoicePair::matches(const RunConfiguration *rc) const
{ {
return rc && rc->displayName() == displayName && rc->runnable().command.executable() == executable; return rc && rc->displayName() == displayName && rc->runnable().command.executable() == executable;
} }