sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix wkb_formats_test

Browse source
This commit is contained in:
artemp 2015-03-18 12:43:30 +01:00
parent 236c21ffbd
commit c0af10d324
1 changed files with 21 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
tests/cpp_tests/wkb_formats_test.cpp
View file

@ -68,49 +68,37 @@ int main(int argc, char** argv)
try { try {
// spatialite blob // spatialite blob
mapnik::new_geometry::geometry geom = mapnik::geometry_utils::from_wkb((const char*)sp_valid_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]), sizeof(sp_valid_blob) / sizeof(sp_valid_blob[0]),
mapnik::wkbSpatiaLite); mapnik::wkbSpatiaLite);
BOOST_TEST(mapnik::new_geometry::is_valid(geom) && mapnik::new_geometry::is_simple(geom)); BOOST_TEST(mapnik::new_geometry::is_valid(geom) && mapnik::new_geometry::is_simple(geom));
#if 0 // FIXME geom = mapnik::geometry_utils::from_wkb((const char*)sp_valid_blob,
BOOST_TEST( sizeof(sp_valid_blob) / sizeof(sp_valid_blob[0]),
mapnik::geometry_utils::from_wkb(feature->paths(), mapnik::wkbAuto);
(const char*)sp_valid_blob, BOOST_TEST(mapnik::new_geometry::is_valid(geom) && mapnik::new_geometry::is_simple(geom));
sizeof(sp_valid_blob) / sizeof(sp_valid_blob[0]),
mapnik::wkbAuto)
);
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 // 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( geom = mapnik::geometry_utils::from_wkb((const char*)sq_valid_blob,
mapnik::geometry_utils::from_wkb(feature->paths(), sizeof(sq_valid_blob) / sizeof(sq_valid_blob[0]),
(const char*)sq_valid_blob, mapnik::wkbGeneric);
sizeof(sq_valid_blob) / sizeof(sq_valid_blob[0]), BOOST_TEST(mapnik::new_geometry::is_valid(geom) && mapnik::new_geometry::is_simple(geom));
mapnik::wkbAuto)
);
BOOST_TEST( geom = mapnik::geometry_utils::from_wkb( (const char*)sq_valid_blob,
mapnik::geometry_utils::from_wkb(feature->paths(), sizeof(sq_valid_blob) / sizeof(sq_valid_blob[0]),
(const char*)sq_invalid_blob, mapnik::wkbAuto);
sizeof(sq_invalid_blob) / sizeof(sq_invalid_blob[0]),
mapnik::wkbGeneric) == false BOOST_TEST(mapnik::new_geometry::is_valid(geom) && mapnik::new_geometry::is_simple(geom));
);
#endif 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) { } catch (std::exception const& ex) {
BOOST_TEST(false); BOOST_TEST(false);