Merge pull request #172 from awulkiew/feature/rearrange_tests

Feature/rearrange tests

test/Jamfile.v2

@@ -29,4 +29,3 @@ build-project policies ;
 build-project io ;
 build-project util ;
 build-project views ;
-build-project multi ;

test/algorithms/Jamfile.v2

@@ -8,6 +8,7 @@
 # Modifications copyright (c) 2014, Oracle and/or its affiliates.
 #
 # Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -24,67 +25,45 @@ test-suite boost-geometry-algorithms
     [ run convex_hull.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run correct.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run convert.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run covered_by.cpp ]
-    [ run crosses.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run difference.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
-    [ run difference_linear_linear.cpp ]
-    [ run difference_pl_pl.cpp ]
-    [ run disjoint.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run disjoint_coverage.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run distance.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run distance_areal_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run distance_linear_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run distance_linear_linear.cpp ]
-    [ run distance_pointlike_areal.cpp ]
-    [ run distance_pointlike_linear.cpp ]
-    [ run distance_pointlike_pointlike.cpp ]
-    [ run distance_se_pl_pl.cpp ]
     [ run envelope.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run equals.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run expand.cpp ]
     [ run for_each.cpp ]
-    [ run intersection.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
-    [ run intersection_linear_linear.cpp ]
-    [ run intersection_pl_pl.cpp ]
-    [ run intersects.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run is_simple.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run is_valid.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run length.cpp ]
     [ run make.cpp ]
+    [ run multi_area.cpp ]
+    [ run multi_centroid.cpp ]
+    [ run multi_convert.cpp ]
+    [ run multi_convex_hull.cpp ]
+    [ run multi_correct.cpp ]
+    [ run multi_envelope.cpp ]
+    [ run multi_for_each.cpp ]
+    [ run multi_length.cpp ]
+    [ run multi_num_geometries.cpp ]
+    [ run multi_num_interior_rings.cpp ]
+    [ run multi_num_points.cpp ]
+    [ run multi_perimeter.cpp ]
+    [ run multi_reverse.cpp ]
+    [ run multi_simplify.cpp ]
+    [ run multi_transform.cpp ]
+    [ run multi_unique.cpp ]
     [ run num_geometries.cpp ]
     [ run num_interior_rings.cpp ]
     [ run num_points.cpp ]
     [ run num_segments.cpp ]
-    [ run overlaps.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run perimeter.cpp ]
     [ run point_on_surface.cpp ]
-    [ run relate_areal_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run relate_linear_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run relate_linear_linear.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run relate_pointlike_xxx.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run remove_spikes.cpp ]
     [ run reverse.cpp ]
     [ run simplify.cpp ]
-    [ run sym_difference_linear_linear.cpp ]
-    [ run touches.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run transform.cpp ]
-    [ run union.cpp                : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
-    [ run union_linear_linear.cpp ]
-    [ run union_pl_pl.cpp ]
     [ run unique.cpp ]
-    [ run within.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run within_areal_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run within_linear_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run within_linear_linear.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run within_pointlike_xxx.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]    
     ;
 
-build-project overlay 
-    ;
-
-build-project buffer
-    ;
-    
-build-project detail 
-    ;
-    
+build-project buffer ;
+build-project detail ;
+build-project distance ;
+build-project overlay ;
+build-project relational_operations ;
+build-project set_operations ;

test/algorithms/distance/Jamfile.v2

@@ -0,0 +1,27 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+#
+# Use, modification and distribution is subject to the Boost Software License,
+# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+test-suite boost-geometry-algorithms-distance
+    :
+    [ run distance.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run distance_areal_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run distance_linear_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run distance_linear_linear.cpp ]
+    [ run distance_pointlike_areal.cpp ]
+    [ run distance_pointlike_linear.cpp ]
+    [ run distance_pointlike_pointlike.cpp ]
+    [ run distance_se_pl_pl.cpp ]
+    ;

test/algorithms/distance/distance.cpp

@@ -16,7 +16,7 @@
 #include <string>
 #include <sstream>
 
-#include <algorithms/test_distance.hpp>
+#include "test_distance.hpp"
 
 #include <boost/mpl/if.hpp>
 #include <boost/array.hpp>

test/algorithms/distance/test_distance_common.hpp

@@ -39,8 +39,7 @@
 #include <boost/geometry/algorithms/distance.hpp>
 #include <boost/geometry/algorithms/comparable_distance.hpp>
 
-#include "from_wkt.hpp"
-
+#include <from_wkt.hpp>
 #include <string_from_type.hpp>
 
 

test/algorithms/distance/test_distance_se_common.hpp

@@ -39,8 +39,7 @@
 #include <boost/geometry/algorithms/distance.hpp>
 #include <boost/geometry/algorithms/comparable_distance.hpp>
 
-#include "from_wkt.hpp"
-
+#include <from_wkt.hpp>
 #include <string_from_type.hpp>
 
 

test/algorithms/is_simple.cpp

@@ -36,7 +36,7 @@
 #include <boost/geometry/algorithms/is_valid.hpp>
 #include <boost/geometry/algorithms/is_simple.hpp>
 
-#include "from_wkt.hpp"
+#include <from_wkt.hpp>
 
 #ifdef BOOST_GEOMETRY_TEST_DEBUG
 #include "pretty_print_geometry.hpp"

test/algorithms/is_valid.cpp

@@ -16,7 +16,7 @@
 
 #include <boost/test/included/unit_test.hpp>
 
-#include "from_wkt.hpp"
+#include <from_wkt.hpp>
 #include "test_is_valid.hpp"
 
 

test/algorithms/overlay/Jamfile.v2

@@ -21,6 +21,7 @@ test-suite boost-geometry-algorithms-overlay
     [ run get_turns.cpp ]
     [ run get_turns_linear_linear.cpp ]
     [ run get_turns_linear_areal.cpp ]
+    [ run multi_traverse.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <define>BOOST_GEOMETRY_RESCALE_TO_ROBUST ]
     [ run relative_order.cpp ]
     [ run select_rings.cpp ]
     [ run self_intersection_points.cpp ]

test/algorithms/overlay/get_turns_linear_areal.cpp

@@ -21,7 +21,7 @@
 #include <boost/geometry/geometries/geometries.hpp>
 
 //TEST
-//#include "to_svg.hpp"
+//#include <to_svg.hpp>
 
 template <typename T>
 void test_all()

test/algorithms/relational_operations/Jamfile.v2

@@ -0,0 +1,33 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+#
+# Use, modification and distribution is subject to the Boost Software License,
+# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+test-suite boost-geometry-algorithms-relational
+    :
+    [ run covered_by.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run crosses.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run equals.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run intersects.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run multi_covered_by.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run multi_equals.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run multi_intersects.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run multi_touches.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run overlaps.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run touches.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    ;
+
+build-project disjoint ;
+build-project relate ;
+build-project within ;

test/algorithms/relational_operations/covered_by.cpp

@@ -7,7 +7,7 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <algorithms/test_covered_by.hpp>
+#include "test_covered_by.hpp"
 
 
 #include <boost/geometry/geometries/geometries.hpp>

test/algorithms/relational_operations/crosses.cpp

@@ -11,7 +11,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_crosses.hpp>
+#include "test_crosses.hpp"
 
 template <typename P>
 void test_pl()

test/algorithms/relational_operations/disjoint/Jamfile.v2

@@ -0,0 +1,22 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+#
+# Use, modification and distribution is subject to the Boost Software License,
+# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+test-suite boost-geometry-algorithms-disjoint
+    :
+    [ run disjoint.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run disjoint_coverage.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run multi_disjoint.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    ;

test/algorithms/relational_operations/disjoint/disjoint.cpp

@@ -13,7 +13,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
-#include <algorithms/test_disjoint.hpp>
+#include "test_disjoint.hpp"
 
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>

test/algorithms/relational_operations/disjoint/disjoint_coverage.cpp

@@ -41,7 +41,7 @@
 
 #include <boost/geometry/algorithms/disjoint.hpp>
 
-#include "from_wkt.hpp"
+#include <from_wkt.hpp>
 
 
 #ifdef HAVE_TTMATH

test/algorithms/relational_operations/disjoint/multi_disjoint.cpp

@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
-#include <algorithms/test_disjoint.hpp>
+#include "test_disjoint.hpp"
 
 #include <boost/geometry/strategies/strategies.hpp>
 

test/algorithms/relational_operations/equals.cpp

@@ -11,7 +11,7 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <algorithms/test_equals.hpp>
+#include "test_equals.hpp"
 
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>

test/algorithms/relational_operations/intersects.cpp

@@ -10,7 +10,7 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <algorithms/test_intersects.hpp>
+#include "test_intersects.hpp"
 
 
 #include <boost/geometry/geometries/geometries.hpp>

test/algorithms/relational_operations/multi_covered_by.cpp

@@ -22,7 +22,7 @@
 #include <boost/geometry/io/wkt/wkt.hpp>
 #include <boost/geometry/multi/io/wkt/wkt.hpp>
 
-#include <algorithms/test_covered_by.hpp>
+#include "test_covered_by.hpp"
 
 
 template <typename P>

test/algorithms/relational_operations/multi_equals.cpp

@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
-#include <algorithms/test_equals.hpp>
+#include "test_equals.hpp"
 
 #include <boost/geometry/multi/algorithms/area.hpp>
 #include <boost/geometry/multi/algorithms/equals.hpp>

test/algorithms/relational_operations/multi_intersects.cpp

@@ -13,7 +13,7 @@
 
 #include <geometry_test_common.hpp>
 
-#include <algorithms/test_intersects.hpp>
+#include "test_intersects.hpp"
 
 #include <boost/geometry.hpp>
 

test/algorithms/relational_operations/multi_touches.cpp

@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
-#include <algorithms/test_touches.hpp>
+#include "test_touches.hpp"
 
 #include <boost/geometry/multi/algorithms/area.hpp>
 #include <boost/geometry/multi/algorithms/num_geometries.hpp>

test/algorithms/relational_operations/overlaps.cpp

@@ -11,7 +11,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_overlaps.hpp>
+#include "test_overlaps.hpp"
 
 template <typename P>
 void test_box_box_2d()

test/algorithms/relational_operations/relate/Jamfile.v2

@@ -0,0 +1,23 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+#
+# Use, modification and distribution is subject to the Boost Software License,
+# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+test-suite boost-geometry-algorithms-relate
+    :
+    [ run relate_areal_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run relate_linear_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run relate_linear_linear.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run relate_pointlike_xxx.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    ;

test/algorithms/relational_operations/relate/relate_areal_areal.cpp

@@ -11,7 +11,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_relate.hpp>
+#include "test_relate.hpp"
 
 //TEST
 //#include <to_svg.hpp>

test/algorithms/relational_operations/relate/relate_linear_areal.cpp

@@ -11,7 +11,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_relate.hpp>
+#include "test_relate.hpp"
 
 //TEST
 //#include <to_svg.hpp>

test/algorithms/relational_operations/relate/relate_linear_linear.cpp

@@ -11,7 +11,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_relate.hpp>
+#include "test_relate.hpp"
 
 //TEST
 //#include <to_svg.hpp>

test/algorithms/relational_operations/relate/relate_pointlike_xxx.cpp

@@ -11,7 +11,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_relate.hpp>
+#include "test_relate.hpp"
 
 //TEST
 //#include <to_svg.hpp>

test/algorithms/relational_operations/touches.cpp

@@ -11,7 +11,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_touches.hpp>
+#include "test_touches.hpp"
 
 template <typename P>
 void test_all()

test/algorithms/relational_operations/within/Jamfile.v2

@@ -0,0 +1,25 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+#
+# Use, modification and distribution is subject to the Boost Software License,
+# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+test-suite boost-geometry-algorithms-within
+    :
+    [ run multi_within.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run within.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run within_areal_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run within_linear_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run within_linear_linear.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run within_pointlike_xxx.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]    
+    ;

test/algorithms/relational_operations/within/multi_within.cpp

@@ -22,7 +22,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
-#include <algorithms/test_within.hpp>
+#include "test_within.hpp"
 
 
 template <typename P>

test/algorithms/relational_operations/within/within.cpp

@@ -12,7 +12,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_within.hpp>
+#include "test_within.hpp"
 
 
 #include <boost/geometry/geometries/geometries.hpp>

test/algorithms/relational_operations/within/within_areal_areal.cpp

@@ -12,7 +12,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_within.hpp>
+#include "test_within.hpp"
 
 
 #include <boost/geometry/geometries/geometries.hpp>

test/algorithms/relational_operations/within/within_linear_areal.cpp

@@ -12,7 +12,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_within.hpp>
+#include "test_within.hpp"
 
 
 #include <boost/geometry/geometries/geometries.hpp>

test/algorithms/relational_operations/within/within_linear_linear.cpp

@@ -12,7 +12,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_within.hpp>
+#include "test_within.hpp"
 
 
 #include <boost/geometry/geometries/geometries.hpp>

test/algorithms/relational_operations/within/within_pointlike_xxx.cpp

@@ -12,7 +12,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_within.hpp>
+#include "test_within.hpp"
 
 
 #include <boost/geometry/geometries/geometries.hpp>

test/algorithms/set_operations/Jamfile.v2

@@ -0,0 +1,20 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+#
+# Use, modification and distribution is subject to the Boost Software License,
+# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+build-project difference ;
+build-project intersection ;
+build-project sym_difference ;
+build-project union ;

test/algorithms/set_operations/difference/Jamfile.v2

@@ -0,0 +1,24 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+#
+# Use, modification and distribution is subject to the Boost Software License,
+# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+test-suite boost-geometry-algorithms-difference
+    :
+    [ run difference.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
+    [ run difference_linear_linear.cpp ]
+    [ run difference_pl_pl.cpp ]
+    [ run multi_difference.cpp  : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
+    [ run multi_difference_spike.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
+    ;

test/algorithms/set_operations/difference/difference.cpp

@@ -25,10 +25,10 @@
 
 #include <boost/geometry/geometries/point_xy.hpp>
 
-#include <algorithms/test_difference.hpp>
+#include "test_difference.hpp"
 #include <algorithms/test_overlay.hpp>
 #include <algorithms/overlay/overlay_cases.hpp>
-#include <multi/algorithms/overlay/multi_overlay_cases.hpp>
+#include <algorithms/overlay/multi_overlay_cases.hpp>
 #include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 

test/algorithms/set_operations/difference/difference_pl_pl.cpp

@@ -20,7 +20,7 @@
 
 #include <boost/test/included/unit_test.hpp>
 
-#include "test_set_ops_pl_pl.hpp"
+#include "../test_set_ops_pl_pl.hpp"
 
 #include <boost/geometry/multi/geometries/multi_point.hpp>
 

test/algorithms/set_operations/difference/multi_difference.cpp

@@ -23,9 +23,9 @@
 //#define BOOST_GEOMETRY_DEBUG_TRAVERSE
 
 
-#include <algorithms/test_difference.hpp>
+#include "test_difference.hpp"
 #include <algorithms/test_overlay.hpp>
-#include <multi/algorithms/overlay/multi_overlay_cases.hpp>
+#include <algorithms/overlay/multi_overlay_cases.hpp>
 
 #include <boost/geometry/multi/algorithms/correct.hpp>
 #include <boost/geometry/multi/algorithms/intersection.hpp>

test/algorithms/set_operations/difference/multi_difference_spike.cpp

@@ -13,7 +13,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_geometries.hpp>
 
-#include <algorithms/test_difference.hpp>
+#include "test_difference.hpp"
 
 
 template <typename P, bool ClockWise, bool Closed>

test/algorithms/set_operations/difference/test_difference_linear_linear.hpp

@@ -10,10 +10,10 @@
 #ifndef BOOST_GEOMETRY_TEST_DIFFERENCE_LINEAR_LINEAR_HPP
 #define BOOST_GEOMETRY_TEST_DIFFERENCE_LINEAR_LINEAR_HPP
 
-#include "from_wkt.hpp"
 #include <boost/geometry/geometry.hpp>
-#include "test_set_ops_linear_linear.hpp"
-#include "to_svg.hpp"
+#include "../test_set_ops_linear_linear.hpp"
+#include <from_wkt.hpp>
+#include <to_svg.hpp>
 
 
 //==================================================================

test/algorithms/set_operations/intersection/Jamfile.v2

@@ -0,0 +1,23 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+#
+# Use, modification and distribution is subject to the Boost Software License,
+# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+test-suite boost-geometry-algorithms-intersection
+    :
+    [ run intersection.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
+    [ run intersection_linear_linear.cpp ]
+    [ run intersection_pl_pl.cpp ]
+    [ run multi_intersection.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
+    ;

test/algorithms/set_operations/intersection/intersection.cpp

@@ -26,7 +26,7 @@
 
 #include <boost/geometry/util/rational.hpp>
 
-#include <algorithms/test_intersection.hpp>
+#include "test_intersection.hpp"
 #include <algorithms/test_overlay.hpp>
 
 #include <algorithms/overlay/overlay_cases.hpp>

test/algorithms/set_operations/intersection/intersection_pl_pl.cpp

@@ -20,7 +20,7 @@
 
 #include <boost/test/included/unit_test.hpp>
 
-#include "test_set_ops_pl_pl.hpp"
+#include "../test_set_ops_pl_pl.hpp"
 
 #include <boost/geometry/multi/geometries/multi_point.hpp>
 

test/algorithms/set_operations/intersection/multi_intersection.cpp

@@ -16,9 +16,9 @@
 
 // #define BOOST_GEOMETRY_DEBUG_ASSEMBLE
 
-#include <algorithms/test_intersection.hpp>
+#include "test_intersection.hpp"
 #include <algorithms/test_overlay.hpp>
-#include <multi/algorithms/overlay/multi_overlay_cases.hpp>
+#include <algorithms/overlay/multi_overlay_cases.hpp>
 
 #include <boost/geometry/multi/algorithms/correct.hpp>
 #include <boost/geometry/multi/algorithms/intersection.hpp>

test/algorithms/set_operations/intersection/test_intersection_linear_linear.hpp

@@ -10,11 +10,11 @@
 #ifndef BOOST_GEOMETRY_TEST_INTERSECTION_LINEAR_LINEAR_HPP
 #define BOOST_GEOMETRY_TEST_INTERSECTION_LINEAR_LINEAR_HPP
 
-#include "from_wkt.hpp"
 #include <boost/geometry/multi/geometries/multi_point.hpp>
 #include <boost/geometry/geometry.hpp>
-#include "test_set_ops_linear_linear.hpp"
-#include "to_svg.hpp"
+#include "../test_set_ops_linear_linear.hpp"
+#include <from_wkt.hpp>
+#include <to_svg.hpp>
 
 
 //==================================================================

test/algorithms/set_operations/sym_difference/Jamfile.v2

@@ -0,0 +1,20 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+#
+# Use, modification and distribution is subject to the Boost Software License,
+# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+test-suite boost-geometry-algorithms-sym_difference
+    :
+    [ run sym_difference_linear_linear.cpp ]
+    ;

test/algorithms/set_operations/sym_difference/test_sym_difference_linear_linear.hpp

@@ -10,10 +10,10 @@
 #ifndef BOOST_GEOMETRY_TEST_SYM_DIFFERENCE_LINEAR_LINEAR_HPP
 #define BOOST_GEOMETRY_TEST_SYM_DIFFERENCE_LINEAR_LINEAR_HPP
 
-#include "from_wkt.hpp"
 #include <boost/geometry/geometry.hpp>
-#include "test_set_ops_linear_linear.hpp"
-#include "to_svg.hpp"
+#include "../test_set_ops_linear_linear.hpp"
+#include <from_wkt.hpp>
+#include <to_svg.hpp>
 
 
 //==================================================================

test/algorithms/set_operations/test_set_ops_pl_pl.hpp

@@ -15,8 +15,8 @@
 
 namespace bg = ::boost::geometry;
 
-#include "from_wkt.hpp"
-#include "to_svg.hpp"
+#include <from_wkt.hpp>
+#include <to_svg.hpp>
 
 #include <algorithm>
 #include <fstream>