Merge branch 'flat_combinig_add_stress_and_unint_tests' of https://github.com/mgalimu...

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

diff --git a/test/unit/list/kv_iterable_hp.cpp b/test/unit/list/kv_iterable_hp.cpp
index cca1577f55b2dd0cfcf7146b60ef8bd9ec885bc4..e43a676ea66b604354cd2a434f1a6d4740d381a1 100644 (file)
--- a/test/unit/list/kv_iterable_hp.cpp
+++ b/test/unit/list/kv_iterable_hp.cpp
@@ -1,11 +1,11 @@
 /*
     This file is a part of libcds - Concurrent Data Structures library
 
-    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -59,6 +59,7 @@ namespace {
         typedef cc::IterableKVList< gc_type, key_type, value_type,
             typename cc::iterable_list::make_traits<
                 cds::opt::less< lt >
+                ,cds::opt::item_counter< cds::atomicity::item_counter >
             >::type
         > list_type;
 
@@ -73,6 +74,7 @@ namespace {
         typedef cc::IterableKVList< gc_type, key_type, value_type,
             typename cc::iterable_list::make_traits<
                 cds::opt::compare< cmp >
+                , cds::opt::item_counter< cds::atomicity::item_counter >
             >::type
         > list_type;
 
@@ -88,6 +90,7 @@ namespace {
             typename cc::iterable_list::make_traits<
                 cds::opt::compare< cmp >
                 ,cds::opt::less< lt >
+                , cds::opt::item_counter< cds::atomicity::item_counter >
             >::type
         > list_type;
 
@@ -97,21 +100,6 @@ namespace {
         test_hp( l );
     }
 
-    TEST_F( IterableKVList_HP, item_counting )
-    {
-        struct traits : public cc::iterable_list::traits
-        {
-            typedef lt less;
-            typedef cds::atomicity::item_counter item_counter;
-        };
-        typedef cc::IterableKVList<gc_type, key_type, value_type, traits > list_type;
-
-        list_type l;
-        test_common( l );
-        test_ordered_iterator( l );
-        test_hp( l );
-    }
-
     TEST_F( IterableKVList_HP, backoff )
     {
         struct traits : public cc::iterable_list::traits