From c0af10d32400ebdb14638513aa277890591c95cb Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 18 Mar 2015 12:43:30 +0100
Subject: [PATCH] fix wkb_formats_test

---
 tests/cpp_tests/wkb_formats_test.cpp | 54 +++++++++++-----------------
 1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/tests/cpp_tests/wkb_formats_test.cpp b/tests/cpp_tests/wkb_formats_test.cpp
index 1ad26f384..678613c08 100644
--- a/tests/cpp_tests/wkb_formats_test.cpp
+++ b/tests/cpp_tests/wkb_formats_test.cpp
@@ -68,49 +68,37 @@ int main(int argc, char** argv)
     try {
 
         // spatialite blob
-
         mapnik::new_geometry::geometry geom = mapnik::geometry_utils::from_wkb((const char*)sp_valid_blob,
                                                                                sizeof(sp_valid_blob) / sizeof(sp_valid_blob[0]),
                                                                                mapnik::wkbSpatiaLite);
         BOOST_TEST(mapnik::new_geometry::is_valid(geom) && mapnik::new_geometry::is_simple(geom));
 
-#if 0 // FIXME
-        BOOST_TEST(
-            mapnik::geometry_utils::from_wkb(feature->paths(),
-                                             (const char*)sp_valid_blob,
-                                             sizeof(sp_valid_blob) / sizeof(sp_valid_blob[0]),
-                                             mapnik::wkbAuto)
-        );
+        geom = mapnik::geometry_utils::from_wkb((const char*)sp_valid_blob,
+                                                sizeof(sp_valid_blob) / sizeof(sp_valid_blob[0]),
+                                                mapnik::wkbAuto);
+        BOOST_TEST(mapnik::new_geometry::is_valid(geom) && mapnik::new_geometry::is_simple(geom));
 
-        BOOST_TEST(
-            mapnik::geometry_utils::from_wkb(feature->paths(),
-                                             (const char*)sp_invalid_blob,
-                                             sizeof(sp_invalid_blob) / sizeof(sp_invalid_blob[0]),
-                                             mapnik::wkbAuto) == false
-        );
 
+
+        BOOST_TEST_THROWS(mapnik::geometry_utils::from_wkb((const char*)sp_invalid_blob,
+                                                           sizeof(sp_invalid_blob) / sizeof(sp_invalid_blob[0]),
+                                                           mapnik::wkbAuto), std::exception);
         // sqlite generic wkb blob
-        BOOST_TEST(
-            mapnik::geometry_utils::from_wkb(feature->paths(),
-                                             (const char*)sq_valid_blob,
-                                             sizeof(sq_valid_blob) / sizeof(sq_valid_blob[0]),
-                                             mapnik::wkbGeneric)
-        );
 
-        BOOST_TEST(
-            mapnik::geometry_utils::from_wkb(feature->paths(),
-                                             (const char*)sq_valid_blob,
-                                             sizeof(sq_valid_blob) / sizeof(sq_valid_blob[0]),
-                                             mapnik::wkbAuto)
-        );
+        geom = mapnik::geometry_utils::from_wkb((const char*)sq_valid_blob,
+                                                sizeof(sq_valid_blob) / sizeof(sq_valid_blob[0]),
+                                                mapnik::wkbGeneric);
+        BOOST_TEST(mapnik::new_geometry::is_valid(geom) && mapnik::new_geometry::is_simple(geom));
 
-        BOOST_TEST(
-            mapnik::geometry_utils::from_wkb(feature->paths(),
-                                             (const char*)sq_invalid_blob,
-                                             sizeof(sq_invalid_blob) / sizeof(sq_invalid_blob[0]),
-                                             mapnik::wkbGeneric) == false
-        );
-#endif
+        geom = mapnik::geometry_utils::from_wkb( (const char*)sq_valid_blob,
+                                                 sizeof(sq_valid_blob) / sizeof(sq_valid_blob[0]),
+                                                 mapnik::wkbAuto);
+
+        BOOST_TEST(mapnik::new_geometry::is_valid(geom) && mapnik::new_geometry::is_simple(geom));
+
+        BOOST_TEST_THROWS(mapnik::geometry_utils::from_wkb((const char*)sq_invalid_blob,
+                                                           sizeof(sq_invalid_blob) / sizeof(sq_invalid_blob[0]),
+                                                           mapnik::wkbGeneric), std::exception);
 
     } catch (std::exception const& ex) {
         BOOST_TEST(false);