diff --git a/ApplicationLibCode/UnitTests/RifCaseRealizationParametersReader-Test.cpp b/ApplicationLibCode/UnitTests/RifCaseRealizationParametersReader-Test.cpp index 57715c9501..9a89f87fbb 100644 --- a/ApplicationLibCode/UnitTests/RifCaseRealizationParametersReader-Test.cpp +++ b/ApplicationLibCode/UnitTests/RifCaseRealizationParametersReader-Test.cpp @@ -8,7 +8,7 @@ #include #include -static const QString CASE_REAL_TEST_DATA_DIRECTORY = +static const QString CASE_REAL_TEST_DATA_DIRECTORY_01 = QString( "%1/RifCaseRealizationParametersReader/" ).arg( TEST_DATA_DIR ); //-------------------------------------------------------------------------------------------------- @@ -16,8 +16,8 @@ static const QString CASE_REAL_TEST_DATA_DIRECTORY = //-------------------------------------------------------------------------------------------------- TEST( RifCaseRealizationParametersReaderTest, LocatorTestSuccess ) { - QString file = RifCaseRealizationParametersFileLocator::locate( CASE_REAL_TEST_DATA_DIRECTORY + "4/3/2" ); - QString expected = CASE_REAL_TEST_DATA_DIRECTORY + "parameters.txt"; + QString file = RifCaseRealizationParametersFileLocator::locate( CASE_REAL_TEST_DATA_DIRECTORY_01 + "4/3/2" ); + QString expected = CASE_REAL_TEST_DATA_DIRECTORY_01 + "parameters.txt"; EXPECT_EQ( expected.toStdString(), file.toStdString() ); } @@ -26,7 +26,7 @@ TEST( RifCaseRealizationParametersReaderTest, LocatorTestSuccess ) //-------------------------------------------------------------------------------------------------- TEST( RifCaseRealizationParametersReaderTest, LocatorTestFailure ) { - QString file = RifCaseRealizationParametersFileLocator::locate( CASE_REAL_TEST_DATA_DIRECTORY + "4/3/2/1" ); + QString file = RifCaseRealizationParametersFileLocator::locate( CASE_REAL_TEST_DATA_DIRECTORY_01 + "4/3/2/1" ); QString expected = ""; EXPECT_EQ( expected.toStdString(), file.toStdString() ); } @@ -36,7 +36,7 @@ TEST( RifCaseRealizationParametersReaderTest, LocatorTestFailure ) //-------------------------------------------------------------------------------------------------- TEST( RifCaseRealizationParametersReaderTest, SuccessfulParsing ) { - RifCaseRealizationParametersReader reader( CASE_REAL_TEST_DATA_DIRECTORY + "parameters.txt" ); + RifCaseRealizationParametersReader reader( CASE_REAL_TEST_DATA_DIRECTORY_01 + "parameters.txt" ); try { diff --git a/ApplicationLibCode/UnitTests/RifStimPlanXmlReader-Test.cpp b/ApplicationLibCode/UnitTests/RifStimPlanXmlReader-Test.cpp index 4a91e3f5f0..e5a26064cc 100644 --- a/ApplicationLibCode/UnitTests/RifStimPlanXmlReader-Test.cpp +++ b/ApplicationLibCode/UnitTests/RifStimPlanXmlReader-Test.cpp @@ -5,14 +5,14 @@ #include "RifStimPlanXmlReader.h" #include "RigStimPlanFractureDefinition.h" -static const QString CASE_REAL_TEST_DATA_DIRECTORY = QString( "%1/RifStimPlanXmlReader/" ).arg( TEST_DATA_DIR ); +static const QString CASE_REAL_TEST_DATA_DIRECTORY_02 = QString( "%1/RifStimPlanXmlReader/" ).arg( TEST_DATA_DIR ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- TEST( RifStimPlanXmlReaderTest, LoadFile ) { - QString fileName = CASE_REAL_TEST_DATA_DIRECTORY + "small_fracture.xml"; + QString fileName = CASE_REAL_TEST_DATA_DIRECTORY_02 + "small_fracture.xml"; double conductivityScaleFactor = 1.0; RiaDefines::EclipseUnitSystem unit = RiaDefines::EclipseUnitSystem::UNITS_METRIC; @@ -38,7 +38,7 @@ TEST( RifStimPlanXmlReaderTest, LoadFile ) //-------------------------------------------------------------------------------------------------- TEST( RifStimPlanXmlReaderTest, LoadFileNewFormat ) { - QString fileName = CASE_REAL_TEST_DATA_DIRECTORY + "contour_Metric.xml"; + QString fileName = CASE_REAL_TEST_DATA_DIRECTORY_02 + "contour_Metric.xml"; double conductivityScaleFactor = 1.0; RiaDefines::EclipseUnitSystem unit = RiaDefines::EclipseUnitSystem::UNITS_METRIC; @@ -69,7 +69,7 @@ TEST( RifStimPlanXmlReaderTest, LoadFileNewFormat ) //-------------------------------------------------------------------------------------------------- TEST( RifStimPlanXmlReaderTest, LoadFileNewFormatExtraParameters ) { - QString fileName = CASE_REAL_TEST_DATA_DIRECTORY + "contour_with_extra_parameters.xml"; + QString fileName = CASE_REAL_TEST_DATA_DIRECTORY_02 + "contour_with_extra_parameters.xml"; double conductivityScaleFactor = 1.0; RiaDefines::EclipseUnitSystem unit = RiaDefines::EclipseUnitSystem::UNITS_METRIC; diff --git a/ApplicationLibCode/UnitTests/RifThermalFractureReader-Test.cpp b/ApplicationLibCode/UnitTests/RifThermalFractureReader-Test.cpp index 6dfe0debe3..c06fe988bd 100644 --- a/ApplicationLibCode/UnitTests/RifThermalFractureReader-Test.cpp +++ b/ApplicationLibCode/UnitTests/RifThermalFractureReader-Test.cpp @@ -5,14 +5,14 @@ #include "RifThermalFractureReader.h" #include "RigThermalFractureDefinition.h" -static const QString CASE_REAL_TEST_DATA_DIRECTORY = QString( "%1/RifThermalFractureReader/" ).arg( TEST_DATA_DIR ); +static const QString CASE_REAL_TEST_DATA_DIRECTORY_03 = QString( "%1/RifThermalFractureReader/" ).arg( TEST_DATA_DIR ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- TEST( RifThermalFractureReaderTest, LoadFile ) { - QString fileName = CASE_REAL_TEST_DATA_DIRECTORY + "fracture_metric.csv"; + QString fileName = CASE_REAL_TEST_DATA_DIRECTORY_03 + "fracture_metric.csv"; auto [fractureData, errorMessage] = RifThermalFractureReader::readFractureCsvFile( fileName );