diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index f3f3de42bb..d8afabcc22 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -1330,6 +1330,8 @@ bool RiaApplication::parseArguments() int RiaApplication::launchUnitTests() { #ifdef USE_UNIT_TESTS + + caf::ProgressInfoBlocker progressBlocker; cvf::Assert::setReportMode(cvf::Assert::CONSOLE); #if QT_VERSION < 0x050000 diff --git a/ApplicationCode/UnitTests/RifReaderEclipseOutput-Test.cpp b/ApplicationCode/UnitTests/RifReaderEclipseOutput-Test.cpp index d747195260..5e36e4d141 100644 --- a/ApplicationCode/UnitTests/RifReaderEclipseOutput-Test.cpp +++ b/ApplicationCode/UnitTests/RifReaderEclipseOutput-Test.cpp @@ -35,8 +35,6 @@ #include "RifReaderSettings.h" #include "RimEclipseResultCase.h" -#include - #include #include @@ -49,8 +47,6 @@ using namespace RiaDefines; //-------------------------------------------------------------------------------------------------- TEST(RigReservoirTest, BasicTest10k) { - caf::ProgressInfoBlocker progressBlocker; - QDir baseFolder(TEST_MODEL_DIR); bool subFolderExists = baseFolder.cd("TEST10K_FLT_LGR_NNC"); EXPECT_TRUE(subFolderExists); @@ -103,8 +99,6 @@ TEST(RigReservoirTest, BasicTest10k) TEST(RigReservoirTest, BasicTest10kRestart) { - caf::ProgressInfoBlocker progressBlocker; - RifEclipseUnifiedRestartFileAccess unrstAccess; QDir baseFolder(TEST_MODEL_DIR); @@ -143,8 +137,6 @@ TEST(RigReservoirTest, BasicTest10kRestart) TEST(RigReservoirTest, BasicTest10k_NativeECL) { - caf::ProgressInfoBlocker progressBlocker; - QDir baseFolder(TEST_MODEL_DIR); bool subFolderExists = baseFolder.cd("TEST10K_FLT_LGR_NNC"); EXPECT_TRUE(subFolderExists); @@ -191,8 +183,6 @@ TEST(RigReservoirTest, BasicTest10k_NativeECL) TEST(RigReservoirTest, Test10k_ReadThenWriteToECL) { - caf::ProgressInfoBlocker progressBlocker; - QDir baseFolder(TEST_MODEL_DIR); bool subFolderExists = baseFolder.cd("TEST10K_FLT_LGR_NNC"); EXPECT_TRUE(subFolderExists);