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

AutoTest: Move framework settings into framework manager

Browse Source 
Change-Id: I9914291adb102de5136802eb3b6d12afb6276538
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2016-10-05 12:39:23 +02:00
parent a6032652ef
commit 18dc7a5de9
25 changed files with 308 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/plugins/autotest/testsettings.cpp
View File

@@ -24,6 +24,8 @@
****************************************************************************/
#include "testsettings.h"
#include "autotestconstants.h"
#include "iframeworksettings.h"
#include "testframeworkmanager.h"
#include <coreplugin/id.h>
@@ -33,7 +35,6 @@
namespace Autotest {
namespace Internal {
static const char group[] = "Autotest";
static const char timeoutKey[] = "Timeout";
static const char omitInternalKey[] = "OmitInternal";
static const char omitRunConfigWarnKey[] = "OmitRCWarnings";
@@ -50,7 +51,7 @@ TestSettings::TestSettings()
void TestSettings::toSettings(QSettings *s) const
{
s->beginGroup(group);
s->beginGroup(Constants::SETTINGSGROUP);
s->setValue(timeoutKey, timeout);
s->setValue(omitInternalKey, omitInternalMssg);
s->setValue(omitRunConfigWarnKey, omitRunConfigWarn);
@@ -60,20 +61,19 @@ void TestSettings::toSettings(QSettings *s) const
// store frameworks and their current active state
for (const Core::Id &id : frameworks.keys())
s->setValue(QLatin1String(id.name()), frameworks.value(id));
s->beginGroup(qtTestSettings.name());
qtTestSettings.toSettings(s);
s->endGroup();
s->beginGroup(gTestSettings.name());
gTestSettings.toSettings(s);
s->endGroup();
s->endGroup();
TestFrameworkManager *frameworkManager = TestFrameworkManager::instance();
const QList<Core::Id> &registered = frameworkManager->registeredFrameworkIds();
for (const Core::Id &id : registered) {
QSharedPointer<IFrameworkSettings> fSettings = frameworkManager->settingsForTestFramework(id);
if (!fSettings.isNull())
fSettings->toSettings(s);
}
}
void TestSettings::fromSettings(QSettings *s)
{
s->beginGroup(group);
s->beginGroup(Constants::SETTINGSGROUP);
timeout = s->value(timeoutKey, defaultTimeout).toInt();
omitInternalMssg = s->value(omitInternalKey, true).toBool();
omitRunConfigWarn = s->value(omitRunConfigWarnKey, false).toBool();
@@ -88,15 +88,12 @@ void TestSettings::fromSettings(QSettings *s)
frameworks.insert(id, s->value(QLatin1String(id.name()),
frameworkManager->isActive(id)).toBool());
}
s->beginGroup(qtTestSettings.name());
qtTestSettings.fromSettings(s);
s->endGroup();
s->beginGroup(gTestSettings.name());
gTestSettings.fromSettings(s);
s->endGroup();
s->endGroup();
for (const Core::Id &id : registered) {
QSharedPointer<IFrameworkSettings> fSettings = frameworkManager->settingsForTestFramework(id);
if (!fSettings.isNull())
fSettings->fromSettings(s);
}
}
} // namespace Internal