Cotire : Fix duplicate global variables

This commit is contained in:
Magne Sjaastad committed 2018-12-03 15:22:09 +01:00
1 parent b06097862f
commit 4026f21a00
4 files changed
+12 -15

No files matched your search

@@ -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());
}