From df33e8a92aaaacf124d0f22f9d0a42faa3a8c8af Mon Sep 17 00:00:00 2001 From: Menelaos Karavelas Date: Thu, 3 Apr 2014 00:08:11 +0300 Subject: [PATCH] [set ops] modify way of calling multilinestring_equals (due to changes in multilinestring_equals) --- .../test_difference_linear_linear.hpp | 22 ++++++------------- .../test_intersection_linear_linear.hpp | 15 +++++-------- .../test_sym_difference_linear_linear.hpp | 15 +++++-------- test/algorithms/test_union_linear_linear.hpp | 15 +++++-------- 4 files changed, 22 insertions(+), 45 deletions(-) diff --git a/test/algorithms/test_difference_linear_linear.hpp b/test/algorithms/test_difference_linear_linear.hpp index db01d1b88..025c6cda7 100644 --- a/test/algorithms/test_difference_linear_linear.hpp +++ b/test/algorithms/test_difference_linear_linear.hpp @@ -55,11 +55,7 @@ private: bg::reverse(mls_output); } - BOOST_CHECK((multilinestring_equals - < - MultiLineString, MultiLineString - >::apply(mls_diff, mls_output) - )); + BOOST_CHECK( equals::apply(mls_diff, mls_output) ); set_operation_output("difference", case_id, geometry1, geometry2, mls_output); @@ -75,17 +71,12 @@ private: bg::difference(geometry1, geometry2, ls_vector_output); bg::difference(geometry1, geometry2, ls_deque_output); - BOOST_CHECK((multilinestring_equals - < - MultiLineString, linestring_vector - >::apply(mls_diff, ls_vector_output) - )); + BOOST_CHECK(multilinestring_equals::apply(mls_diff, + ls_vector_output)); + + BOOST_CHECK(multilinestring_equals::apply(mls_diff, + ls_deque_output)); - BOOST_CHECK((multilinestring_equals - < - MultiLineString, linestring_deque - >::apply(mls_diff, ls_deque_output) - )); #ifdef GEOMETRY_TEST_DEBUG std::cout << "Done!" << std::endl << std::endl; #endif @@ -95,6 +86,7 @@ private: std::cout << "Geometry #1: " << bg::wkt(geometry1) << std::endl; std::cout << "Geometry #2: " << bg::wkt(geometry2) << std::endl; std::cout << "difference : " << bg::wkt(mls_output) << std::endl; + std::cout << "expected difference : " << bg::wkt(mls_diff) << std::endl; std::cout << std::endl; std::cout << "************************************" << std::endl; std::cout << std::endl; diff --git a/test/algorithms/test_intersection_linear_linear.hpp b/test/algorithms/test_intersection_linear_linear.hpp index 2d55708ff..8e8067257 100644 --- a/test/algorithms/test_intersection_linear_linear.hpp +++ b/test/algorithms/test_intersection_linear_linear.hpp @@ -79,17 +79,12 @@ private: bg::intersection(geometry1, geometry2, ls_vector_output); bg::intersection(geometry1, geometry2, ls_deque_output); - BOOST_CHECK((multilinestring_equals - < - MultiLineString, linestring_vector - >::apply(mls_int1, ls_vector_output) - )); + BOOST_CHECK(multilinestring_equals::apply(mls_int1, + ls_vector_output)); + + BOOST_CHECK(multilinestring_equals::apply(mls_int1, + ls_deque_output)); - BOOST_CHECK((multilinestring_equals - < - MultiLineString, linestring_deque - >::apply(mls_int1, ls_deque_output) - )); #ifdef GEOMETRY_TEST_DEBUG std::cout << "Done!" << std::endl << std::endl; #endif diff --git a/test/algorithms/test_sym_difference_linear_linear.hpp b/test/algorithms/test_sym_difference_linear_linear.hpp index c007c5cc1..406a803cf 100644 --- a/test/algorithms/test_sym_difference_linear_linear.hpp +++ b/test/algorithms/test_sym_difference_linear_linear.hpp @@ -77,17 +77,12 @@ private: bg::sym_difference(geometry1, geometry2, ls_vector_output); bg::sym_difference(geometry1, geometry2, ls_deque_output); - BOOST_CHECK((multilinestring_equals - < - MultiLineString, linestring_vector - >::apply(mls_sym_diff, ls_vector_output) - )); + BOOST_CHECK(multilinestring_equals::apply(mls_sym_diff, + ls_vector_output)); + + BOOST_CHECK(multilinestring_equals::apply(mls_sym_diff, + ls_deque_output)); - BOOST_CHECK((multilinestring_equals - < - MultiLineString, linestring_deque - >::apply(mls_sym_diff, ls_deque_output) - )); #ifdef GEOMETRY_TEST_DEBUG std::cout << "Done!" << std::endl << std::endl; #endif diff --git a/test/algorithms/test_union_linear_linear.hpp b/test/algorithms/test_union_linear_linear.hpp index 214963168..98c4b32d2 100644 --- a/test/algorithms/test_union_linear_linear.hpp +++ b/test/algorithms/test_union_linear_linear.hpp @@ -78,17 +78,12 @@ private: bg::union_(geometry1, geometry2, ls_vector_output); bg::union_(geometry1, geometry2, ls_deque_output); - BOOST_CHECK((multilinestring_equals - < - MultiLineString, linestring_vector - >::apply(mls_union1, ls_vector_output) - )); + BOOST_CHECK(multilinestring_equals::apply(mls_union1, + ls_vector_output)); + + BOOST_CHECK(multilinestring_equals::apply(mls_union1, + ls_deque_output)); - BOOST_CHECK((multilinestring_equals - < - MultiLineString, linestring_deque - >::apply(mls_union1, ls_deque_output) - )); #ifdef GEOMETRY_TEST_DEBUG std::cout << "Done!" << std::endl << std::endl; #endif