OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-07 06:33:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3659 Regression Test : Make sure exported snapshots have same size

Browse Source
This commit is contained in:
Magne Sjaastad 2018-11-11 12:58:51 +01:00
parent 99f182e74d
commit ae94785634
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Application/Tools/RiaRegressionTestRunner.h
View File

@ -39,6 +39,7 @@ public:
bool isRunningRegressionTests() const; bool isRunningRegressionTests() const;
static void updateRegressionTest(const QString& testRootPath); static void updateRegressionTest(const QString& testRootPath);
static void regressionTestConfigureProject();
private: private:
RiaRegressionTestRunner(); RiaRegressionTestRunner();
@ -56,7 +57,6 @@ private:
const QDir& testDir); const QDir& testDir);
static void removeDirectoryWithContent(QDir& dirToDelete); static void removeDirectoryWithContent(QDir& dirToDelete);
static void regressionTestConfigureProject();
static void resizeMaximizedPlotWindows(); static void resizeMaximizedPlotWindows();
static QSize regressionDefaultImageSize(); static QSize regressionDefaultImageSize();
static QString diff2htmlHeaderText(const QString& testRootPath); static QString diff2htmlHeaderText(const QString& testRootPath);

18
ApplicationCode/CommandFileInterface/RicfOpenProject.cpp
View File

@ -1,17 +1,17 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2017 Statoil ASA // Copyright (C) 2017 Statoil ASA
// //
// ResInsight is free software: you can redistribute it and/or modify // ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY // ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or // WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE. // FITNESS FOR A PARTICULAR PURPOSE.
// //
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> // See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details. // for more details.
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
@ -22,11 +22,12 @@
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaLogging.h" #include "RiaLogging.h"
#include "RiaRegressionTestRunner.h"
CAF_PDM_SOURCE_INIT(RicfOpenProject, "openProject"); CAF_PDM_SOURCE_INIT(RicfOpenProject, "openProject");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicfOpenProject::RicfOpenProject() RicfOpenProject::RicfOpenProject()
{ {
@ -34,7 +35,7 @@ RicfOpenProject::RicfOpenProject()
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicfOpenProject::execute() void RicfOpenProject::execute()
{ {
@ -45,5 +46,10 @@ void RicfOpenProject::execute()
return; return;
} }
if (RiaRegressionTestRunner::instance()->isRunningRegressionTests())
{
RiaRegressionTestRunner::regressionTestConfigureProject();
}
RicfCommandFileExecutor::instance()->setLastProjectPath(m_path); RicfCommandFileExecutor::instance()->setLastProjectPath(m_path);
} }