From 10c5b3712248bc9fce4d7a7932658d7c19338bcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A5l=20Hagen?= <pal@applicano.com>
Date: Thu, 15 Oct 2015 12:41:12 +0200
Subject: [PATCH] Updated unit tests

Using RigWellLogCurveData instead of RimWellLogCurveImpl. Added test
interface which has access to private methods in RigWellLogCurveData.
RimWellLogCurveImpl should probably be removed when correct filtering of
curve segments based on depths is up & running.
---
 .../RimWellLogExtractionCurveImpl-Test.cpp       |  6 +++---
 .../ReservoirDataModel/RigWellLogCurveData.h     | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/ProjectDataModel_UnitTests/RimWellLogExtractionCurveImpl-Test.cpp b/ApplicationCode/ProjectDataModel/ProjectDataModel_UnitTests/RimWellLogExtractionCurveImpl-Test.cpp
index 1c9932b9a8..cf09abbf28 100644
--- a/ApplicationCode/ProjectDataModel/ProjectDataModel_UnitTests/RimWellLogExtractionCurveImpl-Test.cpp
+++ b/ApplicationCode/ProjectDataModel/ProjectDataModel_UnitTests/RimWellLogExtractionCurveImpl-Test.cpp
@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 
-#include "../RimWellLogCurveImpl.h"
+#include "RigWellLogCurveData.h"
 
 #include <cmath> // Needed for HUGE_VAL on Linux
 
@@ -19,7 +19,7 @@ TEST(RimWellLogExtractionCurveImplTest, StripOffInvalidValAtEndsOfVector)
     values.push_back(HUGE_VAL);
 
     std::vector< std::pair<size_t, size_t> > valuesIntervals;
-    RimWellLogCurveImpl::calculateIntervalsOfValidValues(values, valuesIntervals);
+    RigWellLogCurveDataTestInterface::calculateIntervalsOfValidValues(values, &valuesIntervals);
 
     EXPECT_EQ(1, static_cast<int>(valuesIntervals.size()));
     EXPECT_EQ(2, static_cast<int>(valuesIntervals[0].first));
@@ -43,7 +43,7 @@ TEST(RimWellLogExtractionCurveImplTest, StripOffHugeValAtEndsAndInteriorOfVector
     values.push_back(HUGE_VAL);
 
     std::vector< std::pair<size_t, size_t> > valuesIntervals;
-    RimWellLogCurveImpl::calculateIntervalsOfValidValues(values, valuesIntervals);
+    RigWellLogCurveDataTestInterface::calculateIntervalsOfValidValues(values, &valuesIntervals);
 
     EXPECT_EQ(2, valuesIntervals.size());
     EXPECT_EQ(2, valuesIntervals[0].first);
diff --git a/ApplicationCode/ReservoirDataModel/RigWellLogCurveData.h b/ApplicationCode/ReservoirDataModel/RigWellLogCurveData.h
index 17658c69f9..71a7ce5b64 100644
--- a/ApplicationCode/ReservoirDataModel/RigWellLogCurveData.h
+++ b/ApplicationCode/ReservoirDataModel/RigWellLogCurveData.h
@@ -24,6 +24,8 @@
 
 #include <vector>
 
+class RigWellLogCurveDataTestInterface;
+
 //==================================================================================================
 /// 
 //==================================================================================================
@@ -54,4 +56,18 @@ private:
     std::vector<double>                         m_xValues;
     std::vector<double>                         m_yValues;
     std::vector< std::pair<size_t, size_t> >    m_validXValuesIntervals;
+
+friend RigWellLogCurveDataTestInterface;
+};
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RigWellLogCurveDataTestInterface
+{
+public:
+    static void calculateIntervalsOfValidValues(const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >* intervals)
+    {
+        RigWellLogCurveData::calculateIntervalsOfValidValues(values, intervals);
+    }
 };