From a73d0151a9548a41fbc335bbc11989d3afabed7f Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-bs.de>
Date: Wed, 6 Jul 2022 11:56:20 +0000
Subject: [PATCH] Fix BoundaryBoxTests
(cherry picked from commit 09c646815dbb676a44da7c0ad47abc7b747ae702)
---
.../BoundingBox/BoundingBoxTest.cpp | 34 ++++++++++++++-----
src/gpu/GridGenerator/global.h | 6 ++--
2 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/gpu/GridGenerator/geometries/BoundingBox/BoundingBoxTest.cpp b/src/gpu/GridGenerator/geometries/BoundingBox/BoundingBoxTest.cpp
index f982b2fa5..67ac560b9 100644
--- a/src/gpu/GridGenerator/geometries/BoundingBox/BoundingBoxTest.cpp
+++ b/src/gpu/GridGenerator/geometries/BoundingBox/BoundingBoxTest.cpp
@@ -1,13 +1,19 @@
#include "gmock/gmock.h"
-#include <GridGenerator/geometries/Triangle/Triangle.h>
-#include <GridGenerator/geometries/BoundingBox/BoundingBox.h>
-#include <GridGenerator/geometries/Vertex/Vertex.h>
-
+#include "geometries/Triangle/Triangle.h"
+#include "geometries/BoundingBox/BoundingBox.h"
+#include "geometries/Vertex/Vertex.h"
+
+auto RealEq = [](auto value) {
+#ifdef VF_DOUBLE_ACCURACY
+ return testing::DoubleEq(value);
+#else
+ return testing::FloatEq(value);
+#endif
+};
using namespace testing;
-
TEST(BoundingBoxExactTest, findMinMaxFromTriangle)
{
BoundingBox box = BoundingBox::makeInvalidMinMaxBox();
@@ -19,7 +25,11 @@ TEST(BoundingBoxExactTest, findMinMaxFromTriangle)
real maxX = 110.0f;
real maxY = 50.0f;
real maxZ = 12122.23f;
- Triangle t = Triangle(Vertex(maxX, maxY - 10, minZ + 2), Vertex(minX, maxY, maxZ), Vertex(minX + 3, minY, minZ), Vertex(0.0f, 0.0f, 0.0f));
+ Vertex v1 = Vertex(maxX, maxY - 10, minZ + 2);
+ Vertex v2 = Vertex(minX, maxY, maxZ);
+ Vertex v3 = Vertex(minX + 3, minY, minZ);
+ Vertex normal = Vertex(0.0f, 0.0f, 0.0f);
+ Triangle t = Triangle(v1, v2, v3, normal);
box.setMinMax(t);
@@ -44,7 +54,11 @@ TEST(BoundingBoxTest, isInside_true)
box.maxY = 10.0f;
box.maxZ = 10.0f;
- Triangle t = Triangle(Vertex(1,1,1), Vertex(2,2,2), Vertex(3,3,3), Vertex(0.0f, 0.0f, 0.0f));
+ Vertex v1 = Vertex(1,1,1);
+ Vertex v2 = Vertex(2,2,2);
+ Vertex v3 = Vertex(3,3,3);
+ Vertex normal = Vertex(0.0f, 0.0f, 0.0f);
+ Triangle t = Triangle(v1, v2, v3, normal);
EXPECT_TRUE(box.isInside(t));
}
@@ -61,7 +75,11 @@ TEST(BoundingBoxTest, isInside_false)
box.maxY = 10.0f;
box.maxZ = 10.0f;
- Triangle t = Triangle(Vertex(1, 1, 1), Vertex(2, 2, 2), Vertex(3, 3, 11), Vertex(0.0f, 0.0f, 0.0f));
+ Vertex v1 = Vertex(1,1,1);
+ Vertex v2 = Vertex(2,2,2);
+ Vertex v3 = Vertex(3,3,11);
+ Vertex normal = Vertex(0.0f, 0.0f, 0.0f);
+ Triangle t = Triangle(v1, v2, v3, normal);
EXPECT_FALSE(box.isInside(t));
}
diff --git a/src/gpu/GridGenerator/global.h b/src/gpu/GridGenerator/global.h
index 19bedc95b..04f7e71e8 100644
--- a/src/gpu/GridGenerator/global.h
+++ b/src/gpu/GridGenerator/global.h
@@ -43,9 +43,9 @@
#include "GridGenerator_export.h"
-#include "PointerDefinitions.h"
-#include "Core/DataTypes.h"
+#include "basics/PointerDefinitions.h"
+#include "basics/Core/DataTypes.h"
-#include "Core/Logger/Logger.h"
+#include "basics/Core/Logger/Logger.h"
#endif
--
GitLab