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

Cotire : Fix duplicate global variables

Browse Source
This commit is contained in:
Magne Sjaastad 2018-12-03 15:22:06 +01:00
parent b06097862f
commit 4026f21a00
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/CMakeLists.txt
View File

@ -398,9 +398,6 @@ if(RESINSIGHT_ENABLE_COTIRE)
# exclude file using SolveSpace
Application/Tools/RiaSCurveCalculator.cpp
# exclude test files due to cotire redefinition error report
UnitTests/RifCaseRealizationParametersReader-Test.cpp
)
foreach (fileToExclude ${COTIRE_EXCLUDE_FILES})

14
ApplicationCode/UnitTests/RifCaseRealizationParametersReader-Test.cpp
View File

@ -9,15 +9,15 @@
#include <numeric>
static const QString TEST_DATA_DIRECTORY = QString("%1/RifCaseRealizationParametersReader/").arg(TEST_DATA_DIR);
static const QString CASE_REAL_TEST_DATA_DIRECTORY = QString("%1/RifCaseRealizationParametersReader/").arg(TEST_DATA_DIR);
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(RifCaseRealizationParametersReaderTest, LocatorTestSuccess)
{
QString file = RifCaseRealizationParametersFileLocator::locate(TEST_DATA_DIRECTORY + "4/3/2");
QString expected = TEST_DATA_DIRECTORY + "parameters.txt";
QString file = RifCaseRealizationParametersFileLocator::locate(CASE_REAL_TEST_DATA_DIRECTORY + "4/3/2");
QString expected = CASE_REAL_TEST_DATA_DIRECTORY + "parameters.txt";
EXPECT_EQ(expected.toStdString(), file.toStdString());
}
@ -26,7 +26,7 @@ TEST(RifCaseRealizationParametersReaderTest, LocatorTestSuccess)
//--------------------------------------------------------------------------------------------------
TEST(RifCaseRealizationParametersReaderTest, LocatorTestFailure)
{
QString file = RifCaseRealizationParametersFileLocator::locate(TEST_DATA_DIRECTORY + "4/3/2/1");
QString file = RifCaseRealizationParametersFileLocator::locate(CASE_REAL_TEST_DATA_DIRECTORY + "4/3/2/1");
QString expected = "";
EXPECT_EQ(expected.toStdString(), file.toStdString());
}
@ -36,7 +36,7 @@ TEST(RifCaseRealizationParametersReaderTest, LocatorTestFailure)
//--------------------------------------------------------------------------------------------------
TEST(RifCaseRealizationParametersReaderTest, SuccessfulParsing)
{
RifCaseRealizationParametersReader reader(TEST_DATA_DIRECTORY + "parameters.txt");
RifCaseRealizationParametersReader reader(CASE_REAL_TEST_DATA_DIRECTORY + "parameters.txt");
try
{
@ -68,7 +68,7 @@ TEST(RifCaseRealizationParametersReaderTest, SuccessfulParsing)
//--------------------------------------------------------------------------------------------------
TEST(RifCaseRealizationParametersReaderTest, ParseFailed_InvalidFormat)
{
RifCaseRealizationParametersReader reader(TEST_DATA_DIRECTORY + "parameters_invalid_format.txt");
RifCaseRealizationParametersReader reader(CASE_REAL_TEST_DATA_DIRECTORY + "parameters_invalid_format.txt");
try
{
@ -91,7 +91,7 @@ TEST(RifCaseRealizationParametersReaderTest, ParseFailed_InvalidFormat)
//--------------------------------------------------------------------------------------------------
TEST(RifCaseRealizationParametersReaderTest, ParseFailed_InvalidNumberFormat)
{
RifCaseRealizationParametersReader reader(TEST_DATA_DIRECTORY + "parameters_invalid_number_format.txt");
RifCaseRealizationParametersReader reader(CASE_REAL_TEST_DATA_DIRECTORY + "parameters_invalid_number_format.txt");
try
{

6
ApplicationCode/UnitTests/RifElementPropertyTableReader-Test.cpp
View File

@ -9,14 +9,14 @@
#include <numeric>
static const QString TEST_DATA_DIRECTORY = QString("%1/RifElementPropertyTableReader/").arg(TEST_DATA_DIR);
static const QString ELEM_PROP_TEST_DATA_DIRECTORY = QString("%1/RifElementPropertyTableReader/").arg(TEST_DATA_DIR);
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(RicElementPropertyTableReaderTest, BasicUsage)
{
RifElementPropertyMetadata metadata = RifElementPropertyTableReader::readMetadata(TEST_DATA_DIRECTORY + "ELASTIC_TABLE.inp");
RifElementPropertyMetadata metadata = RifElementPropertyTableReader::readMetadata(ELEM_PROP_TEST_DATA_DIRECTORY + "ELASTIC_TABLE.inp");
RifElementPropertyTable table;
RifElementPropertyTableReader::readData(&metadata, &table);
@ -40,7 +40,7 @@ TEST(RicElementPropertyTableReaderTest, ParseFailed)
{
try
{
RifElementPropertyMetadata metadata = RifElementPropertyTableReader::readMetadata(TEST_DATA_DIRECTORY + "ELASTIC_TABLE_error.inp");
RifElementPropertyMetadata metadata = RifElementPropertyTableReader::readMetadata(ELEM_PROP_TEST_DATA_DIRECTORY + "ELASTIC_TABLE_error.inp");
RifElementPropertyTable table;
RifElementPropertyTableReader::readData(&metadata, &table);

4
ApplicationCode/UnitTests/RifPerforationIntervalReader-Test.cpp
View File

@ -7,7 +7,7 @@
#include <cmath> // Needed for HUGE_VAL on Linux
#include <numeric>
static const QString TEST_DATA_DIRECTORY = QString("%1/RifPerforationIntervalReader/").arg(TEST_DATA_DIR);
static const QString PERFORATION_TEST_DATA_DIRECTORY = QString("%1/RifPerforationIntervalReader/").arg(TEST_DATA_DIR);
//--------------------------------------------------------------------------------------------------
///
@ -15,7 +15,7 @@ static const QString TEST_DATA_DIRECTORY = QString("%1/RifPerforationIntervalRea
TEST(RifPerforationIntervalReaderTest, SpacesInWellNameHandledSuccessfully)
{
std::map<QString, std::vector<RifPerforationInterval> >
perforationIntervals = RifPerforationIntervalReader::readPerforationIntervals(TEST_DATA_DIRECTORY + "perforations_with_space_after_well_name.ev");
perforationIntervals = RifPerforationIntervalReader::readPerforationIntervals(PERFORATION_TEST_DATA_DIRECTORY + "perforations_with_space_after_well_name.ev");
EXPECT_EQ(10, perforationIntervals["A1_RI_HZX"].size());
}