[Boost-commit] svn:boost r43119 - in branches/unordered/trunk/libs/unordered/test: helpers unordered

From: daniel_james_at_[hidden]
Date: 2008-02-05 16:02:09

Author: danieljames
Date: 2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
New Revision: 43119
URL: http://svn.boost.org/trac/boost/changeset/43119

Log:
Use macros to run the normal unit tests in a similar manner to the exception
tests. Should allow me to switch between lightweight test and Boost.Test.

Text files modified: 
   branches/unordered/trunk/libs/unordered/test/helpers/exception_test.hpp           |    14 +++----                                 
   branches/unordered/trunk/libs/unordered/test/helpers/test.hpp                     |    79 +++++++++++++++++++++++++++++++++++++++ 
   branches/unordered/trunk/libs/unordered/test/unordered/assign_tests.cpp           |    50 +++++++++++--------------               
   branches/unordered/trunk/libs/unordered/test/unordered/at_tests.cpp               |    10 +++-                                    
   branches/unordered/trunk/libs/unordered/test/unordered/bucket_tests.cpp           |    19 +++++----                               
   branches/unordered/trunk/libs/unordered/test/unordered/compile_map.cpp            |    18 ++------                                
   branches/unordered/trunk/libs/unordered/test/unordered/compile_set.cpp            |    16 ++-----                                 
   branches/unordered/trunk/libs/unordered/test/unordered/constructor_tests.cpp      |    75 +++++++++++++------------------------   
   branches/unordered/trunk/libs/unordered/test/unordered/copy_tests.cpp             |    45 +++++++++++-----------                  
   branches/unordered/trunk/libs/unordered/test/unordered/equivalent_keys_tests.cpp  |    14 ++-----                                 
   branches/unordered/trunk/libs/unordered/test/unordered/erase_equiv_tests.cpp      |    24 +++--------                             
   branches/unordered/trunk/libs/unordered/test/unordered/erase_tests.cpp            |    44 +++++++++-------------                  
   branches/unordered/trunk/libs/unordered/test/unordered/find_tests.cpp             |    36 +++++++++---------                      
   branches/unordered/trunk/libs/unordered/test/unordered/insert_stable_tests.cpp    |    14 ++-----                                 
   branches/unordered/trunk/libs/unordered/test/unordered/insert_tests.cpp           |     2                                         
   branches/unordered/trunk/libs/unordered/test/unordered/load_factor_tests.cpp      |    31 +++++++++------                         
   branches/unordered/trunk/libs/unordered/test/unordered/rehash_tests.cpp           |    21 +++++++---                              
   branches/unordered/trunk/libs/unordered/test/unordered/simple_tests.cpp           |     8 ++--                                    
   branches/unordered/trunk/libs/unordered/test/unordered/swap_tests.cpp             |    35 ++++++++---------                       
   branches/unordered/trunk/libs/unordered/test/unordered/unnecessary_copy_tests.cpp |    32 ++++++++-------                         
   20 files changed, 304 insertions(+), 283 deletions(-)

Modified: branches/unordered/trunk/libs/unordered/test/helpers/exception_test.hpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/helpers/exception_test.hpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/helpers/exception_test.hpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -19,30 +19,28 @@
 #include <boost/preprocessor/cat.hpp>
 
 #if defined(BOOST_UNORDERED_USE_TEST)
-#   define UNORDERED_EXCEPTION_TEST_PREFIX
 #   define UNORDERED_EXCEPTION_TEST_CASE(name, test_func, type) \
-        BOOST_AUTO_TEST_CASE(name) \
+        UNORDERED_AUTO_TEST(name) \
         { \
             test_func< type > fixture; \
             ::test::exception_safety(fixture, BOOST_STRINGIZE(test_func<type>)); \
         }
-#    define UNORDERED_EXCEPTION_TEST_POSTFIX
 #    define UNORDERED_EPOINT_IMPL BOOST_ITEST_EPOINT
 #else
-#    define UNORDERED_EXCEPTION_TEST_PREFIX int main() {
-#    define UNORDERED_EXCEPTION_TEST_CASE(name, test_func, type) \
+#   define UNORDERED_EXCEPTION_TEST_CASE(name, test_func, type) \
+        UNORDERED_AUTO_TEST(name) \
         { \
             test_func< type > fixture; \
             ::test::lightweight::exception_safety(fixture, BOOST_STRINGIZE(test_func<type>)); \
         }
-#    define UNORDERED_EXCEPTION_TEST_POSTFIX return boost::report_errors(); }
 #    define UNORDERED_EPOINT_IMPL ::test::lightweight::epoint
 #endif
 
+#define UNORDERED_EXCEPTION_TEST_POSTFIX RUN_TESTS()
+
 #define RUN_EXCEPTION_TESTS(test_seq, param_seq) \
-    UNORDERED_EXCEPTION_TEST_PREFIX \
     BOOST_PP_SEQ_FOR_EACH_PRODUCT(RUN_EXCEPTION_TESTS_OP, (test_seq)(param_seq)) \
-    UNORDERED_EXCEPTION_TEST_POSTFIX
+    RUN_TESTS()
 
 #define RUN_EXCEPTION_TESTS_OP(r, product) \
     UNORDERED_EXCEPTION_TEST_CASE( \

Modified: branches/unordered/trunk/libs/unordered/test/helpers/test.hpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/helpers/test.hpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/helpers/test.hpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -7,13 +7,90 @@
 #define BOOST_UNORDERED_TEST_TEST_HEADER
 
 #if defined(BOOST_UNORDERED_USE_TEST)
+
 #include <boost/test/test_tools.hpp>
 #define UNORDERED_CHECK(x) BOOST_CHECK(x)
 #define UNORDERED_REQUIRE(x) BOOST_REQUIRE(x)
+#define UNORDERED_AUTO_TEST(x) BOOST_AUTO_TEST_CASE(x)
+#define RUN_TESTS()
+
 #else
+
 #include <boost/detail/lightweight_test.hpp>
+#include <boost/preprocessor/cat.hpp>
+
 #define UNORDERED_CHECK(x) BOOST_TEST(x)
-#define UNORDERED_REQUIRE(x) if(!(x)) { BOOST_ERROR(BOOST_STRINGIZE(x)); throw test::lightweight::test_failure(); }
+#define UNORDERED_REQUIRE(x) if(!(x)) { BOOST_ERROR(BOOST_STRINGIZE(x)); throw ::test::lightweight::test_failure(); }
+#define UNORDERED_AUTO_TEST(x) \
+    struct BOOST_PP_CAT(x, _type) : public ::test::registered_test_base { \
+        BOOST_PP_CAT(x, _type)() { \
+            ::test::test_list::add_test(this); \
+        } \
+        void run(); \
+    }; \
+    BOOST_PP_CAT(x, _type) x; \
+    void BOOST_PP_CAT(x, _type)::run()
+#define RUN_TESTS() int main() { ::test::test_list::run_tests(); return boost::report_errors(); }
+
+namespace test {
+    struct registered_test_base {
+        registered_test_base* next;
+        virtual void run() = 0;
+        virtual ~registered_test_base() {}
+    };
+
+    namespace test_list {
+        static inline registered_test_base*& first() {
+            static registered_test_base* ptr = 0;
+            return ptr;
+        }
+
+        static inline registered_test_base*& last() {
+            static registered_test_base* ptr = 0;
+            return ptr;
+        }
+
+        static inline void add_test(registered_test_base* test) {
+            if(last()) {
+                last()->next = test;
+            }
+            else {
+                first() = test;
+            }
+
+            last() = test;
+        }
+
+        static inline void run_tests() {
+            for(registered_test_base* i = first(); i; i = i->next)
+                i->run();
+        }
+    };
+}
+
 #endif
 
+#include <boost/preprocessor/seq/for_each_product.hpp>
+#include <boost/preprocessor/seq/fold_left.hpp>
+#include <boost/preprocessor/seq/to_tuple.hpp>
+#include <boost/preprocessor/seq/seq.hpp>
+#include <boost/preprocessor/cat.hpp>
+
+// Run test with every combination of the parameters (a sequence of sequences)
+#define UNORDERED_TEST(name, parameters) \
+    BOOST_PP_SEQ_FOR_EACH_PRODUCT(UNORDERED_TEST_OP, ((name)) parameters)
+
+#define UNORDERED_TEST_OP(r, product) \
+    UNORDERED_TEST_OP2( \
+        BOOST_PP_SEQ_HEAD(product), \
+        BOOST_PP_SEQ_TAIL(product))
+
+#define UNORDERED_TEST_OP2(name, params) \
+    UNORDERED_AUTO_TEST(BOOST_PP_SEQ_FOLD_LEFT(UNORDERED_TEST_OP_JOIN, name, params)) { \
+        name BOOST_PP_SEQ_TO_TUPLE(params); \
+    }
+
+#define UNORDERED_TEST_OP_JOIN(s, state, elem) \
+    BOOST_PP_CAT(state, BOOST_PP_CAT(_, elem))
+
 #endif

Modified: branches/unordered/trunk/libs/unordered/test/unordered/assign_tests.cpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/unordered/assign_tests.cpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/unordered/assign_tests.cpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -5,7 +5,7 @@
 
 #include <boost/unordered_set.hpp>
 #include <boost/unordered_map.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include "../helpers/test.hpp"
 #include "../objects/test.hpp"
 #include "../helpers/random_values.hpp"
 #include "../helpers/tracker.hpp"
@@ -13,6 +13,8 @@
 
 #include <iostream>
 
+namespace assign_tests {
+
 test::seed_t seed(96785);
 
 template <class T>
@@ -83,32 +85,24 @@
     }
 }
 
-int main()
-{
-    boost::unordered_set<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_set;
-    boost::unordered_multiset<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multiset;
-    boost::unordered_map<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_map;
-    boost::unordered_multimap<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multimap;
-
-    assign_tests1(test_set);
-    assign_tests1(test_multiset);
-    assign_tests1(test_map);
-    assign_tests1(test_multimap);
-
-    assign_tests1(test_set, test::generate_collisions);
-    assign_tests1(test_multiset, test::generate_collisions);
-    assign_tests1(test_map, test::generate_collisions);
-    assign_tests1(test_multimap, test::generate_collisions);
-
-    assign_tests2(test_set);
-    assign_tests2(test_multiset);
-    assign_tests2(test_map);
-    assign_tests2(test_multimap);
-
-    assign_tests2(test_set, test::generate_collisions);
-    assign_tests2(test_multiset, test::generate_collisions);
-    assign_tests2(test_map, test::generate_collisions);
-    assign_tests2(test_multimap, test::generate_collisions);
+boost::unordered_set<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_set;
+boost::unordered_multiset<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multiset;
+boost::unordered_map<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_map;
+boost::unordered_multimap<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multimap;
+
+using test::default_generator;
+using test::generate_collisions;
+
+UNORDERED_TEST(assign_tests1,
+    ((test_set)(test_multiset)(test_map)(test_multimap))
+    ((default_generator)(generate_collisions))
+)
+
+UNORDERED_TEST(assign_tests2,
+    ((test_set)(test_multiset)(test_map)(test_multimap))
+    ((default_generator)(generate_collisions))
+)
 
-    return boost::report_errors();
 }
+
+RUN_TESTS()

Modified: branches/unordered/trunk/libs/unordered/test/unordered/at_tests.cpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/unordered/at_tests.cpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/unordered/at_tests.cpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -4,10 +4,12 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/unordered_map.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include "../helpers/test.hpp"
 #include <string>
 
-int main() {
+namespace at_tests {
+
+UNORDERED_AUTO_TEST(at_tests) {
     boost::unordered_map<std::string, int> x;
     typedef boost::unordered_map<std::string, int>::iterator iterator;
 
@@ -23,6 +25,8 @@
     }
     catch(std::out_of_range) {
     }
+}
 
-    return boost::report_errors();
 }
+
+RUN_TESTS()

Modified: branches/unordered/trunk/libs/unordered/test/unordered/bucket_tests.cpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/unordered/bucket_tests.cpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/unordered/bucket_tests.cpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -5,12 +5,14 @@
 
 #include <boost/unordered_set.hpp>
 #include <boost/unordered_map.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include "../helpers/test.hpp"
 #include <algorithm>
 #include "../objects/test.hpp"
 #include "../helpers/random_values.hpp"
 #include "../helpers/helpers.hpp"
 
+namespace bucket_tests {
+
 test::seed_t seed(54635);
 
 template <class X>
@@ -48,12 +50,13 @@
     }
 }
 
-int main()
-{
-    bucket_tests((boost::unordered_set<test::object, test::hash, test::equal_to, test::allocator<test::object> >*) 0);
-    bucket_tests((boost::unordered_multiset<test::object, test::hash, test::equal_to, test::allocator<test::object> >*) 0);
-    bucket_tests((boost::unordered_map<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >*) 0);
-    bucket_tests((boost::unordered_multimap<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >*) 0);
+boost::unordered_set<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_set;
+boost::unordered_multiset<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multiset;
+boost::unordered_map<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_map;
+boost::unordered_multimap<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multimap;
+
+UNORDERED_TEST(bucket_tests, ((test_set)(test_multiset)(test_map)(test_multimap)))
 
-    return boost::report_errors();
 }
+
+RUN_TESTS()

Modified: branches/unordered/trunk/libs/unordered/test/unordered/compile_map.cpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/unordered/compile_map.cpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/unordered/compile_map.cpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -9,11 +9,11 @@
 #include <boost/unordered_map.hpp>
 
 #include <iostream>
-#include <boost/detail/lightweight_test.hpp>
+#include "../helpers/test.hpp"
 #include "../objects/minimal.hpp"
 #include "./compile_tests.hpp"
 
-void test0()
+UNORDERED_AUTO_TEST(test0)
 {
     typedef std::pair<test::minimal::assignable const,
             test::minimal::copy_constructible> value_type;
@@ -42,8 +42,7 @@
     container_test(multimap, value);
 }
 
-void test1()
-{
+UNORDERED_AUTO_TEST(test1) {
     boost::hash<int> hash;
     std::equal_to<int> equal_to;
     int value = 0;
@@ -67,7 +66,7 @@
     unordered_test(multimap, value, map_value, hash, equal_to);
 }
 
-void test2()
+UNORDERED_AUTO_TEST(test2)
 {
     test::minimal::assignable assignable
         = test::minimal::assignable::create();
@@ -121,11 +120,4 @@
     unordered_test(multimap, assignable, map_value, hash, equal_to);
 }
 
-int main()
-{
-    test0();
-    test1();
-    test2();
-
-    return boost::report_errors();
-}
+RUN_TESTS()

Modified: branches/unordered/trunk/libs/unordered/test/unordered/compile_set.cpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/unordered/compile_set.cpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/unordered/compile_set.cpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -9,11 +9,11 @@
 #include <boost/unordered_set.hpp>
 
 #include <iostream>
-#include <boost/detail/lightweight_test.hpp>
+#include "../helpers/test.hpp"
 #include "../objects/minimal.hpp"
 #include "./compile_tests.hpp"
 
-void test0()
+UNORDERED_AUTO_TEST(test0)
 {
     test::minimal::assignable assignable = test::minimal::assignable::create();
 
@@ -36,7 +36,7 @@
     container_test(multiset, assignable);
 }
 
-void test1()
+UNORDERED_AUTO_TEST(test1)
 {
     boost::hash<int> hash;
     std::equal_to<int> equal_to;
@@ -59,7 +59,7 @@
     unordered_test(multiset, value, value, hash, equal_to);
 }
 
-void test2()
+UNORDERED_AUTO_TEST(test2)
 {
     test::minimal::assignable assignable
         = test::minimal::assignable::create();
@@ -95,10 +95,4 @@
     unordered_test(multiset, assignable, assignable, hash, equal_to);
 }
 
-int main() {
-    test0();
-    test1();
-    test2();
-
-    return boost::report_errors();
-}
+RUN_TESTS()

Modified: branches/unordered/trunk/libs/unordered/test/unordered/constructor_tests.cpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/unordered/constructor_tests.cpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/unordered/constructor_tests.cpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -5,7 +5,7 @@
 
 #include <boost/unordered_set.hpp>
 #include <boost/unordered_map.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include "../helpers/test.hpp"
 #include "../objects/test.hpp"
 #include "../helpers/random_values.hpp"
 #include "../helpers/tracker.hpp"
@@ -15,6 +15,8 @@
 
 #include <iostream>
 
+namespace constructor_tests {
+
 test::seed_t seed(356730);
 
 template <class T>
@@ -255,53 +257,28 @@
     test::check_equivalent_keys(x);
 }
 
-int main()
-{
-    boost::unordered_set<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_set;
-    boost::unordered_multiset<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multiset;
-    boost::unordered_map<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_map;
-    boost::unordered_multimap<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multimap;
-
-    std::cerr<<"Test1 test_set\n";
-    constructor_tests1(test_set);
-    std::cerr<<"Test1 test_multiset\n";
-    constructor_tests1(test_multiset);
-    std::cerr<<"Test1 test_map\n";
-    constructor_tests1(test_map);
-    std::cerr<<"Test1 test_multimap\n";
-    constructor_tests1(test_multimap);
-
-    std::cerr<<"Test1 test_set, collisions\n";
-    constructor_tests1(test_set, test::generate_collisions);
-    std::cerr<<"Test1 test_multiset, collisions\n";
-    constructor_tests1(test_multiset, test::generate_collisions);
-    std::cerr<<"Test1 test_map, collisions\n";
-    constructor_tests1(test_map, test::generate_collisions);
-    std::cerr<<"Test1 test_multimap, collisions\n";
-    constructor_tests1(test_multimap, test::generate_collisions);
-
-    std::cerr<<"Test2 test_set\n";
-    constructor_tests2(test_set);
-    std::cerr<<"Test2 test_multiset\n";
-    constructor_tests2(test_multiset);
-    std::cerr<<"Test2 test_map\n";
-    constructor_tests2(test_map);
-    std::cerr<<"Test2 test_multimap\n";
-    constructor_tests2(test_multimap);
-
-    std::cerr<<"Test2 test_set, collisions\n";
-    constructor_tests2(test_set, test::generate_collisions);
-    std::cerr<<"Test2 test_multiset, collisions\n";
-    constructor_tests2(test_multiset, test::generate_collisions);
-    std::cerr<<"Test2 test_map, collisions\n";
-    constructor_tests2(test_map, test::generate_collisions);
-    std::cerr<<"Test2 test_multimap, collisions\n";
-    constructor_tests2(test_multimap, test::generate_collisions);
-
-    std::cerr<<"Map Test unordered_map<test::object, test::object>\n";
-    map_constructor_test(test_map);
-    std::cerr<<"Map Test unordered_multimap<test::object, test::object>\n";
-    map_constructor_test(test_multimap);
+boost::unordered_set<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_set;
+boost::unordered_multiset<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multiset;
+boost::unordered_map<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_map;
+boost::unordered_multimap<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multimap;
+
+using test::default_generator;
+using test::generate_collisions;
+
+UNORDERED_TEST(constructor_tests1,
+    ((test_set)(test_multiset)(test_map)(test_multimap))
+    ((default_generator)(generate_collisions))
+)
+
+UNORDERED_TEST(constructor_tests2,
+    ((test_set)(test_multiset)(test_map)(test_multimap))
+    ((default_generator)(generate_collisions))
+)
+
+UNORDERED_TEST(map_constructor_test,
+    ((test_map)(test_multimap))
+)
 
-    return boost::report_errors();
 }
+
+RUN_TESTS()

Modified: branches/unordered/trunk/libs/unordered/test/unordered/copy_tests.cpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/unordered/copy_tests.cpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/unordered/copy_tests.cpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -5,7 +5,7 @@
 
 #include <boost/unordered_set.hpp>
 #include <boost/unordered_map.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include "../helpers/test.hpp"
 #include "../objects/test.hpp"
 #include "../helpers/random_values.hpp"
 #include "../helpers/tracker.hpp"
@@ -14,6 +14,9 @@
 
 test::seed_t seed(9063);
 
+namespace copy_tests
+{
+
 template <class T>
 void copy_construct_tests1(T*, test::random_generator const& generator = test::default_generator)
 {
@@ -90,27 +93,23 @@
     }
 }
 
-int main()
-{
-    boost::unordered_set<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_set;
-    boost::unordered_multiset<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multiset;
-    boost::unordered_map<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_map;
-    boost::unordered_multimap<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multimap;
-
-    copy_construct_tests1(test_set);
-    copy_construct_tests1(test_multiset);
-    copy_construct_tests1(test_map);
-    copy_construct_tests1(test_multimap);
-
-    copy_construct_tests2(test_set);
-    copy_construct_tests2(test_multiset);
-    copy_construct_tests2(test_map);
-    copy_construct_tests2(test_multimap);
-
-    copy_construct_tests2(test_set, test::generate_collisions);
-    copy_construct_tests2(test_multiset, test::generate_collisions);
-    copy_construct_tests2(test_map, test::generate_collisions);
-    copy_construct_tests2(test_multimap, test::generate_collisions);
+boost::unordered_set<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_set;
+boost::unordered_multiset<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multiset;
+boost::unordered_map<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_map;
+boost::unordered_multimap<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multimap;
+
+using test::default_generator;
+using test::generate_collisions;
+
+UNORDERED_TEST(copy_construct_tests1,
+    ((test_set)(test_multiset)(test_map)(test_multimap))
+)
+
+UNORDERED_TEST(copy_construct_tests2,
+    ((test_set)(test_multiset)(test_map)(test_multimap))
+    ((default_generator)(generate_collisions))
+)
 
-    return boost::report_errors();
 }
+
+RUN_TESTS()

Modified: branches/unordered/trunk/libs/unordered/test/unordered/equivalent_keys_tests.cpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/unordered/equivalent_keys_tests.cpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/unordered/equivalent_keys_tests.cpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -5,7 +5,7 @@
 
 #include <boost/unordered_set.hpp>
 #include <boost/unordered_map.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include "../helpers/test.hpp"
 #include <algorithm>
 #include <map>
 #include <list>
@@ -32,7 +32,7 @@
     test::check_equivalent_keys(x1);
 }
 
-void set_tests()
+UNORDERED_AUTO_TEST(set_tests)
 {
     int values[][5] = {
         {1},
@@ -55,7 +55,7 @@
     test_equal_insertion<boost::unordered_multiset<int> >(values[4], values[4] + 3);
 }
 
-void map_tests()
+UNORDERED_AUTO_TEST(map_tests)
 {
     typedef std::list<std::pair<int const, int> > values_type;
     values_type v[5];
@@ -76,10 +76,4 @@
             v[i2].begin(), v[i2].end());
 }
 
-int main()
-{
-    set_tests();
-    map_tests();
-
-    return boost::report_errors();
-}
+RUN_TESTS()

Modified: branches/unordered/trunk/libs/unordered/test/unordered/erase_equiv_tests.cpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/unordered/erase_equiv_tests.cpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/unordered/erase_equiv_tests.cpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -7,7 +7,7 @@
 // hairy with several tricky edge cases - so explicitly test each one.
 
 #include <boost/unordered_map.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include "../helpers/test.hpp"
 #include <list>
 #include <set>
 #include <iostream>
@@ -52,8 +52,7 @@
 typedef collide_map::value_type collide_value;
 typedef std::list<collide_value> collide_list;
 
-
-void empty_range_tests()
+UNORDERED_AUTO_TEST(empty_range_tests)
 {
     collide_map x;
     x.erase(x.begin(), x.end());
@@ -61,7 +60,7 @@
     x.erase(x.end(), x.end());
 }
 
-void single_item_tests()
+UNORDERED_AUTO_TEST(single_item_tests)
 {
     collide_list init;
     init.push_back(collide_value(1,1));
@@ -75,7 +74,7 @@
     BOOST_TEST(x.count(1) == 0 && x.size() == 0);
 }
 
-void two_equivalent_item_tests()
+UNORDERED_AUTO_TEST(two_equivalent_item_tests)
 {
     collide_list init;
     init.push_back(collide_value(1,1));
@@ -172,7 +171,7 @@
     }
 }
 
-void exhaustive_collide_tests() 
+UNORDERED_AUTO_TEST(exhaustive_collide_tests) 
 {
     std::cout<<"exhaustive_collide_tests:\n";
     collide_map m;
@@ -180,20 +179,11 @@
     std::cout<<"\n";
 }
 
-void exhaustive_collide2_tests() 
+UNORDERED_AUTO_TEST(exhaustive_collide2_tests)
 {
     std::cout<<"exhaustive_collide2_tests:\n";
     exhaustive_erase_tests((collide_map2*) 0, 8, 4);
     std::cout<<"\n";
 }
 
-int main()
-{
-    empty_range_tests();
-    single_item_tests();
-    two_equivalent_item_tests();
-    exhaustive_collide_tests();
-    exhaustive_collide2_tests();
-
-    return boost::report_errors();
-}
+RUN_TESTS()

Modified: branches/unordered/trunk/libs/unordered/test/unordered/erase_tests.cpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/unordered/erase_tests.cpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/unordered/erase_tests.cpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -5,7 +5,7 @@
 
 #include <boost/unordered_set.hpp>
 #include <boost/unordered_map.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include "../helpers/test.hpp"
 #include <boost/next_prior.hpp>
 #include "../objects/test.hpp"
 #include "../helpers/random_values.hpp"
@@ -15,6 +15,9 @@
 
 #include <iostream>
 
+namespace erase_tests
+{
+
 test::seed_t seed(85638);
 
 template <class Container>
@@ -119,30 +122,19 @@
     std::cerr<<"\n";
 }
 
-int main()
-{
-    boost::unordered_set<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_set;
-    boost::unordered_multiset<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multiset;
-    boost::unordered_map<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_map;
-    boost::unordered_multimap<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multimap;
-
-    std::cerr<<"Erase test_set.\n";
-    erase_tests1(test_set);
-    std::cerr<<"Erase test_multiset.\n";
-    erase_tests1(test_multiset);
-    std::cerr<<"Erase test_map.\n";
-    erase_tests1(test_map);
-    std::cerr<<"Erase test_multimap.\n";
-    erase_tests1(test_multimap);
-
-    std::cerr<<"Erase test_set, collisions.\n";
-    erase_tests1(test_set, test::generate_collisions);
-    std::cerr<<"Erase test_multiset, collisions.\n";
-    erase_tests1(test_multiset, test::generate_collisions);
-    std::cerr<<"Erase test_map, collisions.\n";
-    erase_tests1(test_map, test::generate_collisions);
-    std::cerr<<"Erase test_multimap, collisions.\n";
-    erase_tests1(test_multimap, test::generate_collisions);
+boost::unordered_set<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_set;
+boost::unordered_multiset<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multiset;
+boost::unordered_map<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_map;
+boost::unordered_multimap<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multimap;
+
+using test::default_generator;
+using test::generate_collisions;
+
+UNORDERED_TEST(erase_tests1,
+    ((test_set)(test_multiset)(test_map)(test_multimap))
+    ((default_generator)(generate_collisions))
+)
 
-    return boost::report_errors();
 }
+
+RUN_TESTS()

Modified: branches/unordered/trunk/libs/unordered/test/unordered/find_tests.cpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/unordered/find_tests.cpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/unordered/find_tests.cpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -5,12 +5,15 @@
 
 #include <boost/unordered_set.hpp>
 #include <boost/unordered_map.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include "../helpers/test.hpp"
 #include "../objects/test.hpp"
 #include "../helpers/random_values.hpp"
 #include "../helpers/tracker.hpp"
 #include "../helpers/helpers.hpp"
 
+namespace find_tests
+{
+
 test::seed_t seed(78937);
 
 template <class X>
@@ -78,22 +81,19 @@
     }
 }
 
-int main()
-{
-    boost::unordered_set<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_set;
-    boost::unordered_multiset<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multiset;
-    boost::unordered_map<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_map;
-    boost::unordered_multimap<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multimap;
-
-    find_tests1(test_set);
-    find_tests1(test_multiset);
-    find_tests1(test_map);
-    find_tests1(test_multimap);
-
-    find_tests1(test_set, test::generate_collisions);
-    find_tests1(test_multiset, test::generate_collisions);
-    find_tests1(test_map, test::generate_collisions);
-    find_tests1(test_multimap, test::generate_collisions);
+boost::unordered_set<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_set;
+boost::unordered_multiset<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multiset;
+boost::unordered_map<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_map;
+boost::unordered_multimap<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multimap;
+
+using test::default_generator;
+using test::generate_collisions;
+
+UNORDERED_TEST(find_tests1,
+    ((test_set)(test_multiset)(test_map)(test_multimap))
+    ((default_generator)(generate_collisions))
+)
 
-    return 0;
 }
+
+RUN_TESTS()

Modified: branches/unordered/trunk/libs/unordered/test/unordered/insert_stable_tests.cpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/unordered/insert_stable_tests.cpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/unordered/insert_stable_tests.cpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -5,7 +5,7 @@
 
 #include <boost/unordered_set.hpp>
 #include <boost/unordered_map.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include "../helpers/test.hpp"
 
 #include <iostream>
 
@@ -39,7 +39,7 @@
     }
 }
 
-void stable_insert_test1() {
+UNORDERED_AUTO_TEST(stable_insert_test1) {
     boost::unordered_multiset<insert_stable::member> x;
 
     x.insert(insert_stable::member(1,1));
@@ -56,7 +56,7 @@
     BOOST_TEST(it == end);
 }
 
-void stable_insert_test2() {
+UNORDERED_AUTO_TEST(stable_insert_test2) {
     boost::unordered_multimap<insert_stable::member, int> x;
     typedef boost::unordered_multimap<insert_stable::member, int>::const_iterator iterator;
 
@@ -75,10 +75,4 @@
     BOOST_TEST(it == end);
 }
 
-int main()
-{
-    stable_insert_test1();
-    stable_insert_test2();
-
-    return boost::report_errors();
-}
+RUN_TESTS()

Modified: branches/unordered/trunk/libs/unordered/test/unordered/insert_tests.cpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/unordered/insert_tests.cpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/unordered/insert_tests.cpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -5,7 +5,7 @@
 
 #include <boost/unordered_set.hpp>
 #include <boost/unordered_map.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include "../helpers/test.hpp"
 #include <boost/next_prior.hpp>
 #include "../objects/test.hpp"
 #include "../helpers/random_values.hpp"

Modified: branches/unordered/trunk/libs/unordered/test/unordered/load_factor_tests.cpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/unordered/load_factor_tests.cpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/unordered/load_factor_tests.cpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -5,7 +5,7 @@
 
 #include <boost/unordered_set.hpp>
 #include <boost/unordered_map.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include "../helpers/test.hpp"
 #include <boost/limits.hpp>
 #include "../helpers/random_values.hpp"
 
@@ -14,6 +14,9 @@
 #pragma warning(disable:4127) // conditional expression is constant
 #endif
 
+namespace load_factor_tests
+{
+
 test::seed_t seed(783656);
 
 template <class X>
@@ -63,21 +66,23 @@
         insert_test(ptr, std::numeric_limits<float>::infinity());
 }
 
-int main()
-{
-    load_factor_tests((boost::unordered_set<int>*) 0);
-    load_factor_tests((boost::unordered_multiset<int>*) 0);
-    load_factor_tests((boost::unordered_map<int, int>*) 0);
-    load_factor_tests((boost::unordered_multimap<int, int>*) 0);
-
-    load_factor_insert_tests((boost::unordered_set<int>*) 0);
-    load_factor_insert_tests((boost::unordered_multiset<int>*) 0);
-    load_factor_insert_tests((boost::unordered_map<int, int>*) 0);
-    load_factor_insert_tests((boost::unordered_multimap<int, int>*) 0);
+boost::unordered_set<int>* int_set_ptr;
+boost::unordered_multiset<int>* int_multiset_ptr;
+boost::unordered_map<int, int>* int_map_ptr;
+boost::unordered_multimap<int, int>* int_multimap_ptr;
+
+UNORDERED_TEST(load_factor_tests,
+    ((int_set_ptr)(int_multiset_ptr)(int_map_ptr)(int_multimap_ptr))
+)
+
+UNORDERED_TEST(load_factor_insert_tests,
+    ((int_set_ptr)(int_multiset_ptr)(int_map_ptr)(int_multimap_ptr))
+)
 
-    return boost::report_errors();
 }
 
+RUN_TESTS()
+
 #if defined(BOOST_MSVC)
 #pragma warning(pop)
 #pragma warning(disable:4127) // conditional expression is constant

Modified: branches/unordered/trunk/libs/unordered/test/unordered/rehash_tests.cpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/unordered/rehash_tests.cpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/unordered/rehash_tests.cpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -5,10 +5,13 @@
 
 #include <boost/unordered_set.hpp>
 #include <boost/unordered_map.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include "../helpers/test.hpp"
 #include "../helpers/random_values.hpp"
 #include "../helpers/tracker.hpp"
 
+namespace rehash_tests
+{
+
 test::seed_t seed(2974);
 
 template <class X>
@@ -59,11 +62,15 @@
     rehash_test1(ptr);
 }
 
-int main() {
-    rehash_tests((boost::unordered_set<int>*) 0);
-    rehash_tests((boost::unordered_multiset<int>*) 0);
-    rehash_tests((boost::unordered_map<int, int>*) 0);
-    rehash_tests((boost::unordered_multimap<int, int>*) 0);
+boost::unordered_set<int>* int_set_ptr;
+boost::unordered_multiset<int>* int_multiset_ptr;
+boost::unordered_map<int, int>* int_map_ptr;
+boost::unordered_multimap<int, int>* int_multimap_ptr;
+
+UNORDERED_TEST(rehash_tests,
+    ((int_set_ptr)(int_multiset_ptr)(int_map_ptr)(int_multimap_ptr))
+)
 
-    return boost::report_errors();
 }
+
+RUN_TESTS()

Modified: branches/unordered/trunk/libs/unordered/test/unordered/simple_tests.cpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/unordered/simple_tests.cpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/unordered/simple_tests.cpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -7,7 +7,7 @@
 
 #include <boost/unordered_set.hpp>
 #include <boost/unordered_map.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include "../helpers/test.hpp"
 #include <cstdlib>
 #include <algorithm>
 #include "../helpers/equivalent.hpp"
@@ -83,7 +83,7 @@
     }
 }
 
-int main()
+UNORDERED_AUTO_TEST(simple_tests)
 {
     using namespace std;
     srand(14878);
@@ -123,6 +123,6 @@
             multimap.insert(std::pair<const int, int>(index, rand()));
     }
     simple_test(multimap);
-
-    return boost::report_errors();
 }
+
+RUN_TESTS()

Modified: branches/unordered/trunk/libs/unordered/test/unordered/swap_tests.cpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/unordered/swap_tests.cpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/unordered/swap_tests.cpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -8,12 +8,15 @@
 #include <iterator>
 #include <boost/unordered_set.hpp>
 #include <boost/unordered_map.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include "../helpers/test.hpp"
 #include "../objects/test.hpp"
 #include "../helpers/random_values.hpp"
 #include "../helpers/tracker.hpp"
 #include "../helpers/invariants.hpp"
 
+namespace swap_tests
+{
+
 test::seed_t seed(783472);
 
 template <class X>
@@ -114,22 +117,18 @@
 #endif
 }
 
-int main()
-{
-    boost::unordered_set<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_set;
-    boost::unordered_multiset<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multiset;
-    boost::unordered_map<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_map;
-    boost::unordered_multimap<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multimap;
-
-    swap_tests1(test_set);
-    swap_tests1(test_multiset);
-    swap_tests1(test_map);
-    swap_tests1(test_multimap);
-
-    swap_tests2(test_set);
-    swap_tests2(test_multiset);
-    swap_tests2(test_map);
-    swap_tests2(test_multimap);
+boost::unordered_set<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_set;
+boost::unordered_multiset<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multiset;
+boost::unordered_map<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_map;
+boost::unordered_multimap<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multimap;
+
+UNORDERED_TEST(swap_tests1,
+    ((test_set)(test_multiset)(test_map)(test_multimap))
+)
+
+UNORDERED_TEST(swap_tests2,
+    ((test_set)(test_multiset)(test_map)(test_multimap))
+)
 
-    return boost::report_errors();
 }
+RUN_TESTS()

Modified: branches/unordered/trunk/libs/unordered/test/unordered/unnecessary_copy_tests.cpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/unordered/unnecessary_copy_tests.cpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/unordered/unnecessary_copy_tests.cpp	2008-02-05 16:02:07 EST (Tue, 05 Feb 2008)
@@ -5,9 +5,10 @@
 
 #include <boost/unordered_set.hpp>
 #include <boost/unordered_map.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include "../helpers/test.hpp"
 
-namespace test {
+namespace unnecessary_copy_tests
+{
     struct count_copies
     {
         static int count;
@@ -17,22 +18,24 @@
        count_copies& operator=(count_copies const&);
     };
 
-    bool operator==(test::count_copies const&, test::count_copies const&) {
+    bool operator==(count_copies const&, count_copies const&) {
         return true;
     }
 }
 
 #if defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
-namespace boost {
+namespace boost
 #else
-namespace test {
+namespace unnecessary_copy_tests
 #endif
-    std::size_t hash_value(test::count_copies const&) {
+{
+    std::size_t hash_value(unnecessary_copy_tests::count_copies const&) {
         return 0;
     }
 }
 
-namespace test {
+namespace unnecessary_copy_tests
+{
     int count_copies::count;
 
     template <class T>
@@ -45,14 +48,13 @@
         x.insert(a);
         BOOST_TEST(count_copies::count == 2);
     }
-}
 
-int main()
-{
-    test::unnecessary_copy_test((boost::unordered_set<test::count_copies>*) 0);
-    test::unnecessary_copy_test((boost::unordered_multiset<test::count_copies>*) 0);
-    test::unnecessary_copy_test((boost::unordered_map<int, test::count_copies>*) 0);
-    test::unnecessary_copy_test((boost::unordered_multimap<int, test::count_copies>*) 0);
+    boost::unordered_set<count_copies>* set;
+    boost::unordered_multiset<count_copies>* multiset;
+    boost::unordered_map<int, count_copies>* map;
+    boost::unordered_multimap<int, count_copies>* multimap;
 
-    return boost::report_errors();
+    UNORDERED_TEST(unnecessary_copy_test, ((set)(multiset)(map)(multimap)))
 }
+
+RUN_TESTS()