OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2554 Regression Test : Move serialization code into RiaRegressionTest

Browse Source
This commit is contained in:
Magne Sjaastad 2018-03-06 17:42:00 +01:00
parent 08ce58b2fa
commit 2e122d2ab3
5 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/Application/Tools/RiaRegressionTest.cpp
View File

@ -18,6 +18,7 @@
#include "RiaRegressionTest.h" #include "RiaRegressionTest.h"
#include "cafPdmSettings.h"
#include "cafPdmUiFilePathEditor.h" #include "cafPdmUiFilePathEditor.h"
#include "cafPdmUiTextEditor.h" #include "cafPdmUiTextEditor.h"
@ -49,6 +50,22 @@ RiaRegressionTest::~RiaRegressionTest(void)
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaRegressionTest::writeSettingsToApplicationStore() const
{
caf::PdmSettings::writeFieldsToApplicationStore(this);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaRegressionTest::readSettingsFromApplicationStore()
{
caf::PdmSettings::readFieldsFromApplicationStore(this);
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

3
ApplicationCode/Application/Tools/RiaRegressionTest.h
View File

@ -32,6 +32,9 @@ public:
RiaRegressionTest(void); RiaRegressionTest(void);
virtual ~RiaRegressionTest(void); virtual ~RiaRegressionTest(void);
void writeSettingsToApplicationStore() const;
void readSettingsFromApplicationStore();
public: public:
caf::PdmField<QString> applicationWorkingFolder; caf::PdmField<QString> applicationWorkingFolder;
caf::PdmField<QString> regressionTestFolder; caf::PdmField<QString> regressionTestFolder;

7
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -1716,9 +1716,7 @@ void RiuMainWindow::slotCreateCommandObject()
void RiuMainWindow::slotShowRegressionTestDialog() void RiuMainWindow::slotShowRegressionTestDialog()
{ {
RiaRegressionTest regTestConfig; RiaRegressionTest regTestConfig;
regTestConfig.readSettingsFromApplicationStore();
RiaApplication* app = RiaApplication::instance();
caf::PdmSettings::readFieldsFromApplicationStore(&regTestConfig);
caf::PdmUiPropertyViewDialog regressionTestDialog(this, &regTestConfig, "Regression Test", ""); caf::PdmUiPropertyViewDialog regressionTestDialog(this, &regTestConfig, "Regression Test", "");
regressionTestDialog.resize(QSize(600, 300)); regressionTestDialog.resize(QSize(600, 300));
@ -1726,7 +1724,7 @@ void RiuMainWindow::slotShowRegressionTestDialog()
if (regressionTestDialog.exec() == QDialog::Accepted) if (regressionTestDialog.exec() == QDialog::Accepted)
{ {
// Write preferences using QSettings and apply them to the application // Write preferences using QSettings and apply them to the application
caf::PdmSettings::writeFieldsToApplicationStore(&regTestConfig); regTestConfig.writeSettingsToApplicationStore();
QString currentApplicationPath = QDir::currentPath(); QString currentApplicationPath = QDir::currentPath();
@ -1734,6 +1732,7 @@ void RiuMainWindow::slotShowRegressionTestDialog()
QStringList testFilter = regTestConfig.testFilter().split(";", QString::SkipEmptyParts); QStringList testFilter = regTestConfig.testFilter().split(";", QString::SkipEmptyParts);
RiaApplication* app = RiaApplication::instance();
app->executeRegressionTests(regTestConfig.regressionTestFolder, &testFilter); app->executeRegressionTests(regTestConfig.regressionTestFolder, &testFilter);
QDir::setCurrent(currentApplicationPath); QDir::setCurrent(currentApplicationPath);

2
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmSettings.cpp
View File

@ -94,7 +94,7 @@ void PdmSettings::readFieldsFromApplicationStore(caf::PdmObjectHandle* object, c
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void PdmSettings::writeFieldsToApplicationStore(caf::PdmObjectHandle* object, const QString context) void PdmSettings::writeFieldsToApplicationStore(const caf::PdmObjectHandle* object, const QString context)
{ {
CAF_ASSERT(object); CAF_ASSERT(object);

2
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmSettings.h
View File

@ -48,7 +48,7 @@ class PdmSettings
{ {
public: public:
static void readFieldsFromApplicationStore(caf::PdmObjectHandle* object, const QString context = ""); static void readFieldsFromApplicationStore(caf::PdmObjectHandle* object, const QString context = "");
static void writeFieldsToApplicationStore(caf::PdmObjectHandle* object, const QString context = ""); static void writeFieldsToApplicationStore(const caf::PdmObjectHandle* object, const QString context = "");
}; };