From 4026f21a0035e66485da1407d660207c8b21645d Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Mon, 3 Dec 2018 15:22:06 +0100
Subject: [PATCH] Cotire : Fix duplicate global variables

---
 ApplicationCode/CMakeLists.txt                     |  3 ---
 .../RifCaseRealizationParametersReader-Test.cpp    | 14 +++++++-------
 .../RifElementPropertyTableReader-Test.cpp         |  6 +++---
 .../RifPerforationIntervalReader-Test.cpp          |  4 ++--
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt
index 1f2530ac65..0a7eab4721 100644
--- a/ApplicationCode/CMakeLists.txt
+++ b/ApplicationCode/CMakeLists.txt
@@ -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})
diff --git a/ApplicationCode/UnitTests/RifCaseRealizationParametersReader-Test.cpp b/ApplicationCode/UnitTests/RifCaseRealizationParametersReader-Test.cpp
index 7488094fb4..5ca5fedf0c 100644
--- a/ApplicationCode/UnitTests/RifCaseRealizationParametersReader-Test.cpp
+++ b/ApplicationCode/UnitTests/RifCaseRealizationParametersReader-Test.cpp
@@ -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
     {
diff --git a/ApplicationCode/UnitTests/RifElementPropertyTableReader-Test.cpp b/ApplicationCode/UnitTests/RifElementPropertyTableReader-Test.cpp
index 0683e25451..8a99951549 100644
--- a/ApplicationCode/UnitTests/RifElementPropertyTableReader-Test.cpp
+++ b/ApplicationCode/UnitTests/RifElementPropertyTableReader-Test.cpp
@@ -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);
diff --git a/ApplicationCode/UnitTests/RifPerforationIntervalReader-Test.cpp b/ApplicationCode/UnitTests/RifPerforationIntervalReader-Test.cpp
index c2a490c097..dde2b76a7a 100644
--- a/ApplicationCode/UnitTests/RifPerforationIntervalReader-Test.cpp
+++ b/ApplicationCode/UnitTests/RifPerforationIntervalReader-Test.cpp
@@ -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());
 }