*** empty log message ***

[SVN r27148]

test/Jamfile

@@ -10,94 +10,28 @@
 
 subproject libs/range/test ;
 
-SEARCH on testing.jam = $(BOOST_BUILD_PATH) ;
-include testing.jam ;
-DEPENDS all : test ;
+import testing ;
 
+rule range-test ( name )
 {
-test-suite range
-    : [ run
-            array.cpp
-        : :
-        :
-        : array_test
-       ]         
-     [ run
-            iterator_pair.cpp
-            : :
-        :
-        : iterator_pair_test
-       ]         
-     [ run
-            std_container.cpp
-            : :
-        :
-        : std_container_test
-       ]         
-     [ run            
-        string.cpp
-            : :
-        :
-        : string_test
-       ]         
-     [ run            
-        iterator_range.cpp
-            : :
-        :
-        : iterator_range
-       ]         
-     [ run            
-        sub_range.cpp
-            : :
-        :
-        : sub_range
-       ]         
+    return [
+        run $(name).cpp
+        <lib>../../test/build/boost_unit_test_framework
+        : : : <include>$(BOOST_ROOT)
+        ] ;
+}
 
-     [ run
-            partial_workaround.cpp    
-            : :
-        :
-        : workaround_test
-       ]
-     [ run
-             algorithm_example.cpp    
-            : :
-        :
-        : example_test
-       ]
-       
-     [ run
-             reversible_range.cpp    
-            : :
-        :
-        : reversible_range_test
-       ] 
-     [ run
-             const_ranges.cpp    
-            : :
-        :
-        : const_ranges
-       ] 
-#     [ run
-#             compat3.cpp    
-#            : :
-#        :
-#        : compat3_test
-#       ] 
-#   
-#     [ run
-#             adl_conformance.cpp    
-#            : :
-#        :
-#        : adl_conformance
-#       ] 
-#     [ run
-#             adl_conformance_no_using.cpp    
-#            : :
-#        :
-#        : adl_conformance_no_using_declaration
-#       ] 
+test-suite range :
+    [ range-test array ]
+    [ range-test iterator_pair ]
+    [ range-test std_container ]
+    [ range-test string ]
+    [ range-test iterator_range ]
+    [ range-test sub_range ]
+    [ range-test partial_workaround ]
+    [ range-test algorithm_example ]
+    [ range-test reversible_range ]
+    [ range-test const_ranges ]
 
     ;
 
-}

test/algorithm_example.cpp

@@ -17,7 +17,6 @@
 
 #include <boost/range/functions.hpp>
 #include <boost/range/metafunctions.hpp>
-#include <boost/test/unit_test.hpp>
 #include <boost/test/test_tools.hpp>
 #include <iostream>
 #include <algorithm>
@@ -80,9 +79,8 @@ void check_algorithm()
 
 }
 
-#include <boost/test/included/unit_test_framework.hpp> 
-
-using boost::unit_test_framework::test_suite;
+#include <boost/test/unit_test.hpp>
+using boost::unit_test::test_suite;
 
 test_suite* init_unit_test_suite( int argc, char* argv[] )
 {

test/array.cpp

@@ -19,15 +19,9 @@
 #include <boost/range.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/type_traits.hpp>
-#include <boost/test/unit_test.hpp>
 #include <boost/test/test_tools.hpp>
 #include <iostream>
 
-// This should be included before "using namespace boost",
-// otherwise gcc headers will be confused with boost::iterator
-// namespace.
-#include <boost/test/included/unit_test_framework.hpp> 
-
 using namespace boost;
 using namespace std;
 
@@ -69,9 +63,8 @@ void check_array()
 
 }
 
-
-
-using boost::unit_test_framework::test_suite;
+#include <boost/test/unit_test.hpp>
+using boost::unit_test::test_suite;
 
 test_suite* init_unit_test_suite( int argc, char* argv[] )
 {

test/const_ranges.cpp

@@ -17,13 +17,9 @@
 #endif
 
 #include <boost/range.hpp>
+#include <boost/test/test_tools.hpp>
 #include <string>
 
-// This should be included before "using namespace boost",
-// otherwise gcc headers will be confused with boost::iterator
-// namespace.
-#include <boost/test/included/unit_test_framework.hpp> 
-
 using namespace boost;
 using namespace std;
 
@@ -52,7 +48,8 @@ void check_const_ranges()
 
 
 
-using boost::unit_test_framework::test_suite;
+#include <boost/test/unit_test.hpp>
+using boost::unit_test::test_suite;
 
 test_suite* init_unit_test_suite( int argc, char* argv[] )
 {

test/iterator_pair.cpp

@@ -19,12 +19,10 @@
 #include <boost/range/metafunctions.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/type_traits.hpp>
-#include <boost/test/unit_test.hpp>
 #include <boost/test/test_tools.hpp>
 #include <vector>
 
 using namespace boost;
-using boost::unit_test_framework::test_suite;
 
 void check_iterator_pair()
 {
@@ -79,10 +77,8 @@ void check_iterator_pair()
 }
 
 
-
-#include <boost/test/included/unit_test_framework.hpp> 
-
-using boost::unit_test_framework::test_suite;
+#include <boost/test/unit_test.hpp>
+using boost::unit_test::test_suite;
 
 test_suite* init_unit_test_suite( int argc, char* argv[] )
 {

test/iterator_range.cpp

@@ -16,18 +16,13 @@
 #  pragma warn -8057 // unused argument argc/argv in Boost.Test
 #endif
 
+
 #include <boost/range/iterator_range.hpp>
 #include <boost/range/functions.hpp>
-#include <boost/test/unit_test.hpp>
 #include <boost/test/test_tools.hpp>
 #include <iostream>
 #include <string>
 
-// This should be included before "using namespace boost",
-// otherwise gcc headers will be confused with boost::iterator
-// namespace.
-#include <boost/test/included/unit_test_framework.hpp> 
-
 using namespace boost;
 using namespace std;
 
@@ -85,10 +80,21 @@ void check_iterator_range()
     BOOST_CHECK( rrr == rr );
     BOOST_CHECK( !( rrr != rr ) );
     BOOST_CHECK( !( rrr < rr ) );
+
+    const irange cr = make_iterator_range( str );
+    BOOST_CHECK_EQUAL( cr.front(), 'h' );
+    BOOST_CHECK_EQUAL( cr.back(), 'd' );
+    BOOST_CHECK_EQUAL( cr[1], 'e' );
+
+    rrr = make_iterator_range( str, 1, -1 );
+    BOOST_CHECK( rrr == "ello worl" );
+    rrr = make_iterator_range( rrr, -1, 1 );
+    BOOST_CHECK( rrr == str );
 }
 
 
-using boost::unit_test_framework::test_suite;
+#include <boost/test/unit_test.hpp>
+using boost::unit_test::test_suite;
 
 test_suite* init_unit_test_suite( int argc, char* argv[] )
 {

test/partial_workaround.cpp

@@ -33,7 +33,6 @@
 
 #include <boost/static_assert.hpp>
 #include <boost/type_traits.hpp>
-#include <boost/test/unit_test.hpp>
 #include <boost/test/test_tools.hpp>
 #include <iostream>
 #include <vector>
@@ -92,9 +91,8 @@ void check_partial_workaround()
 }
 
 
-#include <boost/test/included/unit_test_framework.hpp> 
-
-using boost::unit_test_framework::test_suite;
+#include <boost/test/unit_test.hpp>
+using boost::unit_test::test_suite;
 
 test_suite* init_unit_test_suite( int argc, char* argv[] )
 {

test/reversible_range.cpp

@@ -22,7 +22,6 @@
 #include <boost/range/end.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/type_traits.hpp>
-#include <boost/test/unit_test.hpp>
 #include <boost/test/test_tools.hpp>
 #include <vector>
 #include <algorithm>
@@ -82,10 +81,9 @@ void check_iterator()
 }
 
 
+#include <boost/test/unit_test.hpp>
+using boost::unit_test::test_suite;
 
-#include <boost/test/included/unit_test_framework.hpp> 
-
-using boost::unit_test_framework::test_suite;
 
 test_suite* init_unit_test_suite( int argc, char* argv[] )
 {

test/std_container.cpp

@@ -20,7 +20,6 @@
 #include <boost/range/metafunctions.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/type_traits.hpp>
-#include <boost/test/unit_test.hpp>
 #include <boost/test/test_tools.hpp>
 #include <vector>
 
@@ -61,11 +60,8 @@ void check_std_container()
 }
 
 
-
-
-#include <boost/test/included/unit_test_framework.hpp> 
-
-using boost::unit_test_framework::test_suite;
+#include <boost/test/unit_test.hpp>
+using boost::unit_test::test_suite;
 
 test_suite* init_unit_test_suite( int argc, char* argv[] )
 {

test/string.cpp

@@ -22,7 +22,6 @@
 #include <boost/static_assert.hpp>
 #include <boost/type_traits.hpp>
 #include <boost/test/test_tools.hpp>
-#include <boost/test/unit_test.hpp>
 #include <boost/config.hpp>
 #include <vector>
 #include <fstream>
@@ -184,12 +183,10 @@ void check_string()
 }
 
 
+#include <boost/test/unit_test.hpp>
+using boost::unit_test::test_suite;
 
 
-#include <boost/test/included/unit_test_framework.hpp> 
-
-using boost::unit_test_framework::test_suite;
-
 test_suite* init_unit_test_suite( int argc, char* argv[] )
 {
     test_suite* test = BOOST_TEST_SUITE( "Range Test Suite" );

test/sub_range.cpp

@@ -16,19 +16,12 @@
 #  pragma warn -8057 // unused argument argc/argv in Boost.Test
 #endif
 
-#include <boost/range/iterator_range.hpp>
 #include <boost/range/sub_range.hpp>
-#include <boost/test/unit_test.hpp>
 #include <boost/test/test_tools.hpp>
 #include <iostream>
 #include <string>
 #include <vector>
 
-// This should be included before "using namespace boost",
-// otherwise gcc headers will be confused with boost::iterator
-// namespace.
-#include <boost/test/included/unit_test_framework.hpp> 
-
 using namespace boost;
 using namespace std;
 
@@ -41,10 +34,9 @@ struct add_one
     }
 };
 
-void check_iterator_range()
+void check_sub_range()
 {
-   
-   
+      
     typedef string::iterator               iterator;
     typedef string::const_iterator         const_iterator;
     typedef iterator_range<iterator>       irange;
@@ -139,16 +131,30 @@ void check_iterator_range()
     BOOST_CHECK( rrr == rr );
     BOOST_CHECK( !( rrr != rr ) );
     BOOST_CHECK( !( rrr < rr ) );
-}
 
+    const irange cr = make_iterator_range( str );
+    BOOST_CHECK_EQUAL( cr.front(), 'h' );
+    BOOST_CHECK_EQUAL( cr.back(), 'd' );
+    BOOST_CHECK_EQUAL( cr[1], 'e' );
 
-using boost::unit_test_framework::test_suite;
+    rrr = make_iterator_range( str, 1, -1 );
+    BOOST_CHECK( rrr == "ello worl" );
+    rrr = make_iterator_range( rrr, -1, 1 );
+    BOOST_CHECK( rrr == str );
+    rrr.front() = 'H';
+    rrr.back()  = 'D';
+    rrr[1]      = 'E';
+    BOOST_CHECK( rrr == "HEllo worlD" );
+}   
+
+#include <boost/test/unit_test.hpp>
+using boost::unit_test::test_suite;
 
 test_suite* init_unit_test_suite( int argc, char* argv[] )
 {
     test_suite* test = BOOST_TEST_SUITE( "Range Test Suite" );
 
-    test->add( BOOST_TEST_CASE( &check_iterator_range ) );
+    test->add( BOOST_TEST_CASE( &check_sub_range ) );
 
     return test;
 }