Migrated EllenBinTreeSet unit test to gtest framework

[libcds.git] / test / unit / tree / test_intrusive_ellen_bintree_rcu.h

diff --git a/test/unit/tree/test_intrusive_ellen_bintree_rcu.h b/test/unit/tree/test_intrusive_ellen_bintree_rcu.h
index d9038e4081ce4256e4c40c3a9504ad0450eae9d8..1ccffc78db6ee82fb41d240373adcb313c1cc346 100644 (file)
--- a/test/unit/tree/test_intrusive_ellen_bintree_rcu.h
+++ b/test/unit/tree/test_intrusive_ellen_bintree_rcu.h
@@ -34,9 +34,7 @@
 #include "test_intrusive_tree_rcu.h"
 
 #include <cds/intrusive/ellen_bintree_rcu.h>
-#include <cds/memory/vyukov_queue_pool.h>
-#include <cds/memory/pool_allocator.h>
-
+#include "test_ellen_bintree_update_desc_pool.h"
 
 // forward declaration
 namespace cds { namespace intrusive {}}
@@ -56,62 +54,7 @@ namespace {
         typedef base_class::key_type key_type;
 
         typedef typename base_class::base_int_item< ci::ellen_bintree::node<rcu_type>> base_item_type;
-        typedef ci::ellen_bintree::internal_node< key_type, base_item_type >           internal_base_node;
-        typedef ci::ellen_bintree::update_desc< base_item_type, internal_base_node >   update_base_desc;
-
         typedef typename base_class::member_int_item< ci::ellen_bintree::node<rcu_type>> member_item_type;
-        typedef ci::ellen_bintree::internal_node< key_type, member_item_type >           internal_member_node;
-        typedef ci::ellen_bintree::update_desc< member_item_type, internal_member_node > update_member_desc;
-
-        // update_desc pools
-        struct pool_traits: public cds::memory::vyukov_queue_pool_traits
-        {
-            typedef cds::opt::v::static_buffer< update_base_desc, 256 > buffer;
-        };
-        typedef cds::memory::vyukov_queue_pool< update_base_desc, pool_traits > pool_type;
-        typedef cds::memory::lazy_vyukov_queue_pool< update_base_desc, pool_traits > lazy_pool_type;
-
-        static pool_type *         s_Pool;
-        static lazy_pool_type *    s_LazyPool;
-
-        struct pool_accessor
-        {
-            typedef typename pool_type::value_type value_type;
-
-            pool_type& operator()() const
-            {
-                return *s_Pool;
-            }
-        };
-
-        struct lazy_pool_accessor
-        {
-            typedef typename lazy_pool_type::value_type value_type;
-
-            lazy_pool_type& operator()() const
-            {
-                return *s_LazyPool;
-            }
-        };
-
-        static void SetUpTestCase()
-        {
-            ASSERT_TRUE( s_Pool == nullptr );
-            ASSERT_TRUE( s_LazyPool == nullptr );
-            s_Pool = new pool_type;
-            s_LazyPool = new lazy_pool_type;
-        }
-
-        static void TearDownTestCase()
-        {
-            ASSERT_TRUE( s_Pool != nullptr );
-            ASSERT_TRUE( s_LazyPool != nullptr );
-            delete s_LazyPool;
-            delete s_Pool;
-
-            s_LazyPool = nullptr;
-            s_Pool = nullptr;
-        }
 
         struct generic_traits: public ci::ellen_bintree::traits
         {
@@ -133,9 +76,6 @@ namespace {
         }
     };
 
-    /*static*/ template <typename RCU> typename IntrusiveEllenBinTree<RCU>::pool_type *      IntrusiveEllenBinTree<RCU>::s_Pool = nullptr;
-    /*static*/ template <typename RCU> typename IntrusiveEllenBinTree<RCU>::lazy_pool_type * IntrusiveEllenBinTree<RCU>::s_LazyPool = nullptr;
-
     TYPED_TEST_CASE_P( IntrusiveEllenBinTree );
 
 
@@ -254,7 +194,7 @@ namespace {
             typedef ci::ellen_bintree::base_hook< ci::opt::gc< rcu_type >> hook;
             typedef typename TestFixture::template less<base_item_type> less;
             typedef cds::atomicity::item_counter item_counter;
-            typedef cds::memory::pool_allocator< typename TestFixture::update_base_desc, typename TestFixture::pool_accessor> update_desc_allocator;
+            typedef cds::memory::pool_allocator< cds_test::update_desc, cds_test::pool_accessor> update_desc_allocator;
         };
 
         typedef ci::EllenBinTree< rcu_type, key_type, base_item_type, tree_traits > tree_type;
@@ -275,7 +215,7 @@ namespace {
             typedef ci::ellen_bintree::base_hook< ci::opt::gc< rcu_type >> hook;
             typedef typename TestFixture::template less<base_item_type> less;
             typedef cds::atomicity::item_counter item_counter;
-            typedef cds::memory::pool_allocator< typename TestFixture::update_base_desc, typename TestFixture::lazy_pool_accessor> update_desc_allocator;
+            typedef cds::memory::pool_allocator< cds_test::update_desc, cds_test::lazy_pool_accessor> update_desc_allocator;
         };
 
         typedef ci::EllenBinTree< rcu_type, key_type, base_item_type, tree_traits > tree_type;
@@ -400,7 +340,7 @@ namespace {
             typedef ci::ellen_bintree::member_hook< offsetof( member_item_type, hMember ), ci::opt::gc< rcu_type >> hook;
             typedef typename TestFixture::template less<member_item_type> less;
             typedef cds::atomicity::item_counter item_counter;
-            typedef cds::memory::pool_allocator< typename TestFixture::update_member_desc, typename TestFixture::pool_accessor> update_desc_allocator;
+            typedef cds::memory::pool_allocator< cds_test::update_desc, cds_test::pool_accessor> update_desc_allocator;
         };
 
         typedef ci::EllenBinTree< rcu_type, key_type, member_item_type, tree_traits > tree_type;
@@ -421,7 +361,7 @@ namespace {
             typedef ci::ellen_bintree::member_hook< offsetof( member_item_type, hMember ), ci::opt::gc< rcu_type >> hook;
             typedef typename TestFixture::template less<member_item_type> less;
             typedef cds::atomicity::item_counter item_counter;
-            typedef cds::memory::pool_allocator< typename TestFixture::update_member_desc, typename TestFixture::lazy_pool_accessor> update_desc_allocator;
+            typedef cds::memory::pool_allocator< cds_test::update_desc, cds_test::lazy_pool_accessor> update_desc_allocator;
         };
 
         typedef ci::EllenBinTree< rcu_type, key_type, member_item_type, tree_traits > tree_type;