[Boost-commit] svn:boost r85481 - trunk/libs/geometry/test/algorithms

Subject: [Boost-commit] svn:boost r85481 - trunk/libs/geometry/test/algorithms
From: barend.gehrels_at_[hidden]
Date: 2013-08-26 17:36:22

Author: barendgehrels
Date: 2013-08-26 17:36:22 EDT (Mon, 26 Aug 2013)
New Revision: 85481
URL: http://svn.boost.org/trac/boost/changeset/85481

Log:
[geometry] cleanup test removing defines, moving testing-only-one-type to Jamfile

Text files modified: 
   trunk/libs/geometry/test/algorithms/Jamfile.v2       |     6 +++---                                  
   trunk/libs/geometry/test/algorithms/difference.cpp   |    17 -----------------                       
   trunk/libs/geometry/test/algorithms/intersection.cpp |     9 ---------                               
   trunk/libs/geometry/test/algorithms/union.cpp        |     9 ---------                               
   4 files changed, 3 insertions(+), 38 deletions(-)

Modified: trunk/libs/geometry/test/algorithms/Jamfile.v2
==============================================================================
--- trunk/libs/geometry/test/algorithms/Jamfile.v2	Mon Aug 26 17:15:47 2013	(r85480)
+++ trunk/libs/geometry/test/algorithms/Jamfile.v2	2013-08-26 17:36:22 EDT (Mon, 26 Aug 2013)	(r85481)
@@ -20,14 +20,14 @@
     [ run correct.cpp ]
     [ run convert.cpp ]
     [ run covered_by.cpp ]
-    [ run difference.cpp ]
+    [ run difference.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE ]
     [ run disjoint.cpp ]
     [ run distance.cpp ]
     [ run envelope.cpp ]
     [ run equals.cpp ]
     [ run expand.cpp ]
     [ run for_each.cpp ]
-    [ run intersection.cpp ]
+    [ run intersection.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE ]
     [ run intersects.cpp ]
     [ run length.cpp ]
     [ run make.cpp ]
@@ -37,7 +37,7 @@
     [ run simplify.cpp ]
     [ run touches.cpp ]
     [ run transform.cpp ]
-    [ run union.cpp ]
+    [ run union.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE ]
     [ run unique.cpp ]
     [ run within.cpp ]
     ;

Modified: trunk/libs/geometry/test/algorithms/difference.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/difference.cpp	Mon Aug 26 17:15:47 2013	(r85480)
+++ trunk/libs/geometry/test/algorithms/difference.cpp	2013-08-26 17:36:22 EDT (Mon, 26 Aug 2013)	(r85481)
@@ -7,20 +7,6 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-// #define TEST_ISOVIST
-
-//#define HAVE_TTMATH
-
-//#define BOOST_GEOMETRY_CHECK_WITH_POSTGIS
-
-//#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
-//#define BOOST_GEOMETRY_DEBUG_INTERSECTION
-//#define BOOST_GEOMETRY_DEBUG_TRAVERSE
-//#define BOOST_GEOMETRY_DEBUG_FOLLOW
-//#define BOOST_GEOMETRY_DEBUG_ASSEMBLE
-//#define BOOST_GEOMETRY_DEBUG_IDENTIFIER
-
-
 #include <iostream>
 #include <string>
 #include <iomanip>
@@ -35,9 +21,6 @@
 
 #include <boost/geometry/geometries/point_xy.hpp>
 
-//#include <boost/geometry/extensions/gis/io/wkb/read_wkb.hpp>
-//#include <boost/geometry/extensions/gis/io/wkb/utility.hpp>
-
 #include <algorithms/test_difference.hpp>
 #include <algorithms/test_overlay.hpp>
 #include <algorithms/overlay/overlay_cases.hpp>

Modified: trunk/libs/geometry/test/algorithms/intersection.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/intersection.cpp	Mon Aug 26 17:15:47 2013	(r85480)
+++ trunk/libs/geometry/test/algorithms/intersection.cpp	2013-08-26 17:36:22 EDT (Mon, 26 Aug 2013)	(r85481)
@@ -15,17 +15,8 @@
 #include <iostream>
 #include <string>
 
-#define BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE
 #define TEST_ISOVIST
 
-//#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
-//#define BOOST_GEOMETRY_DEBUG_INTERSECTION
-//#define BOOST_GEOMETRY_DEBUG_TRAVERSE
-//#define BOOST_GEOMETRY_DEBUG_FOLLOW
-//#define BOOST_GEOMETRY_DEBUG_ASSEMBLE
-//#define BOOST_GEOMETRY_DEBUG_IDENTIFIER
-
-
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/register/linestring.hpp>
 

Modified: trunk/libs/geometry/test/algorithms/union.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/union.cpp	Mon Aug 26 17:15:47 2013	(r85480)
+++ trunk/libs/geometry/test/algorithms/union.cpp	2013-08-26 17:36:22 EDT (Mon, 26 Aug 2013)	(r85481)
@@ -15,13 +15,8 @@
 #include <iostream>
 #include <string>
 
-#define BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE
 #define TEST_ISOVIST
 
-//#define BOOST_GEOMETRY_DEBUG_ASSEMBLE
-//#define BOOST_GEOMETRY_DEBUG_IDENTIFIER
-
-
 #include <algorithms/test_union.hpp>
 #include <algorithms/test_overlay.hpp>
 
@@ -423,10 +418,6 @@
 int test_main(int, char* [])
 {
     test_all<bg::model::d2::point_xy<double> >();
-#if defined(HAVE_TTMATH)
-    std::cout << "Testing TTMATH" << std::endl;
-    test_all<bg::model::d2::point_xy<ttmath_big> >();
-#endif
 
 #if ! defined(BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE)
     test_all<bg::model::d2::point_xy<float> >();