diff --git a/CMakeLists.txt b/CMakeLists.txt index e6d36f7ec0e0506a19f3ad0219abab2cab9b3c71..4f554cefc90ba0805e1d236dbe400cd2e68d832b 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 fa4f09fa7088a7b6ca0163caade87e791517d507..5eaef1cdd98dfbc85386d4061b8a59f5af61e186 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 aadd4cada3d80358730203c43a9e74b5212d73c3..dc3fddb70ee0a6b0fb946f9b68d066a7d0991a43 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 efe52816d259e9c49d26d69558c396170e4223dd..0000000000000000000000000000000000000000 --- 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(); -} -