Merge branch 'dev' into integration

[libcds.git] / test / unit / list / intrusive_michael_dhp.cpp

diff --git a/test/unit/list/intrusive_michael_dhp.cpp b/test/unit/list/intrusive_michael_dhp.cpp
index 7a33a83b050efcca247f2525f6ca38658292b5fb..cbc0d20e1bff0529cac644ed89ec4d6f21df0677 100644 (file)
--- a/test/unit/list/intrusive_michael_dhp.cpp
+++ b/test/unit/list/intrusive_michael_dhp.cpp
@@ -25,7 +25,7 @@
     SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
     OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.     
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "test_intrusive_list_hp.h"
@@ -57,7 +57,7 @@ namespace {
         void TearDown()
         {
             cds::threading::Manager::detachThread();
-            cds::gc::hp::GarbageCollector::Destruct();
+            cds::gc::dhp::GarbageCollector::Destruct();
         }
     };
 
@@ -73,7 +73,7 @@ namespace {
 
        list_type l;
        test_common( l );
-       test_sorted_iterator( l );
+       test_ordered_iterator( l );
        test_hp( l );
     }
 
@@ -89,7 +89,7 @@ namespace {
 
         list_type l;
         test_common( l );
-        test_sorted_iterator( l );
+        test_ordered_iterator( l );
         test_hp( l );
     }
 
@@ -106,7 +106,7 @@ namespace {
 
         list_type l;
         test_common( l );
-        test_sorted_iterator( l );
+        test_ordered_iterator( l );
         test_hp( l );
     }
 
@@ -124,7 +124,7 @@ namespace {
 
         list_type l;
         test_common( l );
-        test_sorted_iterator( l );
+        test_ordered_iterator( l );
         test_hp( l );
     }
 
@@ -142,9 +142,43 @@ namespace {
 
         list_type l;
         test_common( l );
-        test_sorted_iterator( l );
+        test_ordered_iterator( l );
         test_hp( l );
     }
+    TEST_F( IntrusiveMichaelList_DHP, base_hook_stat )
+    {
+        struct traits: public ci::michael_list::traits {
+            typedef ci::michael_list::base_hook< cds::opt::gc< gc_type >> hook;
+            typedef mock_disposer disposer;
+            typedef cmp< base_item > compare;
+            typedef intrusive_list_common::less< base_item > less;
+            typedef cds::intrusive::michael_list::stat<> stat;
+        };
+        typedef ci::MichaelList< gc_type, base_item, traits > list_type;
+
+        list_type l;
+        test_common( l );
+        test_ordered_iterator( l );
+        test_hp( l );
+    }
+
+    TEST_F( IntrusiveMichaelList_DHP, base_hook_wrapped_stat )
+    {
+        struct traits: public ci::michael_list::traits {
+            typedef ci::michael_list::base_hook< cds::opt::gc< gc_type >> hook;
+            typedef mock_disposer disposer;
+            typedef cmp< base_item > compare;
+            typedef cds::intrusive::michael_list::wrapped_stat<> stat;
+        };
+        typedef ci::MichaelList< gc_type, base_item, traits > list_type;
+
+        cds::intrusive::michael_list::stat<> st;
+        list_type l( st );
+        test_common( l );
+        test_ordered_iterator( l );
+        test_hp( l );
+    }
+
 
     TEST_F( IntrusiveMichaelList_DHP, member_hook )
     {
@@ -158,7 +192,7 @@ namespace {
 
        list_type l;
        test_common( l );
-       test_sorted_iterator( l );
+       test_ordered_iterator( l );
        test_hp( l );
     }
 
@@ -174,7 +208,7 @@ namespace {
 
         list_type l;
         test_common( l );
-        test_sorted_iterator( l );
+        test_ordered_iterator( l );
         test_hp( l );
     }
 
@@ -191,7 +225,7 @@ namespace {
 
         list_type l;
         test_common( l );
-        test_sorted_iterator( l );
+        test_ordered_iterator( l );
         test_hp( l );
     }
 
@@ -209,7 +243,7 @@ namespace {
 
         list_type l;
         test_common( l );
-        test_sorted_iterator( l );
+        test_ordered_iterator( l );
         test_hp( l );
     }
 
@@ -227,7 +261,41 @@ namespace {
 
         list_type l;
         test_common( l );
-        test_sorted_iterator( l );
+        test_ordered_iterator( l );
+        test_hp( l );
+    }
+
+    TEST_F( IntrusiveMichaelList_DHP, member_hook_stat )
+    {
+        struct traits: public ci::michael_list::traits {
+            typedef ci::michael_list::member_hook< offsetof( member_item, hMember ), cds::opt::gc< gc_type >> hook;
+            typedef mock_disposer disposer;
+            typedef cmp< member_item > compare;
+            typedef intrusive_list_common::less< member_item > less;
+            typedef cds::intrusive::michael_list::stat<> stat;
+        };
+        typedef ci::MichaelList< gc_type, member_item, traits > list_type;
+
+        list_type l;
+        test_common( l );
+        test_ordered_iterator( l );
+        test_hp( l );
+    }
+
+    TEST_F( IntrusiveMichaelList_DHP, member_hook_wrapped_stat )
+    {
+        struct traits: public ci::michael_list::traits {
+            typedef ci::michael_list::member_hook< offsetof( member_item, hMember ), cds::opt::gc< gc_type >> hook;
+            typedef mock_disposer disposer;
+            typedef cmp< member_item > compare;
+            typedef cds::intrusive::michael_list::wrapped_stat<> stat;
+        };
+        typedef ci::MichaelList< gc_type, member_item, traits > list_type;
+
+        cds::intrusive::michael_list::stat<> st;
+        list_type l( st );
+        test_common( l );
+        test_ordered_iterator( l );
         test_hp( l );
     }