Skip to content
Snippets Groups Projects
Commit a78600fd authored by Robert Applin's avatar Robert Applin
Browse files

Refs #24649. Fix unit tests

parent 9edbf224
No related branches found
No related tags found
No related merge requests found
...@@ -193,9 +193,10 @@ public: ...@@ -193,9 +193,10 @@ public:
data->setExcludeRegionString("2,5", 1); data->setExcludeRegionString("2,5", 1);
data->setExcludeRegionString("1,2,5,6,3,4", 2); data->setExcludeRegionString("1,2,5,6,3,4", 2);
TS_ASSERT_EQUALS(data->getExcludeRegion(0), "1.0,8.0"); TS_ASSERT_EQUALS(data->getExcludeRegion(0), "1.000,8.000");
TS_ASSERT_EQUALS(data->getExcludeRegion(1), "2.0,5.0"); TS_ASSERT_EQUALS(data->getExcludeRegion(1), "2.000,5.000");
TS_ASSERT_EQUALS(data->getExcludeRegion(2), "1.0,2.0,5.0,6.0,3.0,4.0"); TS_ASSERT_EQUALS(data->getExcludeRegion(2),
"1.000,2.000,5.000,6.000,3.000,4.000");
TS_ASSERT_EQUALS(data->getExcludeRegion(3), ""); TS_ASSERT_EQUALS(data->getExcludeRegion(3), "");
} }
...@@ -225,11 +226,12 @@ public: ...@@ -225,11 +226,12 @@ public:
std::vector<double> const regionVector{2.0, 6.0}; std::vector<double> const regionVector{2.0, 6.0};
TS_ASSERT_EQUALS(data->getExcludeRegion(0), "2.0,6.0"); TS_ASSERT_EQUALS(data->getExcludeRegion(0), "2.000,6.000");
TS_ASSERT_EQUALS(data->getExcludeRegion(1), TS_ASSERT_EQUALS(data->getExcludeRegion(1),
"2.0,6.0,1.0,2.0,3.0,4.0,6.0,7.0"); "2.000,6.000,1.000,2.000,3.000,4.000,6.000,7.000");
TS_ASSERT_EQUALS(data->getExcludeRegion(2), TS_ASSERT_EQUALS(
"1.0,2.0,2.0,3.0,18.0,20.0,21.0,22.0,7.0,8.0"); data->getExcludeRegion(2),
"1.000,2.000,2.000,3.000,18.000,20.000,21.000,22.000,7.000,8.000");
TS_ASSERT_EQUALS(data->excludeRegionsVector(0), regionVector); TS_ASSERT_EQUALS(data->excludeRegionsVector(0), regionVector);
} }
...@@ -241,11 +243,12 @@ public: ...@@ -241,11 +243,12 @@ public:
data->setExcludeRegionString("6, 2,1 ,2, 3,4 ,7,6", 1); data->setExcludeRegionString("6, 2,1 ,2, 3,4 ,7,6", 1);
data->setExcludeRegionString("1,2 ,2,3, 20, 18,21,22,7, 8 ", 2); data->setExcludeRegionString("1,2 ,2,3, 20, 18,21,22,7, 8 ", 2);
TS_ASSERT_EQUALS(data->getExcludeRegion(0), "2.0,6.0"); TS_ASSERT_EQUALS(data->getExcludeRegion(0), "2.000,6.000");
TS_ASSERT_EQUALS(data->getExcludeRegion(1), TS_ASSERT_EQUALS(data->getExcludeRegion(1),
"2.0,6.0,1.0,2.0,3.0,4.0,6.0,7.0"); "2.000,6.000,1.000,2.000,3.000,4.000,6.000,7.000");
TS_ASSERT_EQUALS(data->getExcludeRegion(2), TS_ASSERT_EQUALS(
"1.0,2.0,2.0,3.0,18.0,20.0,21.0,22.0,7.0,8.0"); data->getExcludeRegion(2),
"1.000,2.000,2.000,3.000,18.000,20.000,21.000,22.000,7.000,8.000");
} }
void void
...@@ -255,8 +258,8 @@ public: ...@@ -255,8 +258,8 @@ public:
data->setExcludeRegionString("6.29,2.93", 0); data->setExcludeRegionString("6.29,2.93", 0);
data->setExcludeRegionString("2.6,2.3,1.99,3.01", 1); data->setExcludeRegionString("2.6,2.3,1.99,3.01", 1);
TS_ASSERT_EQUALS(data->getExcludeRegion(0), "2.9,6.3"); TS_ASSERT_EQUALS(data->getExcludeRegion(0), "2.900,6.300");
TS_ASSERT_EQUALS(data->getExcludeRegion(1), "2.3,2.6,2.0,3.0"); TS_ASSERT_EQUALS(data->getExcludeRegion(1), "2.300,2.600,2.000,3.000");
} }
void test_throws_when_setSpectra_is_provided_an_out_of_range_spectra() { void test_throws_when_setSpectra_is_provided_an_out_of_range_spectra() {
...@@ -365,8 +368,9 @@ public: ...@@ -365,8 +368,9 @@ public:
data1->setExcludeRegionString("6,2", 1); data1->setExcludeRegionString("6,2", 1);
auto const combinedData = data2->combine(*data1); auto const combinedData = data2->combine(*data1);
TS_ASSERT_EQUALS(combinedData.getExcludeRegion(0), "1.0,2.0,5.0,6.0"); TS_ASSERT_EQUALS(combinedData.getExcludeRegion(0),
TS_ASSERT_EQUALS(combinedData.getExcludeRegion(1), "2.0,6.0"); "1.000,2.000,5.000,6.000");
TS_ASSERT_EQUALS(combinedData.getExcludeRegion(1), "2.000,6.000");
} }
void void
......
...@@ -301,7 +301,7 @@ public: ...@@ -301,7 +301,7 @@ public:
model->setExcludeRegion("0,1,3,4", 0, 0); model->setExcludeRegion("0,1,3,4", 0, 0);
TS_ASSERT_EQUALS(model->getExcludeRegion(0, 0), "0.0,1.0,3.0,4.0"); TS_ASSERT_EQUALS(model->getExcludeRegion(0, 0), "0.000,1.000,3.000,4.000");
} }
void void
...@@ -330,7 +330,7 @@ public: ...@@ -330,7 +330,7 @@ public:
model->setExcludeRegion("0,1,6,4", 0, 0); model->setExcludeRegion("0,1,6,4", 0, 0);
TS_ASSERT_EQUALS(model->getExcludeRegion(0, 0), "0.0,1.0,4.0,6.0"); TS_ASSERT_EQUALS(model->getExcludeRegion(0, 0), "0.000,1.000,4.000,6.000");
} }
void void
...@@ -592,7 +592,7 @@ public: ...@@ -592,7 +592,7 @@ public:
model->setExcludeRegion("0,1,3,4", 3, 0); model->setExcludeRegion("0,1,3,4", 3, 0);
TS_ASSERT_EQUALS(model->getExcludeRegion(0, 0), "0.0,1.0,3.0,4.0"); TS_ASSERT_EQUALS(model->getExcludeRegion(0, 0), "0.000,1.000,3.000,4.000");
} }
void void
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment