tests: bounded pointers tests for slist, list, (rb/avl) x (set/multiset)

2014-05-16 12:03:36 -04:00
parent 54e9befe5f
commit b79d3cfdec
11 changed files with 1427 additions and 534 deletions
@@ -15,12 +15,14 @@
 #include <boost/intrusive/slist.hpp>
 #include <boost/intrusive/pointer_traits.hpp>
 #include "itestvalue.hpp"
+#include "bptr_value.hpp"
 #include "smart_ptr.hpp"
 #include "common_functors.hpp"
 #include <vector>
 #include <boost/detail/lightweight_test.hpp>
 #include "test_macros.hpp"
 #include "test_container.hpp"
+#include <typeinfo>

 using namespace boost::intrusive;

@@ -40,39 +42,47 @@ struct hooks
                              > nonhook_node_member_type;
 };

-template<class ValueTraits, bool Linear, bool CacheLast>
+template < typename List_Type, typename Value_Container >
 struct test_slist
 {
-   typedef typename ValueTraits::value_type value_type;
-   static void test_all(std::vector<value_type>& values);
-   static void test_front(std::vector<value_type>& values);
-   static void test_back(std::vector<value_type>& values, detail::bool_<true>);
-   static void test_back(std::vector<value_type>& values, detail::bool_<false>);
-   static void test_sort(std::vector<value_type>& values);
-   static void test_merge(std::vector<value_type>& values);
-   static void test_remove_unique(std::vector<value_type>& values);
-   static void test_insert(std::vector<value_type>& values);
-   static void test_shift(std::vector<value_type>& values);
-   static void test_swap(std::vector<value_type>& values);
-   static void test_slow_insert(std::vector<value_type>& values);
-   static void test_clone(std::vector<value_type>& values);
-   static void test_container_from_end(std::vector<value_type> &, detail::bool_<true>){}
-   static void test_container_from_end(std::vector<value_type> &values, detail::bool_<false>);
+   typedef List_Type list_type;
+   typedef typename list_type::value_traits value_traits;
+   typedef typename value_traits::value_type value_type;
+   typedef typename list_type::node_algorithms node_algorithms;
+
+   static void test_all(Value_Container& values);
+   static void test_front(Value_Container& values);
+   static void test_back(Value_Container& values, detail::bool_<true>);
+   static void test_back(Value_Container& values, detail::bool_<false>);
+   static void test_sort(Value_Container& values);
+   static void test_merge(Value_Container& values);
+   static void test_remove_unique(Value_Container& values);
+   static void test_insert(Value_Container& values);
+   static void test_shift(Value_Container& values);
+   static void test_swap(Value_Container& values);
+   static void test_slow_insert(Value_Container& values);
+   static void test_clone(Value_Container& values);
+   static void test_container_from_end(Value_Container &, detail::bool_<true>){}
+   static void test_container_from_end(Value_Container &values, detail::bool_<false>);
 };

-template<class ValueTraits, bool Linear, bool CacheLast>
-void test_slist<ValueTraits, Linear, CacheLast>
-   ::test_all (std::vector<typename ValueTraits::value_type>& values)
+template < typename List_Type, typename Value_Container >
+void test_slist< List_Type, Value_Container >
+   ::test_all (Value_Container& values)
 {
-   typedef typename ValueTraits::value_type value_type;
-   typedef slist
-      < value_type
-      , value_traits<ValueTraits>
-      , size_type<std::size_t>
-      , constant_time_size<value_type::constant_time_size>
-      , linear<Linear>
-      , cache_last<CacheLast>
-      > list_type;
+   std::clog << "testing slist with:\n"
+             << "  value_type = " << typeid(value_type).name() << "\n"
+             << "  sizeof(value_type) = " << sizeof(value_type) << "\n"
+             << "  link_mode = " << value_traits::link_mode << "\n"
+             << "  node = " << typeid(typename list_type::node).name() << "\n"
+             << "  sizeof(node) = " << sizeof(typename list_type::node) << "\n"
+             << "  node_ptr = " << typeid(typename list_type::node_ptr).name() << "\n"
+             << "  sizeof(node_ptr) = " << sizeof(typename list_type::node_ptr) << "\n"
+             << "  constant_time_size = " << list_type::constant_time_size << "\n"
+             << "  linear = " << list_type::linear << "\n"
+             << "  cache_last = " << list_type::cache_last << "\n"
+             << "  has_container_from_iterator = " << list_type::has_container_from_iterator << "\n"
+             << "  sizeof(list_type) = " << sizeof(list_type) << "\n";
   {
      list_type list(values.begin(), values.end());
      test::test_container(list);
@@ -81,7 +91,7 @@ void test_slist<ValueTraits, Linear, CacheLast>
      test::test_sequence_container(list, values);
   }
   test_front(values);
-   test_back(values, detail::bool_<CacheLast>());
+   test_back(values, detail::bool_<list_type::cache_last>());
   test_sort(values);
   test_merge (values);
   test_remove_unique(values);
@@ -90,23 +100,14 @@ void test_slist<ValueTraits, Linear, CacheLast>
   test_slow_insert (values);
   test_swap(values);
   test_clone(values);
-   test_container_from_end(values, detail::bool_<Linear>());
+   test_container_from_end(values, detail::bool_<list_type::linear or not list_type::has_container_from_iterator>());
 }

 //test: push_front, pop_front, front, size, empty:
-template<class ValueTraits, bool Linear, bool CacheLast>
-void test_slist<ValueTraits, Linear, CacheLast>
-   ::test_front(std::vector<typename ValueTraits::value_type>& values)
+template < typename List_Type, typename Value_Container >
+void test_slist< List_Type, Value_Container >
+   ::test_front(Value_Container& values)
 {
-   typedef typename ValueTraits::value_type value_type;
-   typedef slist
-      < value_type
-      , value_traits<ValueTraits>
-      , size_type<std::size_t>
-      , constant_time_size<value_type::constant_time_size>
-      , linear<Linear>
-      , cache_last<CacheLast>
-      > list_type;
   list_type testlist;
   BOOST_TEST (testlist.empty());

@@ -127,19 +128,10 @@ void test_slist<ValueTraits, Linear, CacheLast>
 }

 //test: push_front, pop_front, front, size, empty:
-template<class ValueTraits, bool Linear, bool CacheLast>
-void test_slist<ValueTraits, Linear, CacheLast>
-   ::test_back(std::vector<typename ValueTraits::value_type>& values, detail::bool_<true>)
+template < typename List_Type, typename Value_Container >
+void test_slist< List_Type, Value_Container >
+   ::test_back(Value_Container& values, detail::bool_<true>)
 {
-   typedef typename ValueTraits::value_type value_type;
-   typedef slist
-      < value_type
-      , value_traits<ValueTraits>
-      , size_type<std::size_t>
-      , constant_time_size<value_type::constant_time_size>
-      , linear<Linear>
-      , cache_last<CacheLast>
-      > list_type;
   list_type testlist;
   BOOST_TEST (testlist.empty());

@@ -154,26 +146,17 @@ void test_slist<ValueTraits, Linear, CacheLast>
 }

 //test: push_front, pop_front, front, size, empty:
-template<class ValueTraits, bool Linear, bool CacheLast>
-void test_slist<ValueTraits, Linear, CacheLast>
-   ::test_back(std::vector<typename ValueTraits::value_type>&, detail::bool_<false>)
+template < typename List_Type, typename Value_Container >
+void test_slist< List_Type, Value_Container >
+   ::test_back(Value_Container&, detail::bool_<false>)
 {}


 //test: merge due to error in merge implementation:
-template<class ValueTraits, bool Linear, bool CacheLast>
-void test_slist<ValueTraits, Linear, CacheLast>
-   ::test_merge (std::vector<typename ValueTraits::value_type>& values)
+template < typename List_Type, typename Value_Container >
+void test_slist< List_Type, Value_Container >
+   ::test_merge (Value_Container& values)
 {
-   typedef typename ValueTraits::value_type value_type;
-   typedef slist
-      < value_type
-      , value_traits<ValueTraits>
-      , size_type<std::size_t>
-      , constant_time_size<value_type::constant_time_size>
-      , linear<Linear>
-      , cache_last<CacheLast>
-      > list_type;
   list_type testlist1, testlist2;
   testlist1.push_front (values[0]);
   testlist2.push_front (values[4]);
@@ -186,19 +169,10 @@ void test_slist<ValueTraits, Linear, CacheLast>
 }

 //test: merge due to error in merge implementation:
-template<class ValueTraits, bool Linear, bool CacheLast>
-void test_slist<ValueTraits, Linear, CacheLast>
-   ::test_remove_unique (std::vector<typename ValueTraits::value_type>& values)
+template < typename List_Type, typename Value_Container >
+void test_slist< List_Type, Value_Container >
+   ::test_remove_unique (Value_Container& values)
 {
-   typedef typename ValueTraits::value_type value_type;
-   typedef slist
-      < value_type
-      , value_traits<ValueTraits>
-      , size_type<std::size_t>
-      , constant_time_size<value_type::constant_time_size>
-      , linear<Linear>
-      , cache_last<CacheLast>
-      > list_type;
   {
      list_type list(values.begin(), values.end());
      list.remove_if(is_even());
@@ -206,7 +180,7 @@ void test_slist<ValueTraits, Linear, CacheLast>
      TEST_INTRUSIVE_SEQUENCE( init_values, list.begin() );
   }
   {
-      std::vector<typename ValueTraits::value_type> values2(values);
+      Value_Container values2(values);
      list_type list(values.begin(), values.end());
      list.insert_after(list.before_begin(), values2.begin(), values2.end());
      list.sort();
@@ -219,19 +193,10 @@ void test_slist<ValueTraits, Linear, CacheLast>
 }

 //test: constructor, iterator, sort, reverse:
-template<class ValueTraits, bool Linear, bool CacheLast>
-void test_slist<ValueTraits, Linear, CacheLast>
-   ::test_sort(std::vector<typename ValueTraits::value_type>& values)
+template < typename List_Type, typename Value_Container >
+void test_slist< List_Type, Value_Container >
+   ::test_sort(Value_Container& values)
 {
-   typedef typename ValueTraits::value_type value_type;
-   typedef slist
-      < value_type
-      , value_traits<ValueTraits>
-      , size_type<std::size_t>
-      , constant_time_size<value_type::constant_time_size>
-      , linear<Linear>
-      , cache_last<CacheLast>
-      > list_type;
   list_type testlist (values.begin(), values.end());

   {  int init_values [] = { 1, 2, 3, 4, 5 };
@@ -247,21 +212,12 @@ void test_slist<ValueTraits, Linear, CacheLast>
 }

 //test: assign, insert_after, const_iterator, erase_after, s_iterator_to, previous:
-template<class ValueTraits, bool Linear, bool CacheLast>
-void test_slist<ValueTraits, Linear, CacheLast>
-   ::test_insert(std::vector<typename ValueTraits::value_type>& values)
+template < typename List_Type, typename Value_Container >
+void test_slist< List_Type, Value_Container >
+   ::test_insert(Value_Container& values)
 {
-   typedef typename ValueTraits::value_type value_type;
-   typedef slist
-      < value_type
-      , value_traits<ValueTraits>
-      , size_type<std::size_t>
-      , constant_time_size<value_type::constant_time_size>
-      , linear<Linear>
-      , cache_last<CacheLast>
-      > list_type;
   list_type testlist;
-   testlist.assign (&values[0] + 2, &values[0] + 5);
+   testlist.assign (values.begin() + 2, values.begin() + 5);

   const list_type& const_testlist = testlist;
   {  int init_values [] = { 3, 4, 5 };
@@ -280,9 +236,9 @@ void test_slist<ValueTraits, Linear, CacheLast>
   BOOST_TEST (&*i == &values[4]);

   typename list_type::const_iterator ic;
-   ic = testlist.iterator_to (const_cast<const value_type &>(values[4]));
+   ic = testlist.iterator_to (static_cast< typename list_type::const_reference >(values[4]));
   BOOST_TEST (&*ic == &values[4]);
-   ic = list_type::s_iterator_to (const_cast<const value_type &>(values[4]));
+   ic = list_type::s_iterator_to (static_cast< typename list_type::const_reference >(values[4]));
   BOOST_TEST (&*ic == &values[4]);

   i = testlist.previous (i);
@@ -295,22 +251,13 @@ void test_slist<ValueTraits, Linear, CacheLast>
 }

 //test: insert, const_iterator, erase, siterator_to:
-template<class ValueTraits, bool Linear, bool CacheLast>
-void test_slist<ValueTraits, Linear, CacheLast>
-   ::test_slow_insert (std::vector<typename ValueTraits::value_type>& values)
+template < typename List_Type, typename Value_Container >
+void test_slist< List_Type, Value_Container >
+   ::test_slow_insert (Value_Container& values)
 {
-   typedef typename ValueTraits::value_type value_type;
-   typedef slist
-      < value_type
-      , value_traits<ValueTraits>
-      , size_type<std::size_t>
-      , constant_time_size<value_type::constant_time_size>
-      , linear<Linear>
-      , cache_last<CacheLast>
-      > list_type;
   list_type testlist;
   testlist.push_front (values[4]);
-   testlist.insert (testlist.begin(), &values[0] + 2, &values[0] + 4);
+   testlist.insert (testlist.begin(), values.begin() + 2, values.begin() + 4);

   const list_type& const_testlist = testlist;
   {  int init_values [] = { 3, 4, 5 };
@@ -337,24 +284,14 @@ void test_slist<ValueTraits, Linear, CacheLast>

   testlist.erase (++testlist.begin(), testlist.end());
   BOOST_TEST (testlist.size() == 1);
-   BOOST_TEST (testlist.front().value_ == 3);
+   BOOST_TEST (testlist.begin()->value_ == 3);
 }

-template<class ValueTraits, bool Linear, bool CacheLast>
-void test_slist<ValueTraits, Linear, CacheLast>
-   ::test_shift(std::vector<typename ValueTraits::value_type>& values)
+template < typename List_Type, typename Value_Container >
+void test_slist< List_Type, Value_Container >
+   ::test_shift(Value_Container& values)
 {
-   typedef typename ValueTraits::value_type value_type;
-   typedef slist
-      < value_type
-      , value_traits<ValueTraits>
-      , size_type<std::size_t>
-      , constant_time_size<value_type::constant_time_size>
-      , linear<Linear>
-      , cache_last<CacheLast>
-      > list_type;
   list_type testlist;
-
   const int num_values = (int)values.size();
   std::vector<int> expected_values(num_values);

@@ -362,7 +299,7 @@ void test_slist<ValueTraits, Linear, CacheLast>
   for(int s = 1; s <= num_values; ++s){
      expected_values.resize(s);
      for(int i = 0; i < s*3; ++i){
-         testlist.insert_after(testlist.before_begin(), &values[0], &values[0] + s);
+         testlist.insert_after(testlist.before_begin(), values.begin(), values.begin() + s);
         testlist.shift_forward(i);
         for(int j = 0; j < s; ++j){
            expected_values[(j + s - i%s) % s] = (j + 1);
@@ -374,7 +311,7 @@ void test_slist<ValueTraits, Linear, CacheLast>

      //Shift backwards all possible positions
      for(int i = 0; i < s*3; ++i){
-         testlist.insert_after(testlist.before_begin(), &values[0], &values[0] + s);
+         testlist.insert_after(testlist.before_begin(), values.begin(), values.begin() + s);
         testlist.shift_backwards(i);
         for(int j = 0; j < s; ++j){
            expected_values[(j + i) % s] = (j + 1);
@@ -387,23 +324,14 @@ void test_slist<ValueTraits, Linear, CacheLast>
 }

 //test: insert_after (seq-version), swap, splice_after:
-template<class ValueTraits, bool Linear, bool CacheLast>
-void test_slist<ValueTraits, Linear, CacheLast>
-   ::test_swap(std::vector<typename ValueTraits::value_type>& values)
+template < typename List_Type, typename Value_Container >
+void test_slist< List_Type, Value_Container >
+   ::test_swap(Value_Container& values)
 {
-   typedef typename ValueTraits::value_type value_type;
-   typedef slist
-      < value_type
-      , value_traits<ValueTraits>
-      , size_type<std::size_t>
-      , constant_time_size<value_type::constant_time_size>
-      , linear<Linear>
-      , cache_last<CacheLast>
-      > list_type;
   {
-      list_type testlist1 (&values[0], &values[0] + 2);
+      list_type testlist1 (values.begin(), values.begin() + 2);
      list_type testlist2;
-      testlist2.insert_after (testlist2.before_begin(), &values[0] + 2, &values[0] + 5);
+      testlist2.insert_after (testlist2.before_begin(), values.begin() + 2, values.begin() + 5);
      testlist1.swap(testlist2);
      {  int init_values [] = { 3, 4, 5 };
         TEST_INTRUSIVE_SEQUENCE( init_values, testlist1.begin() );  }
@@ -428,7 +356,7 @@ void test_slist<ValueTraits, Linear, CacheLast>
         TEST_INTRUSIVE_SEQUENCE( init_values, testlist2.begin() );  }
   }
   {  //Now test swap when testlist2 is empty
-      list_type testlist1 (&values[0], &values[0] + 2);
+      list_type testlist1 (values.begin(), values.begin() + 2);
      list_type testlist2;
      testlist1.swap(testlist2);
      BOOST_TEST (testlist1.empty());
@@ -436,7 +364,7 @@ void test_slist<ValueTraits, Linear, CacheLast>
         TEST_INTRUSIVE_SEQUENCE( init_values, testlist2.begin() );  }
   }
   {  //Now test swap when testlist1 is empty
-      list_type testlist2 (&values[0], &values[0] + 2);
+      list_type testlist2 (values.begin(), values.begin() + 2);
      list_type testlist1;
      testlist1.swap(testlist2);
      BOOST_TEST (testlist2.empty());
@@ -451,14 +379,14 @@ void test_slist<ValueTraits, Linear, CacheLast>

   if(!list_type::linear)
   {
-      list_type testlist1 (&values[0], &values[0] + 2);
-      list_type testlist2 (&values[0] + 3, &values[0] + 5);
+      list_type testlist1 (values.begin(), values.begin() + 2);
+      list_type testlist2 (values.begin() + 3, values.begin() + 5);

-      values[0].swap_nodes(values[2]);
+      swap_nodes< node_algorithms >(values[0], values[2]);
      {  int init_values [] = { 3, 2 };
         TEST_INTRUSIVE_SEQUENCE( init_values, testlist1.begin() );  }

-      values[2].swap_nodes(values[4]);
+      swap_nodes< node_algorithms >(values[2], values[4]);
      {  int init_values [] = { 5, 2 };
         TEST_INTRUSIVE_SEQUENCE( init_values, testlist1.begin() );  }
      {  int init_values [] = { 4, 3 };
@@ -466,52 +394,42 @@ void test_slist<ValueTraits, Linear, CacheLast>
   }
   if(!list_type::linear)
   {
-      list_type testlist1 (&values[0], &values[0]+1);
+      list_type testlist1 (values.begin(), values.begin()+1);
      if(testlist1.size() != 1){
         abort();
      }
      {  int init_values [] = { 1 };
         TEST_INTRUSIVE_SEQUENCE( init_values, testlist1.begin() );  }

-      values[1].swap_nodes(values[2]);
+      swap_nodes< node_algorithms >(values[1], values[2]);

      BOOST_TEST(testlist1.size() == 1);
-      BOOST_TEST(!values[1].is_linked());
-      BOOST_TEST(!values[2].is_linked());
+      BOOST_TEST(!(&values[1])->is_linked());
+      BOOST_TEST(!(&values[2])->is_linked());
      {  int init_values [] = { 1 };
         TEST_INTRUSIVE_SEQUENCE( init_values, testlist1.begin() );  }

-      values[0].swap_nodes(values[2]);
+      swap_nodes< node_algorithms >(values[0], values[2]);
      BOOST_TEST(testlist1.size() == 1);
-      BOOST_TEST(values[2].is_linked());
-      BOOST_TEST(!values[0].is_linked());
+      BOOST_TEST((&values[2])->is_linked());
+      BOOST_TEST(!(&values[0])->is_linked());
      {  int init_values [] = { 3 };
         TEST_INTRUSIVE_SEQUENCE( init_values, testlist1.begin() );  }

-      values[0].swap_nodes(values[2]);
+      swap_nodes< node_algorithms >(values[0], values[2]);
      BOOST_TEST(testlist1.size() == 1);
-      BOOST_TEST(!values[2].is_linked());
-      BOOST_TEST(values[0].is_linked());
+      BOOST_TEST(!(&values[2])->is_linked());
+      BOOST_TEST((&values[0])->is_linked());
      {  int init_values [] = { 1 };
         TEST_INTRUSIVE_SEQUENCE( init_values, testlist1.begin() );  }
   }
 }

-template<class ValueTraits, bool Linear, bool CacheLast>
-void test_slist<ValueTraits, Linear, CacheLast>
-   ::test_clone(std::vector<typename ValueTraits::value_type>& values)
+template < typename List_Type, typename Value_Container >
+void test_slist< List_Type, Value_Container >
+   ::test_clone(Value_Container& values)
 {
-   typedef typename ValueTraits::value_type value_type;
-   typedef slist
-      < value_type
-      , value_traits<ValueTraits>
-      , size_type<std::size_t>
-      , constant_time_size<value_type::constant_time_size>
-      , linear<Linear>
-      , cache_last<CacheLast>
-      > list_type;
-
-      list_type testlist1 (&values[0], &values[0] + values.size());
+      list_type testlist1 (values.begin(), values.begin() + values.size());
      list_type testlist2;

      testlist2.clone_from(testlist1, test::new_cloner<value_type>(), test::delete_disposer<value_type>());
@@ -520,144 +438,193 @@ void test_slist<ValueTraits, Linear, CacheLast>
      BOOST_TEST (testlist2.empty());
 }

-template<class ValueTraits, bool Linear, bool CacheLast>
-void test_slist<ValueTraits, Linear, CacheLast>
-   ::test_container_from_end(std::vector<typename ValueTraits::value_type>& values
+template < typename List_Type, typename Value_Container >
+void test_slist< List_Type, Value_Container >
+   ::test_container_from_end(Value_Container& values
                            ,detail::bool_<false>)
 {
-   typedef typename ValueTraits::value_type value_type;
-   typedef slist
-      < value_type
-      , value_traits<ValueTraits>
-      , size_type<std::size_t>
-      , constant_time_size<value_type::constant_time_size>
-      , linear<Linear>
-      , cache_last<CacheLast>
-      > list_type;
-   list_type testlist1 (&values[0], &values[0] + values.size());
+
+   list_type testlist1 (values.begin(), values.begin() + values.size());
   BOOST_TEST (testlist1 == list_type::container_from_end_iterator(testlist1.end()));
   BOOST_TEST (testlist1 == list_type::container_from_end_iterator(testlist1.cend()));
 }

-template<class VoidPointer, bool constant_time_size>
+template < typename Value_Traits, bool Constant_Time_Size, bool Linear, bool CacheLast, bool Default_Holder, typename Value_Container >
+struct make_and_test_slist
+   : test_slist< slist< typename Value_Traits::value_type,
+                        value_traits< Value_Traits >,
+                        size_type< std::size_t >,
+                        constant_time_size< Constant_Time_Size >,
+                        linear<Linear>,
+                        cache_last<CacheLast>
+                      >,
+                  Value_Container
+                >
+{};
+
+template < typename Value_Traits, bool Constant_Time_Size, bool Linear, bool CacheLast, typename Value_Container >
+struct make_and_test_slist< Value_Traits, Constant_Time_Size, Linear, CacheLast, false, Value_Container >
+   : test_slist< slist< typename Value_Traits::value_type,
+                        value_traits< Value_Traits >,
+                        size_type< std::size_t >,
+                        constant_time_size< Constant_Time_Size >,
+                        linear<Linear>,
+                        cache_last<CacheLast>,
+                        header_holder_type< pointer_holder< typename Value_Traits::node_traits::node > >
+                      >,
+                  Value_Container
+                >
+{};
+
+template<class VoidPointer, bool constant_time_size, bool Default_Holder>
 class test_main_template
 {
   public:
   int operator()()
   {
      typedef testvalue<hooks<VoidPointer> , constant_time_size> value_type;
-      std::vector<value_type> data (5);
+      std::vector< value_type > data (5);
      for (int i = 0; i < 5; ++i)
         data[i].value_ = i + 1;

-      test_slist < typename detail::get_base_value_traits
+      make_and_test_slist < typename detail::get_base_value_traits
                  < value_type
                  , typename hooks<VoidPointer>::base_hook_type
                  >::type
+                 , constant_time_size
                 , false
                 , false
+                 , Default_Holder
+                 , std::vector< value_type >
                >::test_all(data);
-      test_slist < typename detail::get_member_value_traits
+      make_and_test_slist < typename detail::get_member_value_traits
                  < value_type
                  , member_hook< value_type
                               , typename hooks<VoidPointer>::member_hook_type
                               , &value_type::node_
                               >
                  >::type
+                 , constant_time_size
                 , false
                 , false
+                 , Default_Holder
+                 , std::vector< value_type >
                >::test_all(data);
-      test_slist < nonhook_node_member_value_traits< value_type,
+      make_and_test_slist < nonhook_node_member_value_traits< value_type,
                                                     typename hooks<VoidPointer>::nonhook_node_member_type,
                                                     &value_type::nhn_member_,
                                                     safe_link
-                                                   >,
-                   false,
-                   false
+                                                   >
+                 , constant_time_size
+                 , false
+                 , false
+                 , Default_Holder
+                 , std::vector< value_type >
                >::test_all(data);

      //Now linear slists
-      test_slist < typename detail::get_base_value_traits
+      make_and_test_slist < typename detail::get_base_value_traits
                  < value_type
                  , typename hooks<VoidPointer>::base_hook_type
                  >::type
+                 , constant_time_size
                 , true
                 , false
+                 , Default_Holder
+                 , std::vector< value_type >
                >::test_all(data);

-      test_slist < typename detail::get_member_value_traits
+      make_and_test_slist < typename detail::get_member_value_traits
                  < value_type
                  , member_hook< value_type
                               , typename hooks<VoidPointer>::member_hook_type
                               , &value_type::node_
                               >
                  >::type
+                 , constant_time_size
                 , true
                 , false
+                 , Default_Holder
+                 , std::vector< value_type >
                >::test_all(data);

      //Now the same but caching the last node
-      test_slist < typename detail::get_base_value_traits
+      make_and_test_slist < typename detail::get_base_value_traits
                  < value_type
                  , typename hooks<VoidPointer>::base_hook_type
                  >::type
+                 , constant_time_size
                 , false
                 , true
+                 , Default_Holder
+                 , std::vector< value_type >
                >::test_all(data);
-      test_slist < typename detail::get_member_value_traits
+      make_and_test_slist < typename detail::get_member_value_traits
                  < value_type
                  , member_hook< value_type
                               , typename hooks<VoidPointer>::member_hook_type
                               , &value_type::node_
                               >
                  >::type
+                 , constant_time_size
                 , false
                 , true
+                 , Default_Holder
+                 , std::vector< value_type >
                >::test_all(data);

      //Now linear slists
-      test_slist < typename detail::get_base_value_traits
+      make_and_test_slist < typename detail::get_base_value_traits
                  < value_type
                  , typename hooks<VoidPointer>::base_hook_type
                  >::type
+                 , constant_time_size
                 , true
                 , true
+                 , Default_Holder
+                 , std::vector< value_type >
                >::test_all(data);

-      test_slist < typename detail::get_member_value_traits
+      make_and_test_slist < typename detail::get_member_value_traits
                  < value_type
                  , member_hook< value_type
                               , typename hooks<VoidPointer>::member_hook_type
                               , &value_type::node_
                               >
                  >::type
+                 , constant_time_size
                 , true
                 , true
+                 , Default_Holder
+                 , std::vector< value_type >
                >::test_all(data);
      return 0;
   }
 };

-template<class VoidPointer>
-class test_main_template<VoidPointer, false>
+template<class VoidPointer, bool Default_Holder>
+class test_main_template<VoidPointer, false, Default_Holder>
 {
   public:
   int operator()()
   {
      typedef testvalue<hooks<VoidPointer> , false> value_type;
-      std::vector<value_type> data (5);
+      std::vector< value_type > data (5);
      for (int i = 0; i < 5; ++i)
         data[i].value_ = i + 1;

-      test_slist < typename detail::get_base_value_traits
+      make_and_test_slist < typename detail::get_base_value_traits
                  < value_type
                  , typename hooks<VoidPointer>::base_hook_type
                  >::type
                 , false
                 , false
+                 , false
+                 , Default_Holder
+                 , std::vector< value_type >
                >::test_all(data);

-      test_slist < typename detail::get_member_value_traits
+      make_and_test_slist < typename detail::get_member_value_traits
                  < value_type
                  , member_hook< value_type
                               , typename hooks<VoidPointer>::member_hook_type
@@ -666,17 +633,23 @@ class test_main_template<VoidPointer, false>
                  >::type
                 , false
                 , false
+                 , false
+                 , Default_Holder
+                 , std::vector< value_type >
                >::test_all(data);

-      test_slist < typename detail::get_base_value_traits
+      make_and_test_slist < typename detail::get_base_value_traits
                  < value_type
                  , typename hooks<VoidPointer>::auto_base_hook_type
                  >::type
                 , false
                 , false
+                 , false
+                 , Default_Holder
+                 , std::vector< value_type >
                >::test_all(data);

-      test_slist < typename detail::get_member_value_traits
+      make_and_test_slist < typename detail::get_member_value_traits
                  < value_type
                  , member_hook< value_type
                               , typename hooks<VoidPointer>::auto_member_hook_type
@@ -685,37 +658,74 @@ class test_main_template<VoidPointer, false>
                  >::type
                 , false
                 , false
+                 , false
+                 , Default_Holder
+                 , std::vector< value_type >
                >::test_all(data);

-      test_slist < typename detail::get_base_value_traits
+      make_and_test_slist < typename detail::get_base_value_traits
                  < value_type
                  , typename hooks<VoidPointer>::base_hook_type
                  >::type
+                 , false
                 , true
                 , false
+                 , Default_Holder
+                 , std::vector< value_type >
                >::test_all(data);

-      test_slist < typename detail::get_member_value_traits
+      make_and_test_slist < typename detail::get_member_value_traits
                  < value_type
                  , member_hook< value_type
                               , typename hooks<VoidPointer>::member_hook_type
                               , &value_type::node_
                               >
                  >::type
+                 , false
                 , true
                 , false
+                 , Default_Holder
+                 , std::vector< value_type >
                >::test_all(data);

      //Now cache last
-      test_slist < typename detail::get_base_value_traits
+      make_and_test_slist < typename detail::get_base_value_traits
+                  < value_type
+                  , typename hooks<VoidPointer>::base_hook_type
+                  >::type
+                 , false
+                 , false
+                 , true
+                 , Default_Holder
+                 , std::vector< value_type >
+                >::test_all(data);
+
+      make_and_test_slist < typename detail::get_member_value_traits
+                  < value_type
+                  , member_hook< value_type
+                               , typename hooks<VoidPointer>::member_hook_type
+                               , &value_type::node_
+                               >
+                  >::type
+                 , false
+                 , false
+                 , true
+                 , Default_Holder
+                 , std::vector< value_type >
+                >::test_all(data);
+
+      make_and_test_slist < typename detail::get_base_value_traits
                  < value_type
                  , typename hooks<VoidPointer>::base_hook_type
                  >::type
                 , false
                 , true
+                 , true
+                 , Default_Holder
+                 , std::vector< value_type >
                >::test_all(data);

-      test_slist < typename detail::get_member_value_traits
+      make_and_test_slist < typename detail::get_member_value_traits
                  < value_type
                  , member_hook< value_type
                               , typename hooks<VoidPointer>::member_hook_type
@@ -724,36 +734,66 @@ class test_main_template<VoidPointer, false>
                  >::type
                 , false
                 , true
+                 , true
+                 , Default_Holder
+                 , std::vector< value_type >
                >::test_all(data);
+      return 0;
+   }
+};

-      test_slist < typename detail::get_base_value_traits
-                  < value_type
-                  , typename hooks<VoidPointer>::base_hook_type
-                  >::type
-                 , true
-                 , true
-                >::test_all(data);
+template < bool Constant_Time_Size >
+struct test_main_template_bptr
+{
+   int operator()()
+   {
+      typedef BPtr_Value value_type;
+      typedef BPtr_Value_Traits< List_BPtr_Node_Traits > list_value_traits;
+      typedef typename list_value_traits::node_ptr node_ptr;
+      typedef Bounded_Allocator< value_type > allocator_type;

-      test_slist < typename detail::get_member_value_traits
-                  < value_type
-                  , member_hook< value_type
-                               , typename hooks<VoidPointer>::member_hook_type
-                               , &value_type::node_
-                               >
-                  >::type
-                 , true
-                 , true
-                >::test_all(data);
+      allocator_type::init();
+      allocator_type allocator;
+
+      {
+          Bounded_Reference_Cont< value_type > ref_cont;
+          for (int i = 0; i < 5; ++i)
+          {
+              node_ptr tmp = allocator.allocate(1);
+              new (tmp.raw()) value_type(i + 1);
+              ref_cont.push_back(*tmp);
+          }
+
+          test_slist < slist < value_type,
+                               value_traits< list_value_traits >,
+                               size_type< std::size_t >,
+                               constant_time_size< Constant_Time_Size >,
+                               header_holder_type< Bounded_Pointer_Holder< value_type > >
+                             >,
+                       Bounded_Reference_Cont< value_type >
+          >::test_all(ref_cont);
+      }
+
+      assert(allocator_type::is_clear());
+      allocator_type::destroy();
      return 0;
   }
 };

 int main(int, char* [])
 {
-   test_main_template<void*, false>()();
-   test_main_template<smart_ptr<void>, false>()();
-   test_main_template<void*, true>()();
-   test_main_template<smart_ptr<void>, true>()();
+   // test combinations of (regular/smart)_ptr x (const/nonconst)_size x (default/non-default)_header_holder
+   // skip smart_ptr with non-default header_holder
+   test_main_template<void*, false, true>()();
+   test_main_template<smart_ptr<void>, false, true>()();
+   test_main_template<void*, true, true>()();
+   test_main_template<smart_ptr<void>, true, true>()();
+   test_main_template<void*, false, false>()();
+   test_main_template<void*, true, false>()();
+   // test bounded pointers with const/non_const size (always with non-default header_holder)
+   test_main_template_bptr< true >()();
+   test_main_template_bptr< false >()();
+
   return boost::report_errors();
 }
 #include <boost/intrusive/detail/config_end.hpp>