From 1ce0a683e13080535ee380f8231e89de79308981 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Fri, 29 Sep 2023 14:15:37 +0200
Subject: [PATCH] split off FrameTest
---
Tests/Unit/Base/FrameTest.cpp | 43 +++++++++++++++++++++++++++
Tests/Unit/Device/DatafieldTest.cpp | 45 +----------------------------
2 files changed, 44 insertions(+), 44 deletions(-)
create mode 100644 Tests/Unit/Base/FrameTest.cpp
diff --git a/Tests/Unit/Base/FrameTest.cpp b/Tests/Unit/Base/FrameTest.cpp
new file mode 100644
index 00000000000..bc5f8554fd6
--- /dev/null
+++ b/Tests/Unit/Base/FrameTest.cpp
@@ -0,0 +1,43 @@
+#include "Base/Axis/Frame.h"
+#include "Base/Axis/FrameUtil.h"
+#include "Base/Axis/MakeScale.h"
+#include "Base/Axis/Scale.h"
+#include "Tests/GTestWrapper/google_test.h"
+
+TEST(FrameTest, 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));
+
+ double x(-4.5), y(2.5);
+ FrameUtil::coordinatesToBinf(x, y, data1);
+ FrameUtil::coordinatesFromBinf(x, y, data2);
+ EXPECT_DOUBLE_EQ(x, -5.0);
+ EXPECT_DOUBLE_EQ(y, -5.0);
+
+ x = 3.1;
+ y = 5.1;
+ FrameUtil::coordinatesToBinf(x, y, data1);
+ FrameUtil::coordinatesFromBinf(x, y, data2);
+ EXPECT_DOUBLE_EQ(x, 71.0);
+ EXPECT_DOUBLE_EQ(y, 21.0);
+}
+
+TEST(FrameTest, coordinateToFromBinf)
+{
+ Scale axis = EquiDivision("axis", 8, -5.0, 3.0);
+ EXPECT_EQ(0.5, FrameUtil::coordinateToBinf(-4.5, axis));
+ EXPECT_EQ(-4.5, FrameUtil::coordinateFromBinf(0.5, axis));
+
+ EXPECT_EQ(1.0, FrameUtil::coordinateToBinf(-4.0, axis));
+ EXPECT_EQ(-4.0, FrameUtil::coordinateFromBinf(1.0, axis));
+
+ EXPECT_EQ(-0.5, FrameUtil::coordinateToBinf(-5.5, axis));
+ EXPECT_EQ(-5.5, FrameUtil::coordinateFromBinf(-0.5, axis));
+
+ EXPECT_EQ(8.0, FrameUtil::coordinateToBinf(3.0, axis));
+ EXPECT_EQ(3.0, FrameUtil::coordinateFromBinf(8.0, axis));
+
+ EXPECT_EQ(8.5, FrameUtil::coordinateToBinf(3.5, axis));
+ EXPECT_EQ(3.5, FrameUtil::coordinateFromBinf(8.5, axis));
+}
diff --git a/Tests/Unit/Device/DatafieldTest.cpp b/Tests/Unit/Device/DatafieldTest.cpp
index 035b0bda93a..6033932de1f 100644
--- a/Tests/Unit/Device/DatafieldTest.cpp
+++ b/Tests/Unit/Device/DatafieldTest.cpp
@@ -1,9 +1,7 @@
-#include "Device/Data/Datafield.h"
-#include "Base/Axis/Frame.h"
-#include "Base/Axis/FrameUtil.h"
#include "Base/Axis/MakeScale.h"
#include "Base/Axis/Scale.h"
#include "Device/Data/DataUtil.h"
+#include "Device/Data/Datafield.h"
#include "Tests/GTestWrapper/google_test.h"
TEST(DatafieldTest, createRearrangedDataSet)
@@ -50,47 +48,6 @@ TEST(DatafieldTest, createRearrangedDataSet)
EXPECT_EQ(input_data[2], (*output_data)[5]);
}
-TEST(DatafieldTest, coordinateToFromBinf)
-{
- Scale axis = EquiDivision("axis", 8, -5.0, 3.0);
- EXPECT_EQ(0.5, FrameUtil::coordinateToBinf(-4.5, axis));
- EXPECT_EQ(-4.5, FrameUtil::coordinateFromBinf(0.5, axis));
-
- EXPECT_EQ(1.0, FrameUtil::coordinateToBinf(-4.0, axis));
- EXPECT_EQ(-4.0, FrameUtil::coordinateFromBinf(1.0, axis));
-
- EXPECT_EQ(-0.5, FrameUtil::coordinateToBinf(-5.5, axis));
- EXPECT_EQ(-5.5, FrameUtil::coordinateFromBinf(-0.5, axis));
-
- EXPECT_EQ(8.0, FrameUtil::coordinateToBinf(3.0, axis));
- EXPECT_EQ(3.0, FrameUtil::coordinateFromBinf(8.0, axis));
-
- EXPECT_EQ(8.5, FrameUtil::coordinateToBinf(3.5, axis));
- EXPECT_EQ(3.5, FrameUtil::coordinateFromBinf(8.5, axis));
-}
-
-//! Transformation of coordinates from one Datafield to another using conversion from axes
-//! coordinates to bin-fraction-coordinates and then to another axes coordinates.
-
-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));
-
- double x(-4.5), y(2.5);
- FrameUtil::coordinatesToBinf(x, y, data1);
- FrameUtil::coordinatesFromBinf(x, y, data2);
- EXPECT_DOUBLE_EQ(x, -5.0);
- EXPECT_DOUBLE_EQ(y, -5.0);
-
- x = 3.1;
- y = 5.1;
- FrameUtil::coordinatesToBinf(x, y, data1);
- FrameUtil::coordinatesFromBinf(x, y, data2);
- EXPECT_DOUBLE_EQ(x, 71.0);
- EXPECT_DOUBLE_EQ(y, 21.0);
-}
-
TEST(DatafieldTest, create2DArrayfromDatafield)
{
Datafield out_data{
--
GitLab