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

bring back failing geometry tests

Browse source
This commit is contained in:
artemp 2016-06-29 18:40:47 +01:00
parent abe175c14f
commit c27653066d
4 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
benchmark/build.py
View file

@ -35,7 +35,7 @@ benchmarks = [
#"test_to_double.cpp", #"test_to_double.cpp",
#"test_to_int.cpp", #"test_to_int.cpp",
#"test_utf_encoding.cpp" #"test_utf_encoding.cpp"
#"test_polygon_clipping.cpp", "test_polygon_clipping.cpp",
#"test_polygon_clipping_rendering.cpp", #"test_polygon_clipping_rendering.cpp",
"test_proj_transform1.cpp", "test_proj_transform1.cpp",
"test_expression_parse.cpp", "test_expression_parse.cpp",

2
test/unit/geometry/geometry_strategy_test.cpp
View file

@ -11,7 +11,6 @@
#include <mapnik/view_strategy.hpp> #include <mapnik/view_strategy.hpp>
TEST_CASE("geometry strategy tests") { TEST_CASE("geometry strategy tests") {
#if 0
SECTION("proj and view strategy") { SECTION("proj and view strategy") {
using namespace mapnik::geometry; using namespace mapnik::geometry;
mapnik::box2d<double> e(-20037508.342789,-20037508.342789,20037508.342789,20037508.342789); 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); assert_g_equal(r, o);
} }
} // END SECTION } // END SECTION
#endif
} // END TEST CASE } // END TEST CASE

2
test/unit/geometry/has_empty.cpp
View file

@ -135,7 +135,7 @@ SECTION("multi-polygon") {
mapnik::geometry::linear_ring<double> ring; mapnik::geometry::linear_ring<double> ring;
poly.push_back(std::move(ring)); poly.push_back(std::move(ring));
geom.emplace_back(std::move(poly)); geom.emplace_back(std::move(poly));
//REQUIRE(mapnik::geometry::has_empty(geom)); REQUIRE(mapnik::geometry::has_empty(geom));
} }
{ {
mapnik::geometry::multi_polygon<double> geom; mapnik::geometry::multi_polygon<double> geom;

2
test/unit/geometry/is_empty.cpp
View file

@ -55,7 +55,7 @@ SECTION("polygon") {
mapnik::geometry::polygon<double> poly; mapnik::geometry::polygon<double> poly;
mapnik::geometry::linear_ring<double> ring; mapnik::geometry::linear_ring<double> ring;
poly.push_back(std::move(ring)); poly.push_back(std::move(ring));
//REQUIRE(mapnik::geometry::is_empty(poly)); REQUIRE(mapnik::geometry::is_empty(poly));
} }
{ {
mapnik::geometry::polygon<double> poly; mapnik::geometry::polygon<double> poly;