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

Unity build requires global unique variable names

Browse Source
This commit is contained in:
Magne Sjaastad
2022-07-07 10:01:03 +02:00
parent b9c21289d0
commit be8c796bb0
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationLibCode/UnitTests/RifStimPlanXmlReader-Test.cpp
View File

@@ -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;