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.
This commit is contained in:
Pål Hagen 2015-10-15 12:41:12 +02:00
parent d74b4333f2
commit 10c5b37122
2 changed files with 19 additions and 3 deletions

View File

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

View File

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