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

TestSettings: Use functor to apply changed settings

Browse Source 
Baby-steps towards use of aspects.

Change-Id: I08a0db083c29e754cf58a631dc3a5c36f400ee96
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-05-08 17:36:03 +02:00
parent e44d0c57dc
commit c2265077f6
1 changed files with 39 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,10 +37,6 @@ class TestSettingsWidget : public Core::IOptionsPageWidget
public:
explicit TestSettingsWidget(TestSettings *settings);
void apply() final;
TestSettings settings() const;
private:
void populateFrameworksListWidget(const QHash<Id, bool> &frameworks,
const QHash<Id, bool> &testTools);
@@ -218,27 +214,46 @@ TestSettingsWidget::TestSettingsWidget(TestSettings *settings)
m_openResultsOnFailCB->setChecked(settings->popupOnFail);
m_runAfterBuildCB->setCurrentIndex(int(settings->runAfterBuild));
populateFrameworksListWidget(settings->frameworks, settings->tools);
}
TestSettings TestSettingsWidget::settings() const
{
TestSettings result;
result.timeout = m_timeoutSpin->value() * 1000; // we display seconds
result.omitInternalMssg = m_omitInternalMsgCB->isChecked();
result.omitRunConfigWarn = m_omitRunConfigWarnCB->isChecked();
result.limitResultOutput = m_limitResultOutputCB->isChecked();
result.limitResultDescription = m_limitResultDescriptionCb->isChecked();
result.resultDescriptionMaxSize = m_limitResultDescriptionSpinBox->value();
result.autoScroll = m_autoScrollCB->isChecked();
result.processArgs = m_processArgsCB->isChecked();
result.displayApplication = m_displayAppCB->isChecked();
result.popupOnStart = m_openResultsOnStartCB->isChecked();
result.popupOnFinish = m_openResultsOnFinishCB->isChecked();
result.popupOnFail = m_openResultsOnFailCB->isChecked();
result.runAfterBuild = RunAfterBuildMode(m_runAfterBuildCB->currentIndex());
testSettings(result);
testToolsSettings(result);
return result;
setOnApply([this] {
TestSettings result;
result.timeout = m_timeoutSpin->value() * 1000; // we display seconds
result.omitInternalMssg = m_omitInternalMsgCB->isChecked();
result.omitRunConfigWarn = m_omitRunConfigWarnCB->isChecked();
result.limitResultOutput = m_limitResultOutputCB->isChecked();
result.limitResultDescription = m_limitResultDescriptionCb->isChecked();
result.resultDescriptionMaxSize = m_limitResultDescriptionSpinBox->value();
result.autoScroll = m_autoScrollCB->isChecked();
result.processArgs = m_processArgsCB->isChecked();
result.displayApplication = m_displayAppCB->isChecked();
result.popupOnStart = m_openResultsOnStartCB->isChecked();
result.popupOnFinish = m_openResultsOnFinishCB->isChecked();
result.popupOnFail = m_openResultsOnFailCB->isChecked();
result.runAfterBuild = RunAfterBuildMode(m_runAfterBuildCB->currentIndex());
testSettings(result);
testToolsSettings(result);
const QList<Utils::Id> changedIds = Utils::filtered(result.frameworksGrouping.keys(),
[result, this](Utils::Id id) {
return result.frameworksGrouping[id] != m_settings->frameworksGrouping[id];
});
*m_settings = result;
m_settings->toSettings(Core::ICore::settings());
for (ITestFramework *framework : TestFrameworkManager::registeredFrameworks()) {
framework->setActive(m_settings->frameworks.value(framework->id(), false));
framework->setGrouping(m_settings->frameworksGrouping.value(framework->id(), false));
}
for (ITestTool *testTool : TestFrameworkManager::registeredTestTools())
testTool->setActive(m_settings->tools.value(testTool->id(), false));
TestTreeModel::instance()->synchronizeTestFrameworks();
TestTreeModel::instance()->synchronizeTestTools();
if (!changedIds.isEmpty())
TestTreeModel::instance()->rebuild(changedIds);
});
}
enum TestBaseInfo
@@ -339,30 +354,6 @@ void TestSettingsWidget::onFrameworkItemChanged()
|| (mixed == (ITestBase::Framework | ITestBase::Tool)));
}
void TestSettingsWidget::apply()
{
const TestSettings newSettings = settings();
const QList<Id> changedIds = Utils::filtered(newSettings.frameworksGrouping.keys(),
[newSettings, this](const Id &id) {
return newSettings.frameworksGrouping[id] != m_settings->frameworksGrouping[id];
});
*m_settings = newSettings;
m_settings->toSettings(Core::ICore::settings());
for (ITestFramework *framework : TestFrameworkManager::registeredFrameworks()) {
framework->setActive(m_settings->frameworks.value(framework->id(), false));
framework->setGrouping(m_settings->frameworksGrouping.value(framework->id(), false));
}
for (ITestTool *testTool : TestFrameworkManager::registeredTestTools())
testTool->setActive(m_settings->tools.value(testTool->id(), false));
TestTreeModel::instance()->synchronizeTestFrameworks();
TestTreeModel::instance()->synchronizeTestTools();
if (!changedIds.isEmpty())
TestTreeModel::instance()->rebuild(changedIds);
}
// TestSettingsPage
TestSettingsPage::TestSettingsPage(TestSettings *settings)