From 8339c81d8843d2ce82a89ded11c41aca407341f5 Mon Sep 17 00:00:00 2001
From: Adam Wulkiewicz <adam.wulkiewicz@gmail.com>
Date: Wed, 27 Jun 2012 11:44:44 +0000
Subject: [PATCH] rtree tests divided into several files.

[SVN r79134]
---
 test/Jamfile.v2                               |  7 ++--
 test/algorithms/Jamfile.v2                    |  1 +
 test/algorithms/content.cpp                   |  1 +
 test/algorithms/intersection_content.cpp      |  1 +
 test/algorithms/is_valid.cpp                  |  1 +
 test/algorithms/margin.cpp                    |  1 +
 test/algorithms/minmaxdist.cpp                |  1 +
 test/algorithms/union_content.cpp             |  1 +
 test/geometry_index_test_common.hpp           |  1 +
 test/rtree/Jamfile.v2                         |  9 ++++-
 test/rtree/rtree2d_linear.cpp                 | 39 +++++++++++++++++++
 .../{rtree2d.cpp => rtree2d_quadratic.cpp}    |  9 +----
 test/rtree/rtree2d_rstar.cpp                  | 39 +++++++++++++++++++
 test/rtree/rtree3d_linear.cpp                 | 39 +++++++++++++++++++
 .../{rtree3d.cpp => rtree3d_quadratic.cpp}    |  9 +----
 test/rtree/rtree3d_rstar.cpp                  | 39 +++++++++++++++++++
 16 files changed, 177 insertions(+), 21 deletions(-)
 create mode 100644 test/rtree/rtree2d_linear.cpp
 rename test/rtree/{rtree2d.cpp => rtree2d_quadratic.cpp} (78%)
 create mode 100644 test/rtree/rtree2d_rstar.cpp
 create mode 100644 test/rtree/rtree3d_linear.cpp
 rename test/rtree/{rtree3d.cpp => rtree3d_quadratic.cpp} (78%)
 create mode 100644 test/rtree/rtree3d_rstar.cpp

diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index d0dee4afd..8eeb345e3 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -3,6 +3,7 @@
 # Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 # Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 # Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+# Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -14,9 +15,9 @@ project boost-geometry-index-test
     :
     requirements
         <include>.
-		<include>..
-		<include>../..
-		<include>../../..
+        <include>..
+        <include>../..
+        <include>../../..
         #<include>../../../boost/geometry/extensions/contrib/ttmath
         <toolset>msvc:<asynch-exceptions>on
     ;
diff --git a/test/algorithms/Jamfile.v2 b/test/algorithms/Jamfile.v2
index 619f13dd3..a1eecfe3b 100644
--- a/test/algorithms/Jamfile.v2
+++ b/test/algorithms/Jamfile.v2
@@ -3,6 +3,7 @@
 # Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 # Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 # Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+# Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/algorithms/content.cpp b/test/algorithms/content.cpp
index b6d01d8cf..d49253d01 100644
--- a/test/algorithms/content.cpp
+++ b/test/algorithms/content.cpp
@@ -4,6 +4,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
diff --git a/test/algorithms/intersection_content.cpp b/test/algorithms/intersection_content.cpp
index 70819d20c..07f427c12 100644
--- a/test/algorithms/intersection_content.cpp
+++ b/test/algorithms/intersection_content.cpp
@@ -4,6 +4,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
diff --git a/test/algorithms/is_valid.cpp b/test/algorithms/is_valid.cpp
index b7f4983c1..64ee21137 100644
--- a/test/algorithms/is_valid.cpp
+++ b/test/algorithms/is_valid.cpp
@@ -4,6 +4,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
diff --git a/test/algorithms/margin.cpp b/test/algorithms/margin.cpp
index 6a825b458..39284901d 100644
--- a/test/algorithms/margin.cpp
+++ b/test/algorithms/margin.cpp
@@ -4,6 +4,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
diff --git a/test/algorithms/minmaxdist.cpp b/test/algorithms/minmaxdist.cpp
index b0a84915b..4fd0af130 100644
--- a/test/algorithms/minmaxdist.cpp
+++ b/test/algorithms/minmaxdist.cpp
@@ -4,6 +4,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
diff --git a/test/algorithms/union_content.cpp b/test/algorithms/union_content.cpp
index 4a8c92e93..84313cc8e 100644
--- a/test/algorithms/union_content.cpp
+++ b/test/algorithms/union_content.cpp
@@ -4,6 +4,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
diff --git a/test/geometry_index_test_common.hpp b/test/geometry_index_test_common.hpp
index 3ca1da626..c7680a2a2 100644
--- a/test/geometry_index_test_common.hpp
+++ b/test/geometry_index_test_common.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
diff --git a/test/rtree/Jamfile.v2 b/test/rtree/Jamfile.v2
index 685361f2b..cb0004356 100644
--- a/test/rtree/Jamfile.v2
+++ b/test/rtree/Jamfile.v2
@@ -3,6 +3,7 @@
 # Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 # Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 # Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+# Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -10,7 +11,11 @@
 
 test-suite boost-geometry-index-rtree
     :
-    [ run rtree2d.cpp ]
-	[ run rtree3d.cpp ]
+    [ run rtree2d_linear.cpp ]
+    [ run rtree2d_quadratic.cpp ]
+    [ run rtree2d_rstar.cpp ]
+    [ run rtree3d_linear.cpp ]
+    [ run rtree3d_quadratic.cpp ]
+    [ run rtree3d_rstar.cpp ]
     ;
     
diff --git a/test/rtree/rtree2d_linear.cpp b/test/rtree/rtree2d_linear.cpp
new file mode 100644
index 000000000..5be2f5fa7
--- /dev/null
+++ b/test/rtree/rtree2d_linear.cpp
@@ -0,0 +1,39 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
+// 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)
+
+#include <rtree/test_rtree.hpp>
+
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::point<int, 2, bg::cs::cartesian> P2ic;
+    typedef bg::model::point<float, 2, bg::cs::cartesian> P2fc;
+    typedef bg::model::point<double, 2, bg::cs::cartesian> P2dc;
+
+    test_rtree<P2ic, bgi::linear<4, 2> >();
+    test_rtree<P2fc, bgi::linear<4, 2> >();
+    test_rtree<P2dc, bgi::linear<4, 2> >();
+    
+#ifdef HAVE_TTMATH
+    typedef bg::model::point<ttmath_big, 2, bg::cs::cartesian> P2ttmc;
+
+    test_rtree<P2ttmc, bgi::linear<4, 2> >();
+#endif
+
+    return 0;
+}
diff --git a/test/rtree/rtree2d.cpp b/test/rtree/rtree2d_quadratic.cpp
similarity index 78%
rename from test/rtree/rtree2d.cpp
rename to test/rtree/rtree2d_quadratic.cpp
index b8f01990e..c97d5ec66 100644
--- a/test/rtree/rtree2d.cpp
+++ b/test/rtree/rtree2d_quadratic.cpp
@@ -4,6 +4,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -24,22 +25,14 @@ int test_main(int, char* [])
     typedef bg::model::point<float, 2, bg::cs::cartesian> P2fc;
     typedef bg::model::point<double, 2, bg::cs::cartesian> P2dc;
 
-    test_rtree<P2ic, bgi::linear<4, 2> >();
-    test_rtree<P2fc, bgi::linear<4, 2> >();
-    test_rtree<P2dc, bgi::linear<4, 2> >();
     test_rtree<P2ic, bgi::quadratic<4, 2> >();
     test_rtree<P2fc, bgi::quadratic<4, 2> >();
     test_rtree<P2dc, bgi::quadratic<4, 2> >();
-    test_rtree<P2ic, bgi::rstar<4, 2> >();
-    test_rtree<P2fc, bgi::rstar<4, 2> >();
-    test_rtree<P2dc, bgi::rstar<4, 2> >();
     
 #ifdef HAVE_TTMATH
     typedef bg::model::point<ttmath_big, 2, bg::cs::cartesian> P2ttmc;
 
-    test_rtree<P2ttmc, bgi::linear<4, 2> >();
     test_rtree<P2ttmc, bgi::quadratic<4, 2> >();
-    test_rtree<P2ttmc, bgi::rstar<4, 2> >();
 #endif
 
     return 0;
diff --git a/test/rtree/rtree2d_rstar.cpp b/test/rtree/rtree2d_rstar.cpp
new file mode 100644
index 000000000..9c5bd52d3
--- /dev/null
+++ b/test/rtree/rtree2d_rstar.cpp
@@ -0,0 +1,39 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
+// 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)
+
+#include <rtree/test_rtree.hpp>
+
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::point<int, 2, bg::cs::cartesian> P2ic;
+    typedef bg::model::point<float, 2, bg::cs::cartesian> P2fc;
+    typedef bg::model::point<double, 2, bg::cs::cartesian> P2dc;
+
+    test_rtree<P2ic, bgi::rstar<4, 2> >();
+    test_rtree<P2fc, bgi::rstar<4, 2> >();
+    test_rtree<P2dc, bgi::rstar<4, 2> >();
+    
+#ifdef HAVE_TTMATH
+    typedef bg::model::point<ttmath_big, 2, bg::cs::cartesian> P2ttmc;
+
+    test_rtree<P2ttmc, bgi::rstar<4, 2> >();
+#endif
+
+    return 0;
+}
diff --git a/test/rtree/rtree3d_linear.cpp b/test/rtree/rtree3d_linear.cpp
new file mode 100644
index 000000000..cc123a8fd
--- /dev/null
+++ b/test/rtree/rtree3d_linear.cpp
@@ -0,0 +1,39 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
+// 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)
+
+#include <rtree/test_rtree.hpp>
+
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::point<int, 3, bg::cs::cartesian> P3ic;
+    typedef bg::model::point<float, 3, bg::cs::cartesian> P3fc;
+    typedef bg::model::point<double, 3, bg::cs::cartesian> P3dc;
+
+    test_rtree<P3ic, bgi::linear<4, 2> >();
+    test_rtree<P3fc, bgi::linear<4, 2> >();
+    test_rtree<P3dc, bgi::linear<4, 2> >();
+    
+#ifdef HAVE_TTMATH
+    typedef bg::model::point<ttmath_big, 3, bg::cs::cartesian> P3ttmc;
+
+    test_rtree<P3ttmc, bgi::linear<4, 2> >();
+#endif
+
+    return 0;
+}
diff --git a/test/rtree/rtree3d.cpp b/test/rtree/rtree3d_quadratic.cpp
similarity index 78%
rename from test/rtree/rtree3d.cpp
rename to test/rtree/rtree3d_quadratic.cpp
index 99525a026..a2894c5ef 100644
--- a/test/rtree/rtree3d.cpp
+++ b/test/rtree/rtree3d_quadratic.cpp
@@ -4,6 +4,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -24,22 +25,14 @@ int test_main(int, char* [])
     typedef bg::model::point<float, 3, bg::cs::cartesian> P3fc;
     typedef bg::model::point<double, 3, bg::cs::cartesian> P3dc;
 
-    test_rtree<P3ic, bgi::linear<4, 2> >();
-    test_rtree<P3fc, bgi::linear<4, 2> >();
-    test_rtree<P3dc, bgi::linear<4, 2> >();
     test_rtree<P3ic, bgi::quadratic<4, 2> >();
     test_rtree<P3fc, bgi::quadratic<4, 2> >();
     test_rtree<P3dc, bgi::quadratic<4, 2> >();
-    test_rtree<P3ic, bgi::rstar<4, 2> >();
-    test_rtree<P3fc, bgi::rstar<4, 2> >();
-    test_rtree<P3dc, bgi::rstar<4, 2> >();
     
 #ifdef HAVE_TTMATH
     typedef bg::model::point<ttmath_big, 3, bg::cs::cartesian> P3ttmc;
 
-    test_rtree<P3ttmc, bgi::linear<4, 2> >();
     test_rtree<P3ttmc, bgi::quadratic<4, 2> >();
-    test_rtree<P3ttmc, bgi::rstar<4, 2> >();
 #endif
 
     return 0;
diff --git a/test/rtree/rtree3d_rstar.cpp b/test/rtree/rtree3d_rstar.cpp
new file mode 100644
index 000000000..1af873a46
--- /dev/null
+++ b/test/rtree/rtree3d_rstar.cpp
@@ -0,0 +1,39 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
+// 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)
+
+#include <rtree/test_rtree.hpp>
+
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::point<int, 3, bg::cs::cartesian> P3ic;
+    typedef bg::model::point<float, 3, bg::cs::cartesian> P3fc;
+    typedef bg::model::point<double, 3, bg::cs::cartesian> P3dc;
+
+    test_rtree<P3ic, bgi::rstar<4, 2> >();
+    test_rtree<P3fc, bgi::rstar<4, 2> >();
+    test_rtree<P3dc, bgi::rstar<4, 2> >();
+    
+#ifdef HAVE_TTMATH
+    typedef bg::model::point<ttmath_big, 3, bg::cs::cartesian> P3ttmc;
+
+    test_rtree<P3ttmc, bgi::rstar<4, 2> >();
+#endif
+
+    return 0;
+}