From c27653066dd43d45f24282835358071956f8196c Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 29 Jun 2016 18:40:47 +0100
Subject: [PATCH] bring back failing geometry tests

---
 benchmark/build.py                            | 2 +-
 test/unit/geometry/geometry_strategy_test.cpp | 2 --
 test/unit/geometry/has_empty.cpp              | 2 +-
 test/unit/geometry/is_empty.cpp               | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/benchmark/build.py b/benchmark/build.py
index b964ea78e..37ba86707 100644
--- a/benchmark/build.py
+++ b/benchmark/build.py
@@ -35,7 +35,7 @@ benchmarks = [
     #"test_to_double.cpp",
     #"test_to_int.cpp",
     #"test_utf_encoding.cpp"
-    #"test_polygon_clipping.cpp",
+    "test_polygon_clipping.cpp",
     #"test_polygon_clipping_rendering.cpp",
     "test_proj_transform1.cpp",
     "test_expression_parse.cpp",
diff --git a/test/unit/geometry/geometry_strategy_test.cpp b/test/unit/geometry/geometry_strategy_test.cpp
index 0c72a001c..cb20cb74a 100644
--- a/test/unit/geometry/geometry_strategy_test.cpp
+++ b/test/unit/geometry/geometry_strategy_test.cpp
@@ -11,7 +11,6 @@
 #include <mapnik/view_strategy.hpp>
 
 TEST_CASE("geometry strategy tests") {
-#if 0
 SECTION("proj and view strategy") {
     using namespace mapnik::geometry;
     mapnik::box2d<double> e(-20037508.342789,-20037508.342789,20037508.342789,20037508.342789);
@@ -183,5 +182,4 @@ SECTION("scaling strategies - double to int64") {
         assert_g_equal(r, o);
     }
 } // END SECTION
-#endif
 } // END TEST CASE
diff --git a/test/unit/geometry/has_empty.cpp b/test/unit/geometry/has_empty.cpp
index 38d6d4d7e..ff2e40f23 100644
--- a/test/unit/geometry/has_empty.cpp
+++ b/test/unit/geometry/has_empty.cpp
@@ -135,7 +135,7 @@ SECTION("multi-polygon") {
         mapnik::geometry::linear_ring<double> ring;
         poly.push_back(std::move(ring));
         geom.emplace_back(std::move(poly));
-        //REQUIRE(mapnik::geometry::has_empty(geom));
+        REQUIRE(mapnik::geometry::has_empty(geom));
     }
     {
         mapnik::geometry::multi_polygon<double> geom;
diff --git a/test/unit/geometry/is_empty.cpp b/test/unit/geometry/is_empty.cpp
index 8dfed1446..25ed8a487 100644
--- a/test/unit/geometry/is_empty.cpp
+++ b/test/unit/geometry/is_empty.cpp
@@ -55,7 +55,7 @@ SECTION("polygon") {
         mapnik::geometry::polygon<double> poly;
         mapnik::geometry::linear_ring<double> ring;
         poly.push_back(std::move(ring));
-        //REQUIRE(mapnik::geometry::is_empty(poly));
+        REQUIRE(mapnik::geometry::is_empty(poly));
     }
     {
         mapnik::geometry::polygon<double> poly;