From: khizmax <libcds.dev@gmail.com>
Date: Tue, 14 Oct 2014 18:38:25 +0000 (+0400)
Subject: rename test-hdr/queue/hdr_queue_new.h to hdr_queue.h
X-Git-Tag: v2.0.0~198
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e93fa4c32fe5f22794496b221a5d0fe28faa0e91;p=libcds.git

rename test-hdr/queue/hdr_queue_new.h to hdr_queue.h
---

diff --git a/projects/Win/vc12/hdr-test-queue.vcxproj b/projects/Win/vc12/hdr-test-queue.vcxproj
index b5ace015..93f2ecc8 100644
--- a/projects/Win/vc12/hdr-test-queue.vcxproj
+++ b/projects/Win/vc12/hdr-test-queue.vcxproj
@@ -568,7 +568,6 @@
     <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_fcqueue.h" />
     <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_intrusive_msqueue.h" />
     <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_intrusive_segmented_queue.h" />
-    <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_queue_new.h" />
     <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_segmented_queue.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/projects/Win/vc12/hdr-test-queue.vcxproj.filters b/projects/Win/vc12/hdr-test-queue.vcxproj.filters
index 0f478f03..a4e85f3e 100644
--- a/projects/Win/vc12/hdr-test-queue.vcxproj.filters
+++ b/projects/Win/vc12/hdr-test-queue.vcxproj.filters
@@ -94,9 +94,6 @@
     <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_segmented_queue.h">
       <Filter>container</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_queue_new.h">
-      <Filter>container</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_fcqueue.h">
       <Filter>container</Filter>
     </ClInclude>
diff --git a/tests/test-hdr/queue/hdr_basketqueue_dhp.cpp b/tests/test-hdr/queue/hdr_basketqueue_dhp.cpp
index 5303e7f2..c64ccc01 100644
--- a/tests/test-hdr/queue/hdr_basketqueue_dhp.cpp
+++ b/tests/test-hdr/queue/hdr_basketqueue_dhp.cpp
@@ -3,7 +3,7 @@
 #include <cds/gc/dhp.h>
 #include <cds/container/basket_queue.h>
 
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
 
diff --git a/tests/test-hdr/queue/hdr_basketqueue_hp.cpp b/tests/test-hdr/queue/hdr_basketqueue_hp.cpp
index 5466c1ad..3d5f7ded 100644
--- a/tests/test-hdr/queue/hdr_basketqueue_hp.cpp
+++ b/tests/test-hdr/queue/hdr_basketqueue_hp.cpp
@@ -3,7 +3,7 @@
 #include <cds/gc/hp.h>
 #include <cds/container/basket_queue.h>
 
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
 
diff --git a/tests/test-hdr/queue/hdr_fcqueue.h b/tests/test-hdr/queue/hdr_fcqueue.h
index 25b6417e..411bf9da 100644
--- a/tests/test-hdr/queue/hdr_fcqueue.h
+++ b/tests/test-hdr/queue/hdr_fcqueue.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_QUEUE_SIMPLE_H
-#define __UNIT_QUEUE_SIMPLE_H
+#ifndef __CDSUNIT_HDR_FCQUEUE_H
+#define __CDSUNIT_HDR_FCQUEUE_H
 
 #include "cppunit/cppunit_proxy.h"
 #include <cds/details/defs.h>
@@ -162,4 +162,4 @@ namespace queue {
     };
 } // namespace queue
 
-#endif // #ifndef __UNIT_QUEUE_SIMPLE_H
+#endif // #ifndef __CDSUNIT_HDR_FCQUEUE_H
diff --git a/tests/test-hdr/queue/hdr_moirqueue_dhp.cpp b/tests/test-hdr/queue/hdr_moirqueue_dhp.cpp
index 5c805c0b..fec72a12 100644
--- a/tests/test-hdr/queue/hdr_moirqueue_dhp.cpp
+++ b/tests/test-hdr/queue/hdr_moirqueue_dhp.cpp
@@ -2,7 +2,7 @@
 
 #include <cds/gc/dhp.h>
 #include <cds/container/moir_queue.h>
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
 
diff --git a/tests/test-hdr/queue/hdr_moirqueue_hp.cpp b/tests/test-hdr/queue/hdr_moirqueue_hp.cpp
index 86f5083a..c97b31c3 100644
--- a/tests/test-hdr/queue/hdr_moirqueue_hp.cpp
+++ b/tests/test-hdr/queue/hdr_moirqueue_hp.cpp
@@ -3,7 +3,7 @@
 #include <cds/gc/hp.h>
 #include <cds/container/moir_queue.h>
 
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
 
diff --git a/tests/test-hdr/queue/hdr_msqueue_dhp.cpp b/tests/test-hdr/queue/hdr_msqueue_dhp.cpp
index 82671315..e0a91df3 100644
--- a/tests/test-hdr/queue/hdr_msqueue_dhp.cpp
+++ b/tests/test-hdr/queue/hdr_msqueue_dhp.cpp
@@ -3,7 +3,7 @@
 #include <cds/gc/dhp.h>
 #include <cds/container/msqueue.h>
 
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
 
diff --git a/tests/test-hdr/queue/hdr_msqueue_hp.cpp b/tests/test-hdr/queue/hdr_msqueue_hp.cpp
index 0fd442b4..0a9dda4d 100644
--- a/tests/test-hdr/queue/hdr_msqueue_hp.cpp
+++ b/tests/test-hdr/queue/hdr_msqueue_hp.cpp
@@ -3,7 +3,7 @@
 #include <cds/gc/hp.h>
 #include <cds/container/msqueue.h>
 
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
 
diff --git a/tests/test-hdr/queue/hdr_optimistic_dhp.cpp b/tests/test-hdr/queue/hdr_optimistic_dhp.cpp
index aa6ce381..a9d7fb0a 100644
--- a/tests/test-hdr/queue/hdr_optimistic_dhp.cpp
+++ b/tests/test-hdr/queue/hdr_optimistic_dhp.cpp
@@ -3,7 +3,7 @@
 #include <cds/container/optimistic_queue.h>
 #include <cds/gc/dhp.h>
 
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
 
diff --git a/tests/test-hdr/queue/hdr_optimistic_hp.cpp b/tests/test-hdr/queue/hdr_optimistic_hp.cpp
index b73d0d30..2b16c6aa 100644
--- a/tests/test-hdr/queue/hdr_optimistic_hp.cpp
+++ b/tests/test-hdr/queue/hdr_optimistic_hp.cpp
@@ -3,7 +3,7 @@
 #include <cds/container/optimistic_queue.h>
 #include <cds/gc/hp.h>
 
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
 
diff --git a/tests/test-hdr/queue/hdr_queue.h b/tests/test-hdr/queue/hdr_queue.h
new file mode 100644
index 00000000..35cfa0c3
--- /dev/null
+++ b/tests/test-hdr/queue/hdr_queue.h
@@ -0,0 +1,461 @@
+//$$CDS-header$$
+
+#ifndef __CDSUNIT_QUEUE_HDR_H
+#define __CDSUNIT_QUEUE_HDR_H
+
+#include "cppunit/cppunit_proxy.h"
+#include <cds/details/defs.h>
+
+namespace queue {
+
+    //
+    // Test queue operation in single thread mode
+    //
+    class HdrTestQueue: public CppUnitMini::TestCase
+    {
+    protected:
+        template <class Queue>
+        void test_no_ic()
+        {
+            Queue   q;
+            test_with( q );
+            test_emplace( q );
+        }
+
+        template <class Queue>
+        void test_with( Queue& q )
+        {
+            int     it;
+            int     nPrev;
+
+            // push/pop
+            for ( size_t i = 0; i < 3; ++i ) {
+                CPPUNIT_ASSERT( q.empty() );
+#ifndef _DEBUG
+                CPPUNIT_ASSERT( q.size() == 0 );
+#endif
+                CPPUNIT_ASSERT( q.enqueue( 1 ) );
+                CPPUNIT_ASSERT( !q.empty() );
+                CPPUNIT_ASSERT( q.push( 10 ) );
+                CPPUNIT_ASSERT( !q.empty() );
+#ifndef _DEBUG
+                CPPUNIT_ASSERT( q.size() == 0 )     ;   // no queue's item counter!
+#endif
+
+                it = -1;
+                CPPUNIT_ASSERT( q.pop( it ) );
+                CPPUNIT_ASSERT( it == 1 );
+                CPPUNIT_ASSERT( !q.empty() );
+                CPPUNIT_ASSERT( q.dequeue( it ) );
+                CPPUNIT_ASSERT( it == 10 );
+#ifndef _DEBUG
+                CPPUNIT_ASSERT( q.size() == 0 );
+#endif
+                CPPUNIT_ASSERT( q.empty() );
+                it += 2009;
+                nPrev = it;
+                CPPUNIT_ASSERT( !q.dequeue( it ) );
+                CPPUNIT_ASSERT( it == nPrev )       ;   // it must not be changed!
+            }
+
+            // push_with/pop_with
+            for ( size_t i = 0; i < 3; ++i ) {
+                CPPUNIT_ASSERT( q.empty() );
+#ifndef _DEBUG
+                CPPUNIT_ASSERT( q.size() == 0 );
+#endif
+                CPPUNIT_ASSERT( q.enqueue_with( []( int& dest ) { dest = 1; } ));
+                CPPUNIT_ASSERT( !q.empty() );
+                CPPUNIT_ASSERT( q.push_with( []( int& dest ) { dest = 10; } ));
+                CPPUNIT_ASSERT( !q.empty() );
+#ifndef _DEBUG
+                CPPUNIT_ASSERT( q.size() == 0 );   // no queue's item counter!
+#endif
+
+                it = -1;
+                CPPUNIT_ASSERT( q.pop_with( [&it]( int src ) { it = src; } ));
+                CPPUNIT_ASSERT( it == 1 );
+                CPPUNIT_ASSERT( !q.empty() );
+                CPPUNIT_ASSERT( q.dequeue_with( [&it]( int src ) { it = src; } ));
+                CPPUNIT_ASSERT( it == 10 );
+#ifndef _DEBUG
+                CPPUNIT_ASSERT( q.size() == 0 );
+#endif
+                CPPUNIT_ASSERT( q.empty() );
+                it += 2009;
+                nPrev = it;
+                CPPUNIT_ASSERT( !q.dequeue_with( [&it]( int src ) { it = src; } ));
+                CPPUNIT_ASSERT( it == nPrev );   // it must not be changed!
+            }
+        }
+
+        template <class Queue>
+        void test_emplace( Queue& q )
+        {
+            int     it;
+            for ( size_t i = 0; i < 3; ++i ) {
+                CPPUNIT_ASSERT( q.emplace( static_cast<int>( i * 42 )) );
+                CPPUNIT_ASSERT( !q.empty() );
+                it = -1;
+                CPPUNIT_ASSERT( q.pop( it ));
+                CPPUNIT_ASSERT( it == static_cast<int>( i * 42 ));
+                CPPUNIT_ASSERT( q.empty() );
+            }
+        }
+
+        template <class Queue>
+        void test_ic()
+        {
+            Queue   q;
+            test_ic_with( q );
+            test_emplace_ic( q );
+        }
+
+        template <class Queue>
+        void testFCQueue()
+        {
+            Queue   q;
+            test_ic_with( q );
+        }
+
+        template <class Queue>
+        void test_ic_with( Queue& q )
+        {
+            int     it;
+            int     nPrev;
+
+            // push/pop
+            for ( size_t i = 0; i < 3; ++i ) {
+                CPPUNIT_ASSERT( q.empty() );
+                CPPUNIT_ASSERT( q.size() == 0 );
+                CPPUNIT_ASSERT( q.enqueue( 1 ) );
+                CPPUNIT_ASSERT( q.size() == 1 );
+                CPPUNIT_ASSERT( !q.empty() );
+                CPPUNIT_ASSERT( q.push( 10 ) );
+                CPPUNIT_ASSERT( !q.empty() );
+                CPPUNIT_ASSERT( q.size() == 2 );
+
+                it = -1;
+                CPPUNIT_ASSERT( q.pop( it ) );
+                CPPUNIT_ASSERT( it == 1 );
+                CPPUNIT_ASSERT( !q.empty() );
+                CPPUNIT_ASSERT( q.size() == 1 );
+                CPPUNIT_ASSERT( q.dequeue( it ) );
+                CPPUNIT_ASSERT( it == 10 );
+                CPPUNIT_ASSERT( q.size() == 0 );
+                CPPUNIT_ASSERT( q.empty() );
+                CPPUNIT_ASSERT( q.size() == 0 );
+                it += 2009;
+                nPrev = it;
+                CPPUNIT_ASSERT( !q.dequeue( it ) );
+                CPPUNIT_ASSERT( it == nPrev )       ;   // it must not be changed!
+
+                CPPUNIT_ASSERT( q.empty() );
+                CPPUNIT_ASSERT( q.size() == 0 );
+            }
+
+            // push_with/pop_with
+            for ( size_t i = 0; i < 3; ++i ) {
+                CPPUNIT_ASSERT( q.empty() );
+                CPPUNIT_ASSERT( q.size() == 0 );
+                CPPUNIT_ASSERT( q.enqueue_with( []( int& dest ) { dest = 1; } ) );
+                CPPUNIT_ASSERT( !q.empty() );
+                CPPUNIT_ASSERT( q.size() == 1 );
+                CPPUNIT_ASSERT( q.push_with( []( int& dest ) { dest = 10; } ) );
+                CPPUNIT_ASSERT( !q.empty() );
+                CPPUNIT_ASSERT( q.size() == 2 );
+
+                it = -1;
+                CPPUNIT_ASSERT( q.pop_with( [&it]( int src ) { it = src; } ) );
+                CPPUNIT_ASSERT( it == 1 );
+                CPPUNIT_ASSERT( !q.empty() );
+                CPPUNIT_ASSERT( q.size() == 1 );
+                CPPUNIT_ASSERT( q.dequeue_with( [&it]( int src ) { it = src; } ) );
+                CPPUNIT_ASSERT( it == 10 );
+                CPPUNIT_ASSERT( q.size() == 0 );
+                CPPUNIT_ASSERT( q.empty() );
+                it += 2009;
+                nPrev = it;
+                CPPUNIT_ASSERT( !q.dequeue_with( [&it]( int src ) { it = src; } ) );
+                CPPUNIT_ASSERT( it == nPrev );   // it must not be changed!
+
+                CPPUNIT_ASSERT( q.size() == 0 );
+                CPPUNIT_ASSERT( q.empty() );
+            }
+        }
+
+        template <class Queue>
+        void test_emplace_ic( Queue& q )
+        {
+            int     it = 0;
+            for ( size_t i = 0; i < 3; ++i ) {
+                CPPUNIT_ASSERT( q.emplace( (int) i * 10 ) );
+                CPPUNIT_ASSERT( !q.empty() );
+                CPPUNIT_ASSERT( q.size() == 1 );
+                CPPUNIT_ASSERT( q.pop( it ));
+                CPPUNIT_ASSERT( it == (int) i * 10 );
+                CPPUNIT_ASSERT( q.empty() );
+                CPPUNIT_ASSERT( q.size() == 0 );
+            }
+        }
+
+        template <class Queue>
+        void test_bounded_no_ic()
+        {
+            Queue   q;
+            test_with( q );
+            test_emplace( q );
+
+            CPPUNIT_ASSERT( q.empty() );
+            size_t nCapacity = q.capacity();
+            for ( size_t i = 0; i < nCapacity; ++i ) {
+                CPPUNIT_CHECK_EX( q.push( static_cast<int>(i) ), "capacity=" << nCapacity << ", i=" << i );
+            }
+            // The queue is full
+            CPPUNIT_CHECK( !q.empty() );
+            CPPUNIT_ASSERT( !q.push_with( [nCapacity]( int& itm ) { itm = nCapacity; } ) );
+            int n = -1;
+            CPPUNIT_CHECK( q.pop(n) );
+            CPPUNIT_CHECK( n == 0 );
+            CPPUNIT_ASSERT( q.push( nCapacity ) );
+            CPPUNIT_ASSERT( !q.push( nCapacity ) );
+        }
+
+        template <class Queue>
+        void test_bounded_ic()
+        {
+            Queue   q;
+            test_ic_with( q );
+            test_emplace_ic( q );
+
+            CPPUNIT_ASSERT( q.empty() );
+            size_t nCapacity = q.capacity();
+            for ( size_t i = 0; i < nCapacity; ++i ) {
+                CPPUNIT_CHECK_EX( q.push( static_cast<int>(i) ), "capacity=" << nCapacity << ", i=" << i );
+            }
+            // The queue is full
+            CPPUNIT_CHECK( !q.empty() );
+            CPPUNIT_CHECK( q.size() == nCapacity );
+            CPPUNIT_ASSERT( !q.push_with( [nCapacity]( int& itm ) { itm = nCapacity; } ) );
+            int n = -1;
+            CPPUNIT_CHECK( q.pop( n ) );
+            CPPUNIT_CHECK( n == 0 );
+            CPPUNIT_ASSERT( q.push( nCapacity ) );
+            CPPUNIT_CHECK( q.size() == nCapacity );
+            CPPUNIT_ASSERT( !q.push( nCapacity ) );
+            CPPUNIT_CHECK( q.size() == nCapacity );
+        }
+
+    public:
+        void MSQueue_HP();
+        void MSQueue_HP_relax();
+        void MSQueue_HP_seqcst();
+        void MSQueue_HP_relax_align();
+        void MSQueue_HP_seqcst_align();
+        void MSQueue_HP_Counted();
+        void MSQueue_HP_Counted_relax();
+        void MSQueue_HP_Counted_seqcst();
+        void MSQueue_HP_Counted_relax_align();
+        void MSQueue_HP_Counted_seqcst_align();
+
+        void MSQueue_DHP();
+        void MSQueue_DHP_relax();
+        void MSQueue_DHP_seqcst();
+        void MSQueue_DHP_relax_align();
+        void MSQueue_DHP_seqcst_align();
+        void MSQueue_DHP_Counted();
+        void MSQueue_DHP_Counted_relax();
+        void MSQueue_DHP_Counted_seqcst();
+        void MSQueue_DHP_Counted_relax_align();
+        void MSQueue_DHP_Counted_seqcst_align();
+
+        void MoirQueue_HP();
+        void MoirQueue_HP_relax();
+        void MoirQueue_HP_seqcst();
+        void MoirQueue_HP_relax_align();
+        void MoirQueue_HP_seqcst_align();
+        void MoirQueue_HP_Counted();
+        void MoirQueue_HP_Counted_relax();
+        void MoirQueue_HP_Counted_seqcst();
+        void MoirQueue_HP_Counted_relax_align();
+        void MoirQueue_HP_Counted_seqcst_align();
+
+        void MoirQueue_DHP();
+        void MoirQueue_DHP_relax();
+        void MoirQueue_DHP_seqcst();
+        void MoirQueue_DHP_relax_align();
+        void MoirQueue_DHP_seqcst_align();
+        void MoirQueue_DHP_Counted();
+        void MoirQueue_DHP_Counted_relax();
+        void MoirQueue_DHP_Counted_seqcst();
+        void MoirQueue_DHP_Counted_relax_align();
+        void MoirQueue_DHP_Counted_seqcst_align();
+
+        void OptimisticQueue_HP();
+        void OptimisticQueue_HP_relax();
+        void OptimisticQueue_HP_seqcst();
+        void OptimisticQueue_HP_relax_align();
+        void OptimisticQueue_HP_seqcst_align();
+        void OptimisticQueue_HP_Counted();
+        void OptimisticQueue_HP_Counted_relax();
+        void OptimisticQueue_HP_Counted_seqcst();
+        void OptimisticQueue_HP_Counted_relax_align();
+        void OptimisticQueue_HP_Counted_seqcst_align();
+
+        void OptimisticQueue_DHP();
+        void OptimisticQueue_DHP_relax();
+        void OptimisticQueue_DHP_seqcst();
+        void OptimisticQueue_DHP_relax_align();
+        void OptimisticQueue_DHP_seqcst_align();
+        void OptimisticQueue_DHP_Counted();
+        void OptimisticQueue_DHP_Counted_relax();
+        void OptimisticQueue_DHP_Counted_seqcst();
+        void OptimisticQueue_DHP_Counted_relax_align();
+        void OptimisticQueue_DHP_Counted_seqcst_align();
+
+        void BasketQueue_HP();
+        void BasketQueue_HP_relax();
+        void BasketQueue_HP_seqcst();
+        void BasketQueue_HP_relax_align();
+        void BasketQueue_HP_seqcst_align();
+        void BasketQueue_HP_Counted();
+        void BasketQueue_HP_Counted_relax();
+        void BasketQueue_HP_Counted_seqcst();
+        void BasketQueue_HP_Counted_relax_align();
+        void BasketQueue_HP_Counted_seqcst_align();
+
+        void BasketQueue_DHP();
+        void BasketQueue_DHP_relax();
+        void BasketQueue_DHP_seqcst();
+        void BasketQueue_DHP_relax_align();
+        void BasketQueue_DHP_seqcst_align();
+        void BasketQueue_DHP_Counted();
+        void BasketQueue_DHP_Counted_relax();
+        void BasketQueue_DHP_Counted_seqcst();
+        void BasketQueue_DHP_Counted_relax_align();
+        void BasketQueue_DHP_Counted_seqcst_align();
+
+        void RWQueue_default();
+        void RWQueue_mutex();
+        void RWQueue_ic();
+        void RWQueue_ic_mutex();
+
+        void TsigasCycleQueue_static();
+        void TsigasCycleQueue_static_ic();
+        void TsigasCycleQueue_dyn();
+        void TsigasCycleQueue_dyn_ic();
+
+        void VyukovMPMCCycleQueue_static();
+        void VyukovMPMCCycleQueue_static_ic();
+        void VyukovMPMCCycleQueue_dyn();
+        void VyukovMPMCCycleQueue_dyn_ic();
+
+        CPPUNIT_TEST_SUITE( HdrTestQueue )
+            CPPUNIT_TEST(MSQueue_HP);
+            CPPUNIT_TEST(MSQueue_HP_relax);
+            CPPUNIT_TEST(MSQueue_HP_seqcst);
+            CPPUNIT_TEST(MSQueue_HP_relax_align);
+            CPPUNIT_TEST(MSQueue_HP_seqcst_align);
+            CPPUNIT_TEST(MSQueue_HP_Counted);
+            CPPUNIT_TEST(MSQueue_HP_Counted_relax);
+            CPPUNIT_TEST(MSQueue_HP_Counted_seqcst);
+            CPPUNIT_TEST(MSQueue_HP_Counted_relax_align);
+            CPPUNIT_TEST(MSQueue_HP_Counted_seqcst_align);
+
+            CPPUNIT_TEST(MSQueue_DHP);
+            CPPUNIT_TEST(MSQueue_DHP_relax);
+            CPPUNIT_TEST(MSQueue_DHP_seqcst);
+            CPPUNIT_TEST(MSQueue_DHP_relax_align);
+            CPPUNIT_TEST(MSQueue_DHP_seqcst_align);
+            CPPUNIT_TEST(MSQueue_DHP_Counted);
+            CPPUNIT_TEST(MSQueue_DHP_Counted_relax);
+            CPPUNIT_TEST(MSQueue_DHP_Counted_seqcst);
+            CPPUNIT_TEST(MSQueue_DHP_Counted_relax_align);
+            CPPUNIT_TEST(MSQueue_DHP_Counted_seqcst_align);
+
+            CPPUNIT_TEST(MoirQueue_HP);
+            CPPUNIT_TEST(MoirQueue_HP_relax);
+            CPPUNIT_TEST(MoirQueue_HP_seqcst);
+            CPPUNIT_TEST(MoirQueue_HP_relax_align);
+            CPPUNIT_TEST(MoirQueue_HP_seqcst_align);
+            CPPUNIT_TEST(MoirQueue_HP_Counted);
+            CPPUNIT_TEST(MoirQueue_HP_Counted_relax);
+            CPPUNIT_TEST(MoirQueue_HP_Counted_seqcst);
+            CPPUNIT_TEST(MoirQueue_HP_Counted_relax_align);
+            CPPUNIT_TEST(MoirQueue_HP_Counted_seqcst_align);
+
+            CPPUNIT_TEST(MoirQueue_DHP);
+            CPPUNIT_TEST(MoirQueue_DHP_relax);
+            CPPUNIT_TEST(MoirQueue_DHP_seqcst);
+            CPPUNIT_TEST(MoirQueue_DHP_relax_align);
+            CPPUNIT_TEST(MoirQueue_DHP_seqcst_align);
+            CPPUNIT_TEST(MoirQueue_DHP_Counted);
+            CPPUNIT_TEST(MoirQueue_DHP_Counted_relax);
+            CPPUNIT_TEST(MoirQueue_DHP_Counted_seqcst);
+            CPPUNIT_TEST(MoirQueue_DHP_Counted_relax_align);
+            CPPUNIT_TEST(MoirQueue_DHP_Counted_seqcst_align);
+
+            CPPUNIT_TEST(OptimisticQueue_HP);
+            CPPUNIT_TEST(OptimisticQueue_HP_relax);
+            CPPUNIT_TEST(OptimisticQueue_HP_seqcst);
+            CPPUNIT_TEST(OptimisticQueue_HP_relax_align);
+            CPPUNIT_TEST(OptimisticQueue_HP_seqcst_align);
+            CPPUNIT_TEST(OptimisticQueue_HP_Counted);
+            CPPUNIT_TEST(OptimisticQueue_HP_Counted_relax);
+            CPPUNIT_TEST(OptimisticQueue_HP_Counted_seqcst);
+            CPPUNIT_TEST(OptimisticQueue_HP_Counted_relax_align);
+            CPPUNIT_TEST(OptimisticQueue_HP_Counted_seqcst_align);
+
+            CPPUNIT_TEST(OptimisticQueue_DHP);
+            CPPUNIT_TEST(OptimisticQueue_DHP_relax);
+            CPPUNIT_TEST(OptimisticQueue_DHP_seqcst);
+            CPPUNIT_TEST(OptimisticQueue_DHP_relax_align);
+            CPPUNIT_TEST(OptimisticQueue_DHP_seqcst_align);
+            CPPUNIT_TEST(OptimisticQueue_DHP_Counted);
+            CPPUNIT_TEST(OptimisticQueue_DHP_Counted_relax);
+            CPPUNIT_TEST(OptimisticQueue_DHP_Counted_seqcst);
+            CPPUNIT_TEST(OptimisticQueue_DHP_Counted_relax_align);
+            CPPUNIT_TEST(OptimisticQueue_DHP_Counted_seqcst_align);
+
+            CPPUNIT_TEST(BasketQueue_HP);
+            CPPUNIT_TEST(BasketQueue_HP_relax);
+            CPPUNIT_TEST(BasketQueue_HP_seqcst);
+            CPPUNIT_TEST(BasketQueue_HP_relax_align);
+            CPPUNIT_TEST(BasketQueue_HP_seqcst_align);
+            CPPUNIT_TEST(BasketQueue_HP_Counted);
+            CPPUNIT_TEST(BasketQueue_HP_Counted_relax);
+            CPPUNIT_TEST(BasketQueue_HP_Counted_seqcst);
+            CPPUNIT_TEST(BasketQueue_HP_Counted_relax_align);
+            CPPUNIT_TEST(BasketQueue_HP_Counted_seqcst_align);
+
+            CPPUNIT_TEST(BasketQueue_DHP);
+            CPPUNIT_TEST(BasketQueue_DHP_relax);
+            CPPUNIT_TEST(BasketQueue_DHP_seqcst);
+            CPPUNIT_TEST(BasketQueue_DHP_relax_align);
+            CPPUNIT_TEST(BasketQueue_DHP_seqcst_align);
+            CPPUNIT_TEST(BasketQueue_DHP_Counted);
+            CPPUNIT_TEST(BasketQueue_DHP_Counted_relax);
+            CPPUNIT_TEST(BasketQueue_DHP_Counted_seqcst);
+            CPPUNIT_TEST(BasketQueue_DHP_Counted_relax_align);
+            CPPUNIT_TEST(BasketQueue_DHP_Counted_seqcst_align);
+
+            CPPUNIT_TEST( TsigasCycleQueue_static )
+            CPPUNIT_TEST( TsigasCycleQueue_static_ic )
+            CPPUNIT_TEST( TsigasCycleQueue_dyn )
+            CPPUNIT_TEST( TsigasCycleQueue_dyn_ic )
+
+            CPPUNIT_TEST( VyukovMPMCCycleQueue_static )
+            CPPUNIT_TEST( VyukovMPMCCycleQueue_static_ic )
+            CPPUNIT_TEST( VyukovMPMCCycleQueue_dyn )
+            CPPUNIT_TEST( VyukovMPMCCycleQueue_dyn_ic )
+
+            CPPUNIT_TEST( RWQueue_default)
+            CPPUNIT_TEST( RWQueue_mutex )
+            CPPUNIT_TEST( RWQueue_ic )
+
+        CPPUNIT_TEST_SUITE_END();
+
+    };
+} // namespace queue
+
+#endif // #ifndef __CDSUNIT_QUEUE_HDR_H
diff --git a/tests/test-hdr/queue/hdr_queue_new.h b/tests/test-hdr/queue/hdr_queue_new.h
deleted file mode 100644
index 35cfa0c3..00000000
--- a/tests/test-hdr/queue/hdr_queue_new.h
+++ /dev/null
@@ -1,461 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDSUNIT_QUEUE_HDR_H
-#define __CDSUNIT_QUEUE_HDR_H
-
-#include "cppunit/cppunit_proxy.h"
-#include <cds/details/defs.h>
-
-namespace queue {
-
-    //
-    // Test queue operation in single thread mode
-    //
-    class HdrTestQueue: public CppUnitMini::TestCase
-    {
-    protected:
-        template <class Queue>
-        void test_no_ic()
-        {
-            Queue   q;
-            test_with( q );
-            test_emplace( q );
-        }
-
-        template <class Queue>
-        void test_with( Queue& q )
-        {
-            int     it;
-            int     nPrev;
-
-            // push/pop
-            for ( size_t i = 0; i < 3; ++i ) {
-                CPPUNIT_ASSERT( q.empty() );
-#ifndef _DEBUG
-                CPPUNIT_ASSERT( q.size() == 0 );
-#endif
-                CPPUNIT_ASSERT( q.enqueue( 1 ) );
-                CPPUNIT_ASSERT( !q.empty() );
-                CPPUNIT_ASSERT( q.push( 10 ) );
-                CPPUNIT_ASSERT( !q.empty() );
-#ifndef _DEBUG
-                CPPUNIT_ASSERT( q.size() == 0 )     ;   // no queue's item counter!
-#endif
-
-                it = -1;
-                CPPUNIT_ASSERT( q.pop( it ) );
-                CPPUNIT_ASSERT( it == 1 );
-                CPPUNIT_ASSERT( !q.empty() );
-                CPPUNIT_ASSERT( q.dequeue( it ) );
-                CPPUNIT_ASSERT( it == 10 );
-#ifndef _DEBUG
-                CPPUNIT_ASSERT( q.size() == 0 );
-#endif
-                CPPUNIT_ASSERT( q.empty() );
-                it += 2009;
-                nPrev = it;
-                CPPUNIT_ASSERT( !q.dequeue( it ) );
-                CPPUNIT_ASSERT( it == nPrev )       ;   // it must not be changed!
-            }
-
-            // push_with/pop_with
-            for ( size_t i = 0; i < 3; ++i ) {
-                CPPUNIT_ASSERT( q.empty() );
-#ifndef _DEBUG
-                CPPUNIT_ASSERT( q.size() == 0 );
-#endif
-                CPPUNIT_ASSERT( q.enqueue_with( []( int& dest ) { dest = 1; } ));
-                CPPUNIT_ASSERT( !q.empty() );
-                CPPUNIT_ASSERT( q.push_with( []( int& dest ) { dest = 10; } ));
-                CPPUNIT_ASSERT( !q.empty() );
-#ifndef _DEBUG
-                CPPUNIT_ASSERT( q.size() == 0 );   // no queue's item counter!
-#endif
-
-                it = -1;
-                CPPUNIT_ASSERT( q.pop_with( [&it]( int src ) { it = src; } ));
-                CPPUNIT_ASSERT( it == 1 );
-                CPPUNIT_ASSERT( !q.empty() );
-                CPPUNIT_ASSERT( q.dequeue_with( [&it]( int src ) { it = src; } ));
-                CPPUNIT_ASSERT( it == 10 );
-#ifndef _DEBUG
-                CPPUNIT_ASSERT( q.size() == 0 );
-#endif
-                CPPUNIT_ASSERT( q.empty() );
-                it += 2009;
-                nPrev = it;
-                CPPUNIT_ASSERT( !q.dequeue_with( [&it]( int src ) { it = src; } ));
-                CPPUNIT_ASSERT( it == nPrev );   // it must not be changed!
-            }
-        }
-
-        template <class Queue>
-        void test_emplace( Queue& q )
-        {
-            int     it;
-            for ( size_t i = 0; i < 3; ++i ) {
-                CPPUNIT_ASSERT( q.emplace( static_cast<int>( i * 42 )) );
-                CPPUNIT_ASSERT( !q.empty() );
-                it = -1;
-                CPPUNIT_ASSERT( q.pop( it ));
-                CPPUNIT_ASSERT( it == static_cast<int>( i * 42 ));
-                CPPUNIT_ASSERT( q.empty() );
-            }
-        }
-
-        template <class Queue>
-        void test_ic()
-        {
-            Queue   q;
-            test_ic_with( q );
-            test_emplace_ic( q );
-        }
-
-        template <class Queue>
-        void testFCQueue()
-        {
-            Queue   q;
-            test_ic_with( q );
-        }
-
-        template <class Queue>
-        void test_ic_with( Queue& q )
-        {
-            int     it;
-            int     nPrev;
-
-            // push/pop
-            for ( size_t i = 0; i < 3; ++i ) {
-                CPPUNIT_ASSERT( q.empty() );
-                CPPUNIT_ASSERT( q.size() == 0 );
-                CPPUNIT_ASSERT( q.enqueue( 1 ) );
-                CPPUNIT_ASSERT( q.size() == 1 );
-                CPPUNIT_ASSERT( !q.empty() );
-                CPPUNIT_ASSERT( q.push( 10 ) );
-                CPPUNIT_ASSERT( !q.empty() );
-                CPPUNIT_ASSERT( q.size() == 2 );
-
-                it = -1;
-                CPPUNIT_ASSERT( q.pop( it ) );
-                CPPUNIT_ASSERT( it == 1 );
-                CPPUNIT_ASSERT( !q.empty() );
-                CPPUNIT_ASSERT( q.size() == 1 );
-                CPPUNIT_ASSERT( q.dequeue( it ) );
-                CPPUNIT_ASSERT( it == 10 );
-                CPPUNIT_ASSERT( q.size() == 0 );
-                CPPUNIT_ASSERT( q.empty() );
-                CPPUNIT_ASSERT( q.size() == 0 );
-                it += 2009;
-                nPrev = it;
-                CPPUNIT_ASSERT( !q.dequeue( it ) );
-                CPPUNIT_ASSERT( it == nPrev )       ;   // it must not be changed!
-
-                CPPUNIT_ASSERT( q.empty() );
-                CPPUNIT_ASSERT( q.size() == 0 );
-            }
-
-            // push_with/pop_with
-            for ( size_t i = 0; i < 3; ++i ) {
-                CPPUNIT_ASSERT( q.empty() );
-                CPPUNIT_ASSERT( q.size() == 0 );
-                CPPUNIT_ASSERT( q.enqueue_with( []( int& dest ) { dest = 1; } ) );
-                CPPUNIT_ASSERT( !q.empty() );
-                CPPUNIT_ASSERT( q.size() == 1 );
-                CPPUNIT_ASSERT( q.push_with( []( int& dest ) { dest = 10; } ) );
-                CPPUNIT_ASSERT( !q.empty() );
-                CPPUNIT_ASSERT( q.size() == 2 );
-
-                it = -1;
-                CPPUNIT_ASSERT( q.pop_with( [&it]( int src ) { it = src; } ) );
-                CPPUNIT_ASSERT( it == 1 );
-                CPPUNIT_ASSERT( !q.empty() );
-                CPPUNIT_ASSERT( q.size() == 1 );
-                CPPUNIT_ASSERT( q.dequeue_with( [&it]( int src ) { it = src; } ) );
-                CPPUNIT_ASSERT( it == 10 );
-                CPPUNIT_ASSERT( q.size() == 0 );
-                CPPUNIT_ASSERT( q.empty() );
-                it += 2009;
-                nPrev = it;
-                CPPUNIT_ASSERT( !q.dequeue_with( [&it]( int src ) { it = src; } ) );
-                CPPUNIT_ASSERT( it == nPrev );   // it must not be changed!
-
-                CPPUNIT_ASSERT( q.size() == 0 );
-                CPPUNIT_ASSERT( q.empty() );
-            }
-        }
-
-        template <class Queue>
-        void test_emplace_ic( Queue& q )
-        {
-            int     it = 0;
-            for ( size_t i = 0; i < 3; ++i ) {
-                CPPUNIT_ASSERT( q.emplace( (int) i * 10 ) );
-                CPPUNIT_ASSERT( !q.empty() );
-                CPPUNIT_ASSERT( q.size() == 1 );
-                CPPUNIT_ASSERT( q.pop( it ));
-                CPPUNIT_ASSERT( it == (int) i * 10 );
-                CPPUNIT_ASSERT( q.empty() );
-                CPPUNIT_ASSERT( q.size() == 0 );
-            }
-        }
-
-        template <class Queue>
-        void test_bounded_no_ic()
-        {
-            Queue   q;
-            test_with( q );
-            test_emplace( q );
-
-            CPPUNIT_ASSERT( q.empty() );
-            size_t nCapacity = q.capacity();
-            for ( size_t i = 0; i < nCapacity; ++i ) {
-                CPPUNIT_CHECK_EX( q.push( static_cast<int>(i) ), "capacity=" << nCapacity << ", i=" << i );
-            }
-            // The queue is full
-            CPPUNIT_CHECK( !q.empty() );
-            CPPUNIT_ASSERT( !q.push_with( [nCapacity]( int& itm ) { itm = nCapacity; } ) );
-            int n = -1;
-            CPPUNIT_CHECK( q.pop(n) );
-            CPPUNIT_CHECK( n == 0 );
-            CPPUNIT_ASSERT( q.push( nCapacity ) );
-            CPPUNIT_ASSERT( !q.push( nCapacity ) );
-        }
-
-        template <class Queue>
-        void test_bounded_ic()
-        {
-            Queue   q;
-            test_ic_with( q );
-            test_emplace_ic( q );
-
-            CPPUNIT_ASSERT( q.empty() );
-            size_t nCapacity = q.capacity();
-            for ( size_t i = 0; i < nCapacity; ++i ) {
-                CPPUNIT_CHECK_EX( q.push( static_cast<int>(i) ), "capacity=" << nCapacity << ", i=" << i );
-            }
-            // The queue is full
-            CPPUNIT_CHECK( !q.empty() );
-            CPPUNIT_CHECK( q.size() == nCapacity );
-            CPPUNIT_ASSERT( !q.push_with( [nCapacity]( int& itm ) { itm = nCapacity; } ) );
-            int n = -1;
-            CPPUNIT_CHECK( q.pop( n ) );
-            CPPUNIT_CHECK( n == 0 );
-            CPPUNIT_ASSERT( q.push( nCapacity ) );
-            CPPUNIT_CHECK( q.size() == nCapacity );
-            CPPUNIT_ASSERT( !q.push( nCapacity ) );
-            CPPUNIT_CHECK( q.size() == nCapacity );
-        }
-
-    public:
-        void MSQueue_HP();
-        void MSQueue_HP_relax();
-        void MSQueue_HP_seqcst();
-        void MSQueue_HP_relax_align();
-        void MSQueue_HP_seqcst_align();
-        void MSQueue_HP_Counted();
-        void MSQueue_HP_Counted_relax();
-        void MSQueue_HP_Counted_seqcst();
-        void MSQueue_HP_Counted_relax_align();
-        void MSQueue_HP_Counted_seqcst_align();
-
-        void MSQueue_DHP();
-        void MSQueue_DHP_relax();
-        void MSQueue_DHP_seqcst();
-        void MSQueue_DHP_relax_align();
-        void MSQueue_DHP_seqcst_align();
-        void MSQueue_DHP_Counted();
-        void MSQueue_DHP_Counted_relax();
-        void MSQueue_DHP_Counted_seqcst();
-        void MSQueue_DHP_Counted_relax_align();
-        void MSQueue_DHP_Counted_seqcst_align();
-
-        void MoirQueue_HP();
-        void MoirQueue_HP_relax();
-        void MoirQueue_HP_seqcst();
-        void MoirQueue_HP_relax_align();
-        void MoirQueue_HP_seqcst_align();
-        void MoirQueue_HP_Counted();
-        void MoirQueue_HP_Counted_relax();
-        void MoirQueue_HP_Counted_seqcst();
-        void MoirQueue_HP_Counted_relax_align();
-        void MoirQueue_HP_Counted_seqcst_align();
-
-        void MoirQueue_DHP();
-        void MoirQueue_DHP_relax();
-        void MoirQueue_DHP_seqcst();
-        void MoirQueue_DHP_relax_align();
-        void MoirQueue_DHP_seqcst_align();
-        void MoirQueue_DHP_Counted();
-        void MoirQueue_DHP_Counted_relax();
-        void MoirQueue_DHP_Counted_seqcst();
-        void MoirQueue_DHP_Counted_relax_align();
-        void MoirQueue_DHP_Counted_seqcst_align();
-
-        void OptimisticQueue_HP();
-        void OptimisticQueue_HP_relax();
-        void OptimisticQueue_HP_seqcst();
-        void OptimisticQueue_HP_relax_align();
-        void OptimisticQueue_HP_seqcst_align();
-        void OptimisticQueue_HP_Counted();
-        void OptimisticQueue_HP_Counted_relax();
-        void OptimisticQueue_HP_Counted_seqcst();
-        void OptimisticQueue_HP_Counted_relax_align();
-        void OptimisticQueue_HP_Counted_seqcst_align();
-
-        void OptimisticQueue_DHP();
-        void OptimisticQueue_DHP_relax();
-        void OptimisticQueue_DHP_seqcst();
-        void OptimisticQueue_DHP_relax_align();
-        void OptimisticQueue_DHP_seqcst_align();
-        void OptimisticQueue_DHP_Counted();
-        void OptimisticQueue_DHP_Counted_relax();
-        void OptimisticQueue_DHP_Counted_seqcst();
-        void OptimisticQueue_DHP_Counted_relax_align();
-        void OptimisticQueue_DHP_Counted_seqcst_align();
-
-        void BasketQueue_HP();
-        void BasketQueue_HP_relax();
-        void BasketQueue_HP_seqcst();
-        void BasketQueue_HP_relax_align();
-        void BasketQueue_HP_seqcst_align();
-        void BasketQueue_HP_Counted();
-        void BasketQueue_HP_Counted_relax();
-        void BasketQueue_HP_Counted_seqcst();
-        void BasketQueue_HP_Counted_relax_align();
-        void BasketQueue_HP_Counted_seqcst_align();
-
-        void BasketQueue_DHP();
-        void BasketQueue_DHP_relax();
-        void BasketQueue_DHP_seqcst();
-        void BasketQueue_DHP_relax_align();
-        void BasketQueue_DHP_seqcst_align();
-        void BasketQueue_DHP_Counted();
-        void BasketQueue_DHP_Counted_relax();
-        void BasketQueue_DHP_Counted_seqcst();
-        void BasketQueue_DHP_Counted_relax_align();
-        void BasketQueue_DHP_Counted_seqcst_align();
-
-        void RWQueue_default();
-        void RWQueue_mutex();
-        void RWQueue_ic();
-        void RWQueue_ic_mutex();
-
-        void TsigasCycleQueue_static();
-        void TsigasCycleQueue_static_ic();
-        void TsigasCycleQueue_dyn();
-        void TsigasCycleQueue_dyn_ic();
-
-        void VyukovMPMCCycleQueue_static();
-        void VyukovMPMCCycleQueue_static_ic();
-        void VyukovMPMCCycleQueue_dyn();
-        void VyukovMPMCCycleQueue_dyn_ic();
-
-        CPPUNIT_TEST_SUITE( HdrTestQueue )
-            CPPUNIT_TEST(MSQueue_HP);
-            CPPUNIT_TEST(MSQueue_HP_relax);
-            CPPUNIT_TEST(MSQueue_HP_seqcst);
-            CPPUNIT_TEST(MSQueue_HP_relax_align);
-            CPPUNIT_TEST(MSQueue_HP_seqcst_align);
-            CPPUNIT_TEST(MSQueue_HP_Counted);
-            CPPUNIT_TEST(MSQueue_HP_Counted_relax);
-            CPPUNIT_TEST(MSQueue_HP_Counted_seqcst);
-            CPPUNIT_TEST(MSQueue_HP_Counted_relax_align);
-            CPPUNIT_TEST(MSQueue_HP_Counted_seqcst_align);
-
-            CPPUNIT_TEST(MSQueue_DHP);
-            CPPUNIT_TEST(MSQueue_DHP_relax);
-            CPPUNIT_TEST(MSQueue_DHP_seqcst);
-            CPPUNIT_TEST(MSQueue_DHP_relax_align);
-            CPPUNIT_TEST(MSQueue_DHP_seqcst_align);
-            CPPUNIT_TEST(MSQueue_DHP_Counted);
-            CPPUNIT_TEST(MSQueue_DHP_Counted_relax);
-            CPPUNIT_TEST(MSQueue_DHP_Counted_seqcst);
-            CPPUNIT_TEST(MSQueue_DHP_Counted_relax_align);
-            CPPUNIT_TEST(MSQueue_DHP_Counted_seqcst_align);
-
-            CPPUNIT_TEST(MoirQueue_HP);
-            CPPUNIT_TEST(MoirQueue_HP_relax);
-            CPPUNIT_TEST(MoirQueue_HP_seqcst);
-            CPPUNIT_TEST(MoirQueue_HP_relax_align);
-            CPPUNIT_TEST(MoirQueue_HP_seqcst_align);
-            CPPUNIT_TEST(MoirQueue_HP_Counted);
-            CPPUNIT_TEST(MoirQueue_HP_Counted_relax);
-            CPPUNIT_TEST(MoirQueue_HP_Counted_seqcst);
-            CPPUNIT_TEST(MoirQueue_HP_Counted_relax_align);
-            CPPUNIT_TEST(MoirQueue_HP_Counted_seqcst_align);
-
-            CPPUNIT_TEST(MoirQueue_DHP);
-            CPPUNIT_TEST(MoirQueue_DHP_relax);
-            CPPUNIT_TEST(MoirQueue_DHP_seqcst);
-            CPPUNIT_TEST(MoirQueue_DHP_relax_align);
-            CPPUNIT_TEST(MoirQueue_DHP_seqcst_align);
-            CPPUNIT_TEST(MoirQueue_DHP_Counted);
-            CPPUNIT_TEST(MoirQueue_DHP_Counted_relax);
-            CPPUNIT_TEST(MoirQueue_DHP_Counted_seqcst);
-            CPPUNIT_TEST(MoirQueue_DHP_Counted_relax_align);
-            CPPUNIT_TEST(MoirQueue_DHP_Counted_seqcst_align);
-
-            CPPUNIT_TEST(OptimisticQueue_HP);
-            CPPUNIT_TEST(OptimisticQueue_HP_relax);
-            CPPUNIT_TEST(OptimisticQueue_HP_seqcst);
-            CPPUNIT_TEST(OptimisticQueue_HP_relax_align);
-            CPPUNIT_TEST(OptimisticQueue_HP_seqcst_align);
-            CPPUNIT_TEST(OptimisticQueue_HP_Counted);
-            CPPUNIT_TEST(OptimisticQueue_HP_Counted_relax);
-            CPPUNIT_TEST(OptimisticQueue_HP_Counted_seqcst);
-            CPPUNIT_TEST(OptimisticQueue_HP_Counted_relax_align);
-            CPPUNIT_TEST(OptimisticQueue_HP_Counted_seqcst_align);
-
-            CPPUNIT_TEST(OptimisticQueue_DHP);
-            CPPUNIT_TEST(OptimisticQueue_DHP_relax);
-            CPPUNIT_TEST(OptimisticQueue_DHP_seqcst);
-            CPPUNIT_TEST(OptimisticQueue_DHP_relax_align);
-            CPPUNIT_TEST(OptimisticQueue_DHP_seqcst_align);
-            CPPUNIT_TEST(OptimisticQueue_DHP_Counted);
-            CPPUNIT_TEST(OptimisticQueue_DHP_Counted_relax);
-            CPPUNIT_TEST(OptimisticQueue_DHP_Counted_seqcst);
-            CPPUNIT_TEST(OptimisticQueue_DHP_Counted_relax_align);
-            CPPUNIT_TEST(OptimisticQueue_DHP_Counted_seqcst_align);
-
-            CPPUNIT_TEST(BasketQueue_HP);
-            CPPUNIT_TEST(BasketQueue_HP_relax);
-            CPPUNIT_TEST(BasketQueue_HP_seqcst);
-            CPPUNIT_TEST(BasketQueue_HP_relax_align);
-            CPPUNIT_TEST(BasketQueue_HP_seqcst_align);
-            CPPUNIT_TEST(BasketQueue_HP_Counted);
-            CPPUNIT_TEST(BasketQueue_HP_Counted_relax);
-            CPPUNIT_TEST(BasketQueue_HP_Counted_seqcst);
-            CPPUNIT_TEST(BasketQueue_HP_Counted_relax_align);
-            CPPUNIT_TEST(BasketQueue_HP_Counted_seqcst_align);
-
-            CPPUNIT_TEST(BasketQueue_DHP);
-            CPPUNIT_TEST(BasketQueue_DHP_relax);
-            CPPUNIT_TEST(BasketQueue_DHP_seqcst);
-            CPPUNIT_TEST(BasketQueue_DHP_relax_align);
-            CPPUNIT_TEST(BasketQueue_DHP_seqcst_align);
-            CPPUNIT_TEST(BasketQueue_DHP_Counted);
-            CPPUNIT_TEST(BasketQueue_DHP_Counted_relax);
-            CPPUNIT_TEST(BasketQueue_DHP_Counted_seqcst);
-            CPPUNIT_TEST(BasketQueue_DHP_Counted_relax_align);
-            CPPUNIT_TEST(BasketQueue_DHP_Counted_seqcst_align);
-
-            CPPUNIT_TEST( TsigasCycleQueue_static )
-            CPPUNIT_TEST( TsigasCycleQueue_static_ic )
-            CPPUNIT_TEST( TsigasCycleQueue_dyn )
-            CPPUNIT_TEST( TsigasCycleQueue_dyn_ic )
-
-            CPPUNIT_TEST( VyukovMPMCCycleQueue_static )
-            CPPUNIT_TEST( VyukovMPMCCycleQueue_static_ic )
-            CPPUNIT_TEST( VyukovMPMCCycleQueue_dyn )
-            CPPUNIT_TEST( VyukovMPMCCycleQueue_dyn_ic )
-
-            CPPUNIT_TEST( RWQueue_default)
-            CPPUNIT_TEST( RWQueue_mutex )
-            CPPUNIT_TEST( RWQueue_ic )
-
-        CPPUNIT_TEST_SUITE_END();
-
-    };
-} // namespace queue
-
-#endif // #ifndef __CDSUNIT_QUEUE_HDR_H
diff --git a/tests/test-hdr/queue/hdr_queue_register.cpp b/tests/test-hdr/queue/hdr_queue_register.cpp
index 334d6be4..9ef1d406 100644
--- a/tests/test-hdr/queue/hdr_queue_register.cpp
+++ b/tests/test-hdr/queue/hdr_queue_register.cpp
@@ -2,7 +2,7 @@
 
 #include "hdr_intrusive_msqueue.h"
 #include "hdr_intrusive_segmented_queue.h"
-#include "hdr_queue_new.h"
+#include "hdr_queue.h"
 #include "hdr_fcqueue.h"
 #include "hdr_segmented_queue.h"
 
diff --git a/tests/test-hdr/queue/hdr_rwqueue.cpp b/tests/test-hdr/queue/hdr_rwqueue.cpp
index bb826a08..ea72eab5 100644
--- a/tests/test-hdr/queue/hdr_rwqueue.cpp
+++ b/tests/test-hdr/queue/hdr_rwqueue.cpp
@@ -3,7 +3,7 @@
 #include <cds/container/rwqueue.h>
 #include <mutex>
 
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
     void HdrTestQueue::RWQueue_default()
diff --git a/tests/test-hdr/queue/hdr_tsigas_cycle_queue.cpp b/tests/test-hdr/queue/hdr_tsigas_cycle_queue.cpp
index 2b0b38be..ce9bfaba 100644
--- a/tests/test-hdr/queue/hdr_tsigas_cycle_queue.cpp
+++ b/tests/test-hdr/queue/hdr_tsigas_cycle_queue.cpp
@@ -1,6 +1,6 @@
 //$$CDS-header$$
 
-#include "hdr_queue_new.h"
+#include "hdr_queue.h"
 #include <cds/container/tsigas_cycle_queue.h>
 
 namespace queue {
diff --git a/tests/test-hdr/queue/hdr_vyukov_mpmc_cyclic.cpp b/tests/test-hdr/queue/hdr_vyukov_mpmc_cyclic.cpp
index 606ef43e..ef267dec 100644
--- a/tests/test-hdr/queue/hdr_vyukov_mpmc_cyclic.cpp
+++ b/tests/test-hdr/queue/hdr_vyukov_mpmc_cyclic.cpp
@@ -2,7 +2,7 @@
 
 #include <cds/container/vyukov_mpmc_cycle_queue.h>
 
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
     namespace{