From 3482cca1eaa409cd8a7ab8c49604d9ad3c5e653b Mon Sep 17 00:00:00 2001
From: Brandon Lai-Cheong <blaicheo@uwaterloo.ca>
Date: Thu, 28 Nov 2024 11:14:19 -0500
Subject: [PATCH] fixed tests
---
CMakeLists.txt | 1 -
tests/union_tests.cpp | 4 +--
tests/unit_tests/contourize_tests.cpp | 6 ++--
.../unit_tests/edge_direction_intr_tests.cpp | 30 -------------------
4 files changed, 5 insertions(+), 36 deletions(-)
delete mode 100644 tests/unit_tests/edge_direction_intr_tests.cpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6d36f7..4f554ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,6 @@ add_executable(
tests/edge_union_cases.cpp
tests/unit_tests/convex_triangulation_tests.cpp
src/utilities/convex_triangulation.cpp
- tests/unit_tests/edge_direction_intr_tests.cpp
tests/unit_tests/contourize_tests.cpp
src/debug_utilities/print_triangles.cpp
src/utilities/split_triangle.cpp
diff --git a/tests/union_tests.cpp b/tests/union_tests.cpp
index fa4f09f..5eaef1c 100644
--- a/tests/union_tests.cpp
+++ b/tests/union_tests.cpp
@@ -26,7 +26,7 @@ TEST(UnionTests, TwoIntersections)
std::vector<Triangle> expected{
Triangle({6,1,1}, {4,3,1}, {3.333333,1.66666,1}, 2),
- Triangle({4,3,1}, {3.33333,1.66667,1}, {4,1,1},2),
+ Triangle({6,1,1}, {3.33333,1.66667,1}, {4,1,1},2),
Triangle({0,0}, {5,0}, {2,3}, 1)};
EXPECT_EQ(ts, expected);
}
@@ -142,4 +142,4 @@ TEST(UnionTests, StarTest)
TEST (UnionTests, DepthTest) {
-}
\ No newline at end of file
+}
diff --git a/tests/unit_tests/contourize_tests.cpp b/tests/unit_tests/contourize_tests.cpp
index aadd4ca..dc3fddb 100644
--- a/tests/unit_tests/contourize_tests.cpp
+++ b/tests/unit_tests/contourize_tests.cpp
@@ -4,11 +4,11 @@
#include <intersections.h>
TEST(ContourizeTest, Simple) {
- std::vector<Point> points{{0,0}, {0,5}, {2, 3}};
+ std::vector<Point> points{{0,0}, {5,0}, {2, 3}};
auto result = contourize(points);
- std::vector<Point> expected{{0,0}, {0,5}, {2, 3}};
+ std::vector<Point> expected{{0,0}, {5,0}, {2, 3}};
EXPECT_EQ(result, expected);
}
@@ -35,4 +35,4 @@ TEST(ContourizeTest, TestCase3) {
std::vector<Point> expected{{3,1}, {4,1}, {3.33333, 1.6666}};
EXPECT_EQ(result, expected);
-}*/
\ No newline at end of file
+}*/
diff --git a/tests/unit_tests/edge_direction_intr_tests.cpp b/tests/unit_tests/edge_direction_intr_tests.cpp
deleted file mode 100644
index efe5281..0000000
--- a/tests/unit_tests/edge_direction_intr_tests.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <intersections.h>
-#include <gtest/gtest.h>
-#include <edge.h>
-
-TEST(EdgeDirectionIntersectionTests, BasicTests) {
- Edge e1{ {5,0}, {2,3}};
-
- Edge e2{{3,1}, {6,1}};
-
- auto result = intersectionWithinEdgeDirection(e1, e2);
-
- ASSERT_TRUE(result.has_value());
-
- Point expected = Point{4,1};
- EXPECT_EQ(result.value(), expected);
-
- Edge e3{{4,3}, {3,1}};
- auto result2 = intersectionWithinEdgeDirection(e3, e1);
-
- ASSERT_TRUE(result2.has_value());
- Point expected2 = Point{3.33333,1.66667};
- EXPECT_EQ(result2.value(), expected2);
-
- Edge e4{{3,1}, {4,3}};
- Edge e5{{0,0}, {5,0}};
-
- auto result3 = intersectionWithinEdgeDirection(e4, e5);
- EXPECT_FALSE(result3.has_value()) << result3.value();
-}
-
--
GitLab