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

Move ProgressBlocker creation to unit test launch method

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-03-22 14:11:22 +01:00
parent 32419b1e00
commit ec525e8774
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Application/RiaApplication.cpp
View File

@ -1330,6 +1330,8 @@ bool RiaApplication::parseArguments()
int RiaApplication::launchUnitTests() int RiaApplication::launchUnitTests()
{ {
#ifdef USE_UNIT_TESTS #ifdef USE_UNIT_TESTS
caf::ProgressInfoBlocker progressBlocker;
cvf::Assert::setReportMode(cvf::Assert::CONSOLE); cvf::Assert::setReportMode(cvf::Assert::CONSOLE);
#if QT_VERSION < 0x050000 #if QT_VERSION < 0x050000

10
ApplicationCode/UnitTests/RifReaderEclipseOutput-Test.cpp
View File

@ -35,8 +35,6 @@
#include "RifReaderSettings.h" #include "RifReaderSettings.h"
#include "RimEclipseResultCase.h" #include "RimEclipseResultCase.h"
#include <cafProgressInfo.h>
#include <QDebug> #include <QDebug>
#include <QDir> #include <QDir>
@ -49,8 +47,6 @@ using namespace RiaDefines;
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
TEST(RigReservoirTest, BasicTest10k) TEST(RigReservoirTest, BasicTest10k)
{ {
caf::ProgressInfoBlocker progressBlocker;
QDir baseFolder(TEST_MODEL_DIR); QDir baseFolder(TEST_MODEL_DIR);
bool subFolderExists = baseFolder.cd("TEST10K_FLT_LGR_NNC"); bool subFolderExists = baseFolder.cd("TEST10K_FLT_LGR_NNC");
EXPECT_TRUE(subFolderExists); EXPECT_TRUE(subFolderExists);
@ -103,8 +99,6 @@ TEST(RigReservoirTest, BasicTest10k)
TEST(RigReservoirTest, BasicTest10kRestart) TEST(RigReservoirTest, BasicTest10kRestart)
{ {
caf::ProgressInfoBlocker progressBlocker;
RifEclipseUnifiedRestartFileAccess unrstAccess; RifEclipseUnifiedRestartFileAccess unrstAccess;
QDir baseFolder(TEST_MODEL_DIR); QDir baseFolder(TEST_MODEL_DIR);
@ -143,8 +137,6 @@ TEST(RigReservoirTest, BasicTest10kRestart)
TEST(RigReservoirTest, BasicTest10k_NativeECL) TEST(RigReservoirTest, BasicTest10k_NativeECL)
{ {
caf::ProgressInfoBlocker progressBlocker;
QDir baseFolder(TEST_MODEL_DIR); QDir baseFolder(TEST_MODEL_DIR);
bool subFolderExists = baseFolder.cd("TEST10K_FLT_LGR_NNC"); bool subFolderExists = baseFolder.cd("TEST10K_FLT_LGR_NNC");
EXPECT_TRUE(subFolderExists); EXPECT_TRUE(subFolderExists);
@ -191,8 +183,6 @@ TEST(RigReservoirTest, BasicTest10k_NativeECL)
TEST(RigReservoirTest, Test10k_ReadThenWriteToECL) TEST(RigReservoirTest, Test10k_ReadThenWriteToECL)
{ {
caf::ProgressInfoBlocker progressBlocker;
QDir baseFolder(TEST_MODEL_DIR); QDir baseFolder(TEST_MODEL_DIR);
bool subFolderExists = baseFolder.cd("TEST10K_FLT_LGR_NNC"); bool subFolderExists = baseFolder.cd("TEST10K_FLT_LGR_NNC");
EXPECT_TRUE(subFolderExists); EXPECT_TRUE(subFolderExists);