container::SplitListSet refactoring

[libcds.git] / tests / test-hdr / set / hdr_splitlist_set_lazy_hp.cpp

diff --git a/tests/test-hdr/set/hdr_splitlist_set_lazy_hp.cpp b/tests/test-hdr/set/hdr_splitlist_set_lazy_hp.cpp
index dfad981f1cdebf4495ce4ae5cca8756b15277701..26b25a24b987e51c29c4f514cb3828286720e64a 100644 (file)
--- a/tests/test-hdr/set/hdr_splitlist_set_lazy_hp.cpp
+++ b/tests/test-hdr/set/hdr_splitlist_set_lazy_hp.cpp
@@ -7,7 +7,7 @@
 namespace set {
 
     namespace {
-        struct HP_cmp_traits: public cc::split_list::type_traits
+        struct HP_cmp_traits: public cc::split_list::traits
         {
             typedef cc::lazy_list_tag                   ordered_list;
             typedef HashSetHdrTest::hash_int            hash;
@@ -15,13 +15,13 @@ namespace set {
             typedef cc::opt::v::relaxed_ordering        memory_model;
             enum { dynamic_bucket_table = false };
 
-            struct ordered_list_traits: public cc::lazy_list::type_traits
+            struct ordered_list_traits: public cc::lazy_list::traits
             {
                 typedef HashSetHdrTest::cmp<HashSetHdrTest::item>   compare;
             };
         };
 
-        struct HP_less_traits: public cc::split_list::type_traits
+        struct HP_less_traits: public cc::split_list::traits
         {
             typedef cc::lazy_list_tag                ordered_list;
             typedef HashSetHdrTest::hash_int            hash;
@@ -29,24 +29,29 @@ namespace set {
             typedef cc::opt::v::sequential_consistent                      memory_model;
             enum { dynamic_bucket_table = false };
 
-            struct ordered_list_traits: public cc::lazy_list::type_traits
+            struct ordered_list_traits: public cc::lazy_list::traits
             {
                 typedef HashSetHdrTest::less<HashSetHdrTest::item>   less;
             };
         };
 
-        struct HP_cmpmix_traits: public cc::split_list::type_traits
+        struct HP_cmpmix_traits: public cc::split_list::traits
         {
             typedef cc::lazy_list_tag                ordered_list;
             typedef HashSetHdrTest::hash_int            hash;
             typedef HashSetHdrTest::simple_item_counter item_counter;
 
-            struct ordered_list_traits: public cc::lazy_list::type_traits
+            struct ordered_list_traits: public cc::lazy_list::traits
             {
                 typedef HashSetHdrTest::cmp<HashSetHdrTest::item>   compare;
                 typedef HashSetHdrTest::less<HashSetHdrTest::item>   less;
             };
         };
+
+        struct HP_cmpmix_stat_traits : public HP_cmpmix_traits
+        {
+            typedef cc::split_list::stat<> stat;
+        };
     }
 
     void HashSetHdrTest::Split_Lazy_HP_cmp()
@@ -122,6 +127,29 @@ namespace set {
         test_int< opt_set >();
     }
 
+    void HashSetHdrTest::Split_Lazy_HP_cmpmix_stat()
+    {
+        // traits-based version
+        typedef cc::SplitListSet< cds::gc::HP, item, HP_cmpmix_stat_traits > set;
+        test_int< set >();
+
+        // option-based version
+        typedef cc::SplitListSet< cds::gc::HP, item,
+            cc::split_list::make_traits<
+                cc::split_list::ordered_list<cc::lazy_list_tag>
+                ,cc::opt::hash< hash_int >
+                ,cc::opt::item_counter< simple_item_counter >
+                ,cds::opt::stat< cc::split_list::stat<> >
+                ,cc::split_list::ordered_list_traits<
+                    cc::lazy_list::make_traits<
+                        cc::opt::less< less<item> >
+                        ,cc::opt::compare< cmp<item> >
+                    >::type
+                >
+            >::type
+        > opt_set;
+        test_int< opt_set >();
+    }
 
 } // namespace set