From 357e174bd35ba693db4e7ea5f5cf5dcc426352c7 Mon Sep 17 00:00:00 2001
From: khizmax <libcds.dev@gmail.com>
Date: Tue, 14 Oct 2014 22:34:02 +0400
Subject: [PATCH] rename test-hdr/queue/hdr_queue.h to hdr_fcqueue.h

---
 projects/Win/vc12/hdr-test-queue.vcxproj       |  2 +-
 .../Win/vc12/hdr-test-queue.vcxproj.filters    |  4 ++--
 tests/test-hdr/queue/hdr_fcqueue.cpp           | 18 +++++++++---------
 .../queue/{hdr_queue.h => hdr_fcqueue.h}       |  4 ++--
 tests/test-hdr/queue/hdr_queue_register.cpp    |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)
 rename tests/test-hdr/queue/{hdr_queue.h => hdr_fcqueue.h} (97%)

diff --git a/projects/Win/vc12/hdr-test-queue.vcxproj b/projects/Win/vc12/hdr-test-queue.vcxproj
index b05883a5..b5ace015 100644
--- a/projects/Win/vc12/hdr-test-queue.vcxproj
+++ b/projects/Win/vc12/hdr-test-queue.vcxproj
@@ -565,9 +565,9 @@
     <ClCompile Include="..\..\..\tests\test-hdr\queue\hdr_vyukov_mpmc_cyclic.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <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.h" />
     <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_queue_new.h" />
     <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_segmented_queue.h" />
   </ItemGroup>
diff --git a/projects/Win/vc12/hdr-test-queue.vcxproj.filters b/projects/Win/vc12/hdr-test-queue.vcxproj.filters
index d377ec6a..0f478f03 100644
--- a/projects/Win/vc12/hdr-test-queue.vcxproj.filters
+++ b/projects/Win/vc12/hdr-test-queue.vcxproj.filters
@@ -94,10 +94,10 @@
     <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_segmented_queue.h">
       <Filter>container</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_queue.h">
+    <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_queue_new.h">
       <Filter>container</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_queue_new.h">
+    <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_fcqueue.h">
       <Filter>container</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/tests/test-hdr/queue/hdr_fcqueue.cpp b/tests/test-hdr/queue/hdr_fcqueue.cpp
index 096b7d14..00576abd 100644
--- a/tests/test-hdr/queue/hdr_fcqueue.cpp
+++ b/tests/test-hdr/queue/hdr_fcqueue.cpp
@@ -1,19 +1,19 @@
 //$$CDS-header$$
 
 #include <cds/container/fcqueue.h>
-#include "queue/hdr_queue.h"
+#include "queue/hdr_fcqueue.h"
 
 #include <list>
 
 namespace queue {
 
-    void Queue_TestHeader::FCQueue_deque()
+    void HdrFCQueue::FCQueue_deque()
     {
         typedef cds::container::FCQueue<int> queue_type;
         testFCQueue<queue_type>();
     }
 
-    void Queue_TestHeader::FCQueue_deque_elimination()
+    void HdrFCQueue::FCQueue_deque_elimination()
     {
         typedef cds::container::FCQueue<int, std::queue< int, std::deque<int> >,
             cds::container::fcqueue::make_traits<
@@ -23,7 +23,7 @@ namespace queue {
         testFCQueue<queue_type>();
     }
 
-    void Queue_TestHeader::FCQueue_deque_mutex()
+    void HdrFCQueue::FCQueue_deque_mutex()
     {
         typedef cds::container::FCQueue<int, std::queue< int, std::deque<int> >,
             cds::container::fcqueue::make_traits<
@@ -33,7 +33,7 @@ namespace queue {
         testFCQueue<queue_type>();
     }
 
-    void Queue_TestHeader::FCQueue_deque_stat()
+    void HdrFCQueue::FCQueue_deque_stat()
     {
         typedef cds::container::FCQueue<int, std::queue< int, std::deque<int> >,
             cds::container::fcqueue::make_traits<
@@ -44,13 +44,13 @@ namespace queue {
     }
 
     //
-    void Queue_TestHeader::FCQueue_list()
+    void HdrFCQueue::FCQueue_list()
     {
         typedef cds::container::FCQueue<int, std::queue< int, std::list<int> > > queue_type;
         testFCQueue<queue_type>();
     }
 
-    void Queue_TestHeader::FCQueue_list_elimination()
+    void HdrFCQueue::FCQueue_list_elimination()
     {
         typedef cds::container::FCQueue<int, std::queue< int, std::list<int> >,
             cds::container::fcqueue::make_traits<
@@ -60,7 +60,7 @@ namespace queue {
         testFCQueue<queue_type>();
     }
 
-    void Queue_TestHeader::FCQueue_list_mutex()
+    void HdrFCQueue::FCQueue_list_mutex()
     {
         typedef cds::container::FCQueue<int, std::queue<int, std::list<int> >,
             cds::container::fcqueue::make_traits<
@@ -70,7 +70,7 @@ namespace queue {
         testFCQueue<queue_type>();
     }
 
-    void Queue_TestHeader::FCQueue_list_stat()
+    void HdrFCQueue::FCQueue_list_stat()
     {
         struct queue_traits : public cds::container::fcqueue::traits 
         {
diff --git a/tests/test-hdr/queue/hdr_queue.h b/tests/test-hdr/queue/hdr_fcqueue.h
similarity index 97%
rename from tests/test-hdr/queue/hdr_queue.h
rename to tests/test-hdr/queue/hdr_fcqueue.h
index c7c0c9a8..25b6417e 100644
--- a/tests/test-hdr/queue/hdr_queue.h
+++ b/tests/test-hdr/queue/hdr_fcqueue.h
@@ -11,7 +11,7 @@ namespace queue {
     //
     // Test queue operation in single thread mode
     //
-    class Queue_TestHeader: public CppUnitMini::TestCase
+    class HdrFCQueue: public CppUnitMini::TestCase
     {
     protected:
         template <class Queue>
@@ -148,7 +148,7 @@ namespace queue {
         void FCQueue_list_mutex();
         void FCQueue_list_stat();
 
-        CPPUNIT_TEST_SUITE(Queue_TestHeader)
+        CPPUNIT_TEST_SUITE(HdrFCQueue)
             CPPUNIT_TEST(FCQueue_deque)
             CPPUNIT_TEST(FCQueue_deque_elimination)
             CPPUNIT_TEST(FCQueue_deque_mutex)
diff --git a/tests/test-hdr/queue/hdr_queue_register.cpp b/tests/test-hdr/queue/hdr_queue_register.cpp
index 5f5e2beb..334d6be4 100644
--- a/tests/test-hdr/queue/hdr_queue_register.cpp
+++ b/tests/test-hdr/queue/hdr_queue_register.cpp
@@ -3,11 +3,11 @@
 #include "hdr_intrusive_msqueue.h"
 #include "hdr_intrusive_segmented_queue.h"
 #include "hdr_queue_new.h"
-#include "hdr_queue.h"          //TODO must be removed after refactoring
+#include "hdr_fcqueue.h"
 #include "hdr_segmented_queue.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION_( queue::HdrTestQueue,               s_HdrTestQueue );
-CPPUNIT_TEST_SUITE_REGISTRATION_( queue::Queue_TestHeader,           s_Queue_TestHeader ); //TODO must be removed after refactoring
+CPPUNIT_TEST_SUITE_REGISTRATION_( queue::HdrFCQueue,           s_Queue_TestHeader ); //TODO must be removed after refactoring
 CPPUNIT_TEST_SUITE_REGISTRATION_( queue::HdrSegmentedQueue,          s_HdrSegmentedQueue );
 CPPUNIT_TEST_SUITE_REGISTRATION_( queue::IntrusiveQueueHeaderTest,   s_IntrusiveQueueHeaderTest );
 CPPUNIT_TEST_SUITE_REGISTRATION_( queue::HdrIntrusiveSegmentedQueue, s_HdrIntrusiveSegmentedQueue );
-- 
2.34.1