From 1dcd1cf509b657fa9dc63ab706659b2cfd5f592d Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Thu, 2 Apr 2015 12:52:55 -0700 Subject: [PATCH] remove tests for deleted rotation_range --- test/miscellaneous/rotation_range.cpp | 139 -------------------------- test/test.gyp | 1 - 2 files changed, 140 deletions(-) delete mode 100644 test/miscellaneous/rotation_range.cpp diff --git a/test/miscellaneous/rotation_range.cpp b/test/miscellaneous/rotation_range.cpp deleted file mode 100644 index 3345dc0a9..000000000 --- a/test/miscellaneous/rotation_range.cpp +++ /dev/null @@ -1,139 +0,0 @@ -#include -#include "../fixtures/util.hpp" - -#include - -#include - -using namespace mbgl; - -double deg(double x) { return x / M_PI * 180.0; } - -TEST(RotationRange, mergeCollisions) { - // merge overlapping ranges - EXPECT_EQ( - CollisionRange({{1.0 / 8.0 * M_PI, 6.0 / 8.0 * M_PI}}), - mergeCollisions( - CollisionList( - {{CollisionRange({{3.0 / 8.0 * M_PI, 5.0 / 8.0 * M_PI}}), - CollisionRange({{4.0 / 8.0 * M_PI, 6.0 / 8.0 * M_PI}}), - CollisionRange({{1.0 / 8.0 * M_PI, 2.0 / 8.0 * M_PI}})}}), - PlacementRange({{2.0 * M_PI, 0.0}}))); - - // ignore collision within ignore range - EXPECT_EQ( - CollisionRange({{5.0 / 4.0 * M_PI, 6.0 / 4.0 * M_PI}}), - mergeCollisions(CollisionList({{CollisionRange({{M_PI / 2, M_PI}}), - CollisionRange({{5.0 / 4.0 * M_PI, - 6.0 / 4.0 * M_PI}})}}), - PlacementRange({{0, M_PI}}))); - - // crop collision that ends within ignore range - EXPECT_EQ(CollisionRange({{1.0 / 2.0 * M_PI, 3.0 / 4.0 * M_PI}}), - mergeCollisions( - CollisionList({{CollisionRange({{1.0 / 2.0 * M_PI, M_PI}})}}), - PlacementRange({{3.0 / 4.0 * M_PI, 3.0 / 2.0 * M_PI}}))); - - // crop collision that starts within ignore range - EXPECT_EQ(CollisionRange({{3.0 / 4.0 * M_PI, M_PI}}), - mergeCollisions( - CollisionList({{CollisionRange({{1.0 / 2.0 * M_PI, M_PI}})}}), - PlacementRange({{1.0 / 4.0 * M_PI, 3.0 / 4.0 * M_PI}}))); -} - -TEST(RotationRange, rotatingFixedCollisions) { - // returns collisions - - auto collisions = rotatingFixedCollisions( - CollisionRect{CollisionPoint{-1, 0}, CollisionPoint{0, 1}}, - CollisionRect{CollisionPoint{1.4142, -10}, CollisionPoint{10, 10}}); - - EXPECT_EQ(static_cast(1), collisions.size()); - EXPECT_EQ(135, std::round(deg(collisions.front()[0]))); - EXPECT_EQ(135, std::round(deg(collisions.front()[1]))); -} - -TEST(RotationRange, cornerBoxCollisions) { - { - // returns intersections in sorted order as angles 0..2PI - CollisionList list; - cornerBoxCollisions( - std::back_inserter(list), CollisionPoint{1, 1}, - CollisionCorners{{CollisionPoint{0, 0}, CollisionPoint{0, 10}, - CollisionPoint{10, 10}, CollisionPoint{10, 0}}}); - EXPECT_EQ(static_cast(1), list.size()); - EXPECT_EQ((CollisionRange{{M_PI / 4.0, M_PI * 7.0 / 4.0}}), list[0]); - } - - { - // handles no intersections - CollisionList list; - cornerBoxCollisions( - std::back_inserter(list), CollisionPoint{200, 200}, - CollisionCorners{{CollisionPoint{1, 1}, CollisionPoint{1, 10}, - CollisionPoint{10, 10}, CollisionPoint{10, 1}}}); - EXPECT_EQ(static_cast(0), list.size()); - } -} - -TEST(RotationRange, circleEdgeCollisions) { - { - // handles two intersection points - CollisionAngles list; - circleEdgeCollisions(std::back_inserter(list), CollisionPoint{0, 1}, 1, - CollisionPoint{-10, 0}, CollisionPoint{10, 0}); - std::sort(list.begin(), list.end()); - EXPECT_EQ(static_cast(2), list.size()); - EXPECT_EQ(static_cast(M_PI / 2), list[0]); - EXPECT_EQ(static_cast(M_PI * 3.0 / 2.0), list[1]); - } - - { - // handles one intersection point - CollisionAngles list; - circleEdgeCollisions(std::back_inserter(list), CollisionPoint{0, 1}, 1, - CollisionPoint{0, 0}, CollisionPoint{10, 0}); - EXPECT_EQ(static_cast(1), list.size()); - EXPECT_EQ(static_cast(M_PI / 2), list[0]); - } - - { - // only returns intersections within the line segment - CollisionAngles list; - circleEdgeCollisions(std::back_inserter(list), CollisionPoint{0, 1}, 1, - CollisionPoint{3, 1}, CollisionPoint{30, 1}); - EXPECT_EQ(static_cast(0), list.size()); - } - - { - // doesnt count tangetial intersections as collisions - CollisionAngles list; - circleEdgeCollisions(std::back_inserter(list), CollisionPoint{0, 1}, 1, - CollisionPoint{-10, 1}, CollisionPoint{10, 1}); - EXPECT_EQ(static_cast(0), list.size()); - } -} - -TEST(RotationRange, rotatingRotatingCollisions) { - { - // basically works - CollisionList c = rotatingRotatingCollisions( - CollisionRect{{-1, 0}, {1, 0}}, CollisionRect{{-1, 0}, {1, 0}}, - CollisionAnchor{1, 1}); - - EXPECT_EQ(static_cast(2), c.size()); - EXPECT_EQ(135, std::round(deg(c[0][0]))); - EXPECT_EQ(135, std::round(deg(c[0][1]))); - EXPECT_EQ(315, std::round(deg(c[1][0]))); - EXPECT_EQ(315, std::round(deg(c[1][1]))); - } - - { - // checks if the two boxes are close enough to collide at that angle - CollisionList c = rotatingRotatingCollisions( - CollisionRect{{-1, 0}, {1, 0}}, CollisionRect{{-1, 0}, {1, 0}}, - CollisionAnchor{2, 2}); - - EXPECT_EQ(static_cast(0), c.size()); - } -} diff --git a/test/test.gyp b/test/test.gyp index c333a4006..6c9f3da3b 100644 --- a/test/test.gyp +++ b/test/test.gyp @@ -44,7 +44,6 @@ 'miscellaneous/functions.cpp', 'miscellaneous/mapbox.cpp', 'miscellaneous/merge_lines.cpp', - 'miscellaneous/rotation_range.cpp', 'miscellaneous/style_parser.cpp', 'miscellaneous/text_conversions.cpp', 'miscellaneous/tile.cpp',