From 8a8d786d4f5a8f0efc246c3476d5cc81484d508f Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Fri, 29 Sep 2023 13:53:16 +0200
Subject: [PATCH] mv test to ParseUtilTest.cpp, rm duplicate test
---
Tests/Unit/Device/DatafieldTest.cpp | 12 ++++++------
Tests/Unit/Device/FixedBinAxisTest.cpp | 14 --------------
Tests/Unit/Device/ParseUtilTest.cpp | 17 +++++++++++++++++
Tests/Unit/Device/PointwiseAxisTest.cpp | 14 --------------
4 files changed, 23 insertions(+), 34 deletions(-)
create mode 100644 Tests/Unit/Device/ParseUtilTest.cpp
diff --git a/Tests/Unit/Device/DatafieldTest.cpp b/Tests/Unit/Device/DatafieldTest.cpp
index b74cdfc4faf..f5086eba711 100644
--- a/Tests/Unit/Device/DatafieldTest.cpp
+++ b/Tests/Unit/Device/DatafieldTest.cpp
@@ -6,7 +6,7 @@
#include "Device/Data/Datafield.h"
#include "Tests/GTestWrapper/google_test.h"
-TEST(DataUtilTest, createRearrangedDataSet)
+TEST(DatafieldTest, createRearrangedDataSet)
{
Datafield input_data{
{newEquiDivision("axis0", 2, 1.0, 2.0), newEquiDivision("axis1", 3, 3.0, 4.0)}};
@@ -50,7 +50,7 @@ TEST(DataUtilTest, createRearrangedDataSet)
EXPECT_EQ(input_data[2], (*output_data)[5]);
}
-TEST(DataUtilTest, coordinateToFromBinf)
+TEST(DatafieldTest, coordinateToFromBinf)
{
Scale axis = EquiDivision("axis", 8, -5.0, 3.0);
EXPECT_EQ(0.5, FrameUtil::coordinateToBinf(-4.5, axis));
@@ -72,7 +72,7 @@ TEST(DataUtilTest, coordinateToFromBinf)
//! Transformation of coordinates from one Datafield to another using conversion from axes
//! coordinates to bin-fraction-coordinates and then to another axes coordinates.
-TEST(DataUtilTest, datafieldToFromBinf)
+TEST(DatafieldTest, datafieldToFromBinf)
{
Frame data1(newEquiDivision("axis0", 8, -5.0, 3.0), newEquiDivision("axis1", 3, 2.0, 5.0));
Frame data2(newEquiDivision("axis0", 8, -10.0, 70.0), newEquiDivision("axis1", 3, -10.0, 20.0));
@@ -91,7 +91,7 @@ TEST(DataUtilTest, datafieldToFromBinf)
EXPECT_DOUBLE_EQ(y, 21.0);
}
-TEST(DataUtilTest, create2DArrayfromDatafield)
+TEST(DatafieldTest, create2DArrayfromDatafield)
{
Datafield out_data{
{newEquiDivision("axis0", 3, 1.0, 3.0), newEquiDivision("axis1", 2, 10., 20.)}};
@@ -120,7 +120,7 @@ TEST(DataUtilTest, create2DArrayfromDatafield)
EXPECT_EQ(array_expected_2d, array_2d);
}
-TEST(DataUtilTest, vecvecToDatafield)
+TEST(DatafieldTest, vecvecToDatafield)
{
std::vector<double> arr_in{1, 2, 3, 4, 5, 6};
std::vector<std::vector<double>> array_2d{{arr_in[0], arr_in[1], arr_in[2]},
@@ -129,7 +129,7 @@ TEST(DataUtilTest, vecvecToDatafield)
EXPECT_EQ(arr_in, data.flatVector());
}
-TEST(DataUtilTest, DatafieldToVector2D)
+TEST(DatafieldTest, DatafieldToVector2D)
{
Datafield data(
{newEquiDivision("axis0", 3, 10.0, 20.0), newEquiDivision("axis1", 2, 30.0, 40.0)});
diff --git a/Tests/Unit/Device/FixedBinAxisTest.cpp b/Tests/Unit/Device/FixedBinAxisTest.cpp
index 663e8418693..98f734cb532 100644
--- a/Tests/Unit/Device/FixedBinAxisTest.cpp
+++ b/Tests/Unit/Device/FixedBinAxisTest.cpp
@@ -1,8 +1,6 @@
#include "Base/Axis/MakeScale.h"
#include "Base/Axis/Scale.h"
-#include "Device/IO/ParseUtil.h"
#include "Tests/GTestWrapper/google_test.h"
-#include <iostream>
TEST(EquiDivisionTest, IndexedAccessor)
{
@@ -110,18 +108,6 @@ TEST(EquiDivisionTest, CheckClone)
delete clone;
}
-TEST(EquiDivisionTest, IOStream)
-{
- Scale axis = EquiDivision("name", 99, -1.2, 5.4);
-
- std::ostringstream oss;
- oss << axis;
- std::istringstream iss(oss.str());
-
- std::unique_ptr<Scale> result(Util::Parse::parseScale(iss));
- EXPECT_TRUE(axis == *result);
-}
-
TEST(EquiDivisionTest, BinCenters)
{
Scale axis = EquiDivision("name", 3, -1.5, 1.5);
diff --git a/Tests/Unit/Device/ParseUtilTest.cpp b/Tests/Unit/Device/ParseUtilTest.cpp
new file mode 100644
index 00000000000..8ad088648a7
--- /dev/null
+++ b/Tests/Unit/Device/ParseUtilTest.cpp
@@ -0,0 +1,17 @@
+#include "Base/Axis/MakeScale.h"
+#include "Base/Axis/Scale.h"
+#include "Device/IO/ParseUtil.h"
+#include "Tests/GTestWrapper/google_test.h"
+#include <iostream>
+
+TEST(ParseUtilTest, ParseScale)
+{
+ Scale axis = ListScan("name", std::vector<double>{1.0, 2.0, 5.0});
+
+ std::ostringstream oss;
+ oss << axis;
+ std::istringstream iss(oss.str());
+
+ std::unique_ptr<Scale> result(Util::Parse::parseScale(iss));
+ EXPECT_TRUE(axis == *result);
+}
diff --git a/Tests/Unit/Device/PointwiseAxisTest.cpp b/Tests/Unit/Device/PointwiseAxisTest.cpp
index d8a2bca2b1b..bdbb45deede 100644
--- a/Tests/Unit/Device/PointwiseAxisTest.cpp
+++ b/Tests/Unit/Device/PointwiseAxisTest.cpp
@@ -1,8 +1,6 @@
#include "Base/Axis/MakeScale.h"
#include "Base/Axis/Scale.h"
-#include "Device/IO/ParseUtil.h"
#include "Tests/GTestWrapper/google_test.h"
-#include <iostream>
TEST(PointwiseAxisTest, Construction)
{
@@ -79,18 +77,6 @@ TEST(PointwiseAxisTest, CheckClone)
EXPECT_TRUE(a1 == *clone);
}
-TEST(PointwiseAxisTest, IOStream)
-{
- Scale axis = ListScan("name", std::vector<double>{1.0, 2.0, 5.0});
-
- std::ostringstream oss;
- oss << axis;
- std::istringstream iss(oss.str());
-
- std::unique_ptr<Scale> result(Util::Parse::parseScale(iss));
- EXPECT_TRUE(axis == *result);
-}
-
TEST(PointwiseAxisTest, ClippedAxis)
{
Scale axis = ListScan("name", std::vector<double>{1.0, 2.0, 2.5, 2.7, 5.0});
--
GitLab