Renamed test namespace

diff --git a/test/unit/stack/intrusive_treiber_stack_dhp.cpp b/test/unit/stack/intrusive_treiber_stack_dhp.cpp
index c92ecf9d2f43717c852cc353383bc471904b4998..7fe331de4a0133e0998d42a9f5afe1c6b7b08a5a 100644 (file)
--- a/test/unit/stack/intrusive_treiber_stack_dhp.cpp
+++ b/test/unit/stack/intrusive_treiber_stack_dhp.cpp
@@ -27,24 +27,24 @@
     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.
 */
-\r
-#include "test_intrusive_treiber_stack.h"\r
-\r
-#include <cds/gc/dhp.h>\r
-#include <cds/intrusive/treiber_stack.h>\r
-\r
-namespace {\r
-\r
-    namespace ci = cds::intrusive;\r
-\r
-    class IntrusiveTreiberStack_DHP : public cds_gtest::IntrusiveTreiberStack\r
-    {\r
-        typedef cds_gtest::IntrusiveTreiberStack base_class;\r
-    protected:\r
-        typedef cds::gc::DHP gc_type;\r
-\r
-        void SetUp()\r
-        {\r
+
+#include "test_intrusive_treiber_stack.h"
+
+#include <cds/gc/dhp.h>
+#include <cds/intrusive/treiber_stack.h>
+
+namespace {
+
+    namespace ci = cds::intrusive;
+
+    class IntrusiveTreiberStack_DHP : public cds_test::IntrusiveTreiberStack
+    {
+        typedef cds_test::IntrusiveTreiberStack base_class;
+    protected:
+        typedef cds::gc::DHP gc_type;
+
+        void SetUp()
+        {
             typedef cds::intrusive::TreiberStack< gc_type,
                 base_hook_item<gc_type>
                 , typename ci::treiber_stack::make_traits<
@@ -55,32 +55,32 @@ namespace {
                     >
                 >::type
             > stack_type;
-\r
-            cds::gc::dhp::GarbageCollector::Construct( 16, stack_type::c_nHazardPtrCount );\r
-            cds::threading::Manager::attachThread();\r
-        }\r
-\r
-        void TearDown()\r
-        {\r
-            cds::threading::Manager::detachThread();\r
-            cds::gc::dhp::GarbageCollector::Destruct();\r
-        }\r
-\r
-        template <typename Stack>\r
-        void test()\r
-        {\r
-            Stack stack;\r
-            base_class::test( stack );\r
-        }\r
-\r
-        template <typename Stack>\r
-        void test_dyn( size_t elimination_size )\r
-        {\r
-            Stack stack( elimination_size );\r
-            base_class::test( stack );\r
-        }\r
-    };\r
-\r
+
+            cds::gc::dhp::GarbageCollector::Construct( 16, stack_type::c_nHazardPtrCount );
+            cds::threading::Manager::attachThread();
+        }
+
+        void TearDown()
+        {
+            cds::threading::Manager::detachThread();
+            cds::gc::dhp::GarbageCollector::Destruct();
+        }
+
+        template <typename Stack>
+        void test()
+        {
+            Stack stack;
+            base_class::test( stack );
+        }
+
+        template <typename Stack>
+        void test_dyn( size_t elimination_size )
+        {
+            Stack stack( elimination_size );
+            base_class::test( stack );
+        }
+    };
+
     TEST_F( IntrusiveTreiberStack_DHP, base )
     {
         typedef cds::intrusive::TreiberStack< gc_type,
@@ -175,7 +175,7 @@ namespace {
 
         test<stack_type>();
     }
-\r
+
     TEST_F( IntrusiveTreiberStack_DHP, elimination_base )
     {
         typedef cds::intrusive::TreiberStack< gc_type,
@@ -192,7 +192,7 @@ namespace {
 
         test<stack_type>();
     }
-\r
+
     TEST_F( IntrusiveTreiberStack_DHP, elimination_base_dynamic )
     {
         typedef cds::intrusive::TreiberStack< gc_type,
@@ -210,7 +210,7 @@ namespace {
 
         test_dyn<stack_type>( 2 );
     }
-\r
+
     TEST_F( IntrusiveTreiberStack_DHP, elimination_base_disposer )
     {
         typedef cds::intrusive::TreiberStack< gc_type,
@@ -226,7 +226,7 @@ namespace {
 
         test<stack_type>();
     }
-\r
+
     TEST_F( IntrusiveTreiberStack_DHP, elimination_member )
     {
         typedef cds::intrusive::TreiberStack< gc_type,
@@ -244,7 +244,7 @@ namespace {
 
         test<stack_type>();
     }
-\r
+
     TEST_F( IntrusiveTreiberStack_DHP, elimination_member_dynamic )
     {
         typedef cds::intrusive::TreiberStack< gc_type,
@@ -263,7 +263,7 @@ namespace {
 
         test_dyn<stack_type>( 2 );
     }
-\r
+
     TEST_F( IntrusiveTreiberStack_DHP, elimination_member_disposer )
     {
         typedef cds::intrusive::TreiberStack< gc_type,
@@ -283,6 +283,6 @@ namespace {
 
         test_dyn<stack_type>( 2 );
     }
-\r
-} // namespace\r
-\r
+
+} // namespace
+

diff --git a/test/unit/stack/intrusive_treiber_stack_hp.cpp b/test/unit/stack/intrusive_treiber_stack_hp.cpp
index a6d5bc6f1655bca8e4afcbe8a8cadb470644839f..64e9859bfddeabdb8b5568869c245eaa35e5a132 100644 (file)
--- a/test/unit/stack/intrusive_treiber_stack_hp.cpp
+++ b/test/unit/stack/intrusive_treiber_stack_hp.cpp
@@ -27,51 +27,51 @@
     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.
 */
-\r
-#include "test_intrusive_treiber_stack.h"\r
-\r
-#include <cds/gc/hp.h>\r
-#include <cds/intrusive/treiber_stack.h>\r
-\r
-namespace {\r
-\r
-    namespace ci = cds::intrusive;\r
-    typedef cds::gc::HP gc_type;\r
-\r
-    class IntrusiveTreiberStack_HP : public cds_gtest::IntrusiveTreiberStack\r
-    {\r
-    typedef cds_gtest::IntrusiveTreiberStack base_class;\r
-\r
-    protected:\r
-        void SetUp()\r
-        {\r
-            typedef cds::intrusive::TreiberStack< gc_type, base_hook_item<gc_type>> stack_type;\r
-\r
-            cds::gc::hp::GarbageCollector::Construct( stack_type::c_nHazardPtrCount, 1, 16 );\r
-            cds::threading::Manager::attachThread();\r
-        }\r
-\r
-        void TearDown() \r
-        {\r
-            cds::threading::Manager::detachThread();\r
-            cds::gc::hp::GarbageCollector::Destruct( true );\r
-        }\r
-\r
-        template <typename Stack>\r
-        void test()\r
-        {\r
-            Stack stack;\r
-            base_class::test( stack );\r
-        }\r
-\r
-        template <typename Stack>\r
-        void test_dyn( size_t elimination_size )\r
-        {\r
-            Stack stack( elimination_size );\r
-            base_class::test( stack );\r
-        }\r
-    };\r
-\r
+
+#include "test_intrusive_treiber_stack.h"
+
+#include <cds/gc/hp.h>
+#include <cds/intrusive/treiber_stack.h>
+
+namespace {
+
+    namespace ci = cds::intrusive;
+    typedef cds::gc::HP gc_type;
+
+    class IntrusiveTreiberStack_HP : public cds_test::IntrusiveTreiberStack
+    {
+    typedef cds_test::IntrusiveTreiberStack base_class;
+
+    protected:
+        void SetUp()
+        {
+            typedef cds::intrusive::TreiberStack< gc_type, base_hook_item<gc_type>> stack_type;
+
+            cds::gc::hp::GarbageCollector::Construct( stack_type::c_nHazardPtrCount, 1, 16 );
+            cds::threading::Manager::attachThread();
+        }
+
+        void TearDown() 
+        {
+            cds::threading::Manager::detachThread();
+            cds::gc::hp::GarbageCollector::Destruct( true );
+        }
+
+        template <typename Stack>
+        void test()
+        {
+            Stack stack;
+            base_class::test( stack );
+        }
+
+        template <typename Stack>
+        void test_dyn( size_t elimination_size )
+        {
+            Stack stack( elimination_size );
+            base_class::test( stack );
+        }
+    };
+
     TEST_F( IntrusiveTreiberStack_HP, defaulted )
     {
         typedef cds::intrusive::TreiberStack< gc_type,
@@ -170,7 +170,7 @@ namespace {
 
         test<stack_type>();
     }
-\r
+
     TEST_F( IntrusiveTreiberStack_HP, elimination )
     {
         typedef cds::intrusive::TreiberStack< gc_type,
@@ -182,7 +182,7 @@ namespace {
 
         test<stack_type>();
     }
-\r
+
     TEST_F( IntrusiveTreiberStack_HP, elimination_base )
     {
         typedef cds::intrusive::TreiberStack< gc_type,
@@ -199,7 +199,7 @@ namespace {
 
         test<stack_type>();
     }
-\r
+
     TEST_F( IntrusiveTreiberStack_HP, elimination_base_dynamic )
     {
         typedef cds::intrusive::TreiberStack< gc_type,
@@ -217,7 +217,7 @@ namespace {
 
         test_dyn<stack_type>( 2 );
     }
-\r
+
     TEST_F( IntrusiveTreiberStack_HP, elimination_base_disposer )
     {
         typedef cds::intrusive::TreiberStack< gc_type,
@@ -233,7 +233,7 @@ namespace {
 
         test<stack_type>();
     }
-\r
+
     TEST_F( IntrusiveTreiberStack_HP, elimination_member )
     {
         typedef cds::intrusive::TreiberStack< gc_type,
@@ -251,7 +251,7 @@ namespace {
 
         test<stack_type>();
     }
-\r
+
     TEST_F( IntrusiveTreiberStack_HP, elimination_member_dynamic )
     {
         typedef cds::intrusive::TreiberStack< gc_type,
@@ -270,7 +270,7 @@ namespace {
 
         test_dyn<stack_type>( 2 );
     }
-\r
+
     TEST_F( IntrusiveTreiberStack_HP, elimination_member_disposer )
     {
         typedef cds::intrusive::TreiberStack< gc_type,
@@ -290,6 +290,6 @@ namespace {
 
         test_dyn<stack_type>( 2 );
     }
-\r
-} // namespace\r
-\r
+
+} // namespace
+

diff --git a/test/unit/stack/test_intrusive_treiber_stack.h b/test/unit/stack/test_intrusive_treiber_stack.h
index b6a72afef20a7d458097dd9531c5316e964e2293..92874d4fb5be348aca4fc2925a3d1149dce00993 100644 (file)
--- a/test/unit/stack/test_intrusive_treiber_stack.h
+++ b/test/unit/stack/test_intrusive_treiber_stack.h
@@ -34,7 +34,7 @@
 #include <gtest/gtest.h>
 #include <cds/intrusive/details/single_link_struct.h>
 
-namespace cds_gtest {
+namespace cds_test {
 
     class IntrusiveTreiberStack : public ::testing::Test
     {
@@ -129,6 +129,6 @@ namespace cds_gtest {
         }
     };
 
-} // namespace cds_gtest
+} // namespace cds_test
 
 #endif // CDSUNIT_STACK_INTRUSIVE_TREIBER_STACK_H

diff --git a/test/unit/stack/test_treiber_stack.h b/test/unit/stack/test_treiber_stack.h
index d82273473cf9b6afbb91407a8a660f4af2e55eae..d6d058c80b3ca9554abecab472da0bf457dc9b1e 100644 (file)
--- a/test/unit/stack/test_treiber_stack.h
+++ b/test/unit/stack/test_treiber_stack.h
@@ -33,7 +33,7 @@
 
 #include <gtest/gtest.h>
 
-namespace cds_gtest {
+namespace cds_test {
 
     class TreiberStack : public ::testing::Test
     {
@@ -82,6 +82,6 @@ namespace cds_gtest {
             Stack::gc::scan();
         }
     };
-} // namespace cds_gtest
+} // namespace cds_test
 
 #endif // CDSUNIT_STACK_TREIBER_STACK_H

diff --git a/test/unit/stack/treiber_stack_dhp.cpp b/test/unit/stack/treiber_stack_dhp.cpp
index 3eef2fb7534a22cf50f326b5ec6017f2b6cadc0a..a2abb8c8fd1bcbfcb5183f09ceeeadff3b28ca39 100644 (file)
--- a/test/unit/stack/treiber_stack_dhp.cpp
+++ b/test/unit/stack/treiber_stack_dhp.cpp
@@ -27,58 +27,58 @@
     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.
 */
-\r
-#include "test_treiber_stack.h"\r
-\r
-#include <cds/gc/dhp.h>\r
-#include <cds/container/treiber_stack.h>\r
-\r
-namespace {\r
-\r
-    namespace cc = cds::container;\r
-    typedef cds::gc::DHP gc_type;\r
-\r
-    class TreiberStack_DHP : public cds_gtest::TreiberStack\r
-    {\r
-        typedef cds_gtest::TreiberStack base_class;\r
-\r
-    protected:\r
-        void SetUp()\r
-        {\r
-            typedef cc::TreiberStack< gc_type, int > stack_type;\r
-\r
-            cds::gc::dhp::GarbageCollector::Construct( 16, stack_type::c_nHazardPtrCount );\r
-            cds::threading::Manager::attachThread();\r
-        }\r
-\r
-        void TearDown() \r
-        {\r
-            cds::threading::Manager::detachThread();\r
-            cds::gc::dhp::GarbageCollector::Destruct();\r
-        }\r
-\r
-        template <typename Stack>\r
-        void test()\r
-        {\r
-            Stack stack;\r
-            base_class::test( stack );\r
-        }\r
-\r
-        template <typename Stack>\r
-        void test_dyn( size_t elimination_size )\r
-        {\r
-            Stack stack( elimination_size );\r
-            base_class::test( stack );\r
-        }\r
-    };\r
-\r
+
+#include "test_treiber_stack.h"
+
+#include <cds/gc/dhp.h>
+#include <cds/container/treiber_stack.h>
+
+namespace {
+
+    namespace cc = cds::container;
+    typedef cds::gc::DHP gc_type;
+
+    class TreiberStack_DHP : public cds_test::TreiberStack
+    {
+        typedef cds_test::TreiberStack base_class;
+
+    protected:
+        void SetUp()
+        {
+            typedef cc::TreiberStack< gc_type, int > stack_type;
+
+            cds::gc::dhp::GarbageCollector::Construct( 16, stack_type::c_nHazardPtrCount );
+            cds::threading::Manager::attachThread();
+        }
+
+        void TearDown() 
+        {
+            cds::threading::Manager::detachThread();
+            cds::gc::dhp::GarbageCollector::Destruct();
+        }
+
+        template <typename Stack>
+        void test()
+        {
+            Stack stack;
+            base_class::test( stack );
+        }
+
+        template <typename Stack>
+        void test_dyn( size_t elimination_size )
+        {
+            Stack stack( elimination_size );
+            base_class::test( stack );
+        }
+    };
+
     TEST_F( TreiberStack_DHP, defaulted )
     {
         typedef cc::TreiberStack< gc_type, int > stack_type;
 
         test<stack_type>();
     }
-\r
+
     TEST_F( TreiberStack_DHP, backoff )
     {
         typedef cc::TreiberStack< gc_type, int
@@ -89,7 +89,7 @@ namespace {
 
         test<stack_type>();
     }
-\r
+
     TEST_F( TreiberStack_DHP, alloc )
     {
         // allocator must be rebinded for real value type
@@ -111,7 +111,7 @@ namespace {
 
         test<stack_type>();
     }
-\r
+
     TEST_F( TreiberStack_DHP, elimination )
     {
         typedef cc::TreiberStack< gc_type, int
@@ -122,7 +122,7 @@ namespace {
 
         test<stack_type>();
     }
-\r
+
     TEST_F( TreiberStack_DHP, elimination_backoff )
     {
         struct traits : public cc::treiber_stack::traits
@@ -136,7 +136,7 @@ namespace {
 
         test<stack_type>();
     }
-\r
+
     TEST_F( TreiberStack_DHP, elimination_dynamic )
     {
         typedef cc::TreiberStack< gc_type, int
@@ -148,7 +148,7 @@ namespace {
 
         test_dyn<stack_type>( 4 );
     }
-\r
+
     TEST_F( TreiberStack_DHP, elimination_stat )
     {
         typedef cc::TreiberStack< gc_type, int
@@ -160,7 +160,7 @@ namespace {
 
         test<stack_type>();
     }
-\r
+
     TEST_F( TreiberStack_DHP, elimination_dynamic_backoff )
     {
         struct traits : public cc::treiber_stack::traits
@@ -175,5 +175,5 @@ namespace {
 
         test_dyn<stack_type>( 2 );
     }
-\r
-} // namespace\r
+
+} // namespace

diff --git a/test/unit/stack/treiber_stack_hp.cpp b/test/unit/stack/treiber_stack_hp.cpp
index ca617ebd9b5ea3061f343f827b7a1b93c6bbcb73..1ebba3f271a805417d84a6b40380d0c7c481c3f2 100644 (file)
--- a/test/unit/stack/treiber_stack_hp.cpp
+++ b/test/unit/stack/treiber_stack_hp.cpp
@@ -27,58 +27,58 @@
     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.
 */
-\r
-#include "test_treiber_stack.h"\r
-\r
-#include <cds/gc/hp.h>\r
-#include <cds/container/treiber_stack.h>\r
-\r
-namespace {\r
-\r
-    namespace cc = cds::container;\r
-    typedef cds::gc::HP gc_type;\r
-\r
-    class TreiberStack_HP : public cds_gtest::TreiberStack\r
-    {\r
-        typedef cds_gtest::TreiberStack base_class;\r
-\r
-    protected:\r
-        void SetUp()\r
-        {\r
-            typedef cc::TreiberStack< gc_type, int > stack_type;\r
-\r
-            cds::gc::hp::GarbageCollector::Construct( stack_type::c_nHazardPtrCount, 1, 16 );\r
-            cds::threading::Manager::attachThread();\r
-        }\r
-\r
-        void TearDown() \r
-        {\r
-            cds::threading::Manager::detachThread();\r
-            cds::gc::hp::GarbageCollector::Destruct( true );\r
-        }\r
-\r
-        template <typename Stack>\r
-        void test()\r
-        {\r
-            Stack stack;\r
-            base_class::test( stack );\r
-        }\r
-\r
-        template <typename Stack>\r
-        void test_dyn( size_t elimination_size )\r
-        {\r
-            Stack stack( elimination_size );\r
-            base_class::test( stack );\r
-        }\r
-    };\r
-\r
+
+#include "test_treiber_stack.h"
+
+#include <cds/gc/hp.h>
+#include <cds/container/treiber_stack.h>
+
+namespace {
+
+    namespace cc = cds::container;
+    typedef cds::gc::HP gc_type;
+
+    class TreiberStack_HP : public cds_test::TreiberStack
+    {
+        typedef cds_test::TreiberStack base_class;
+
+    protected:
+        void SetUp()
+        {
+            typedef cc::TreiberStack< gc_type, int > stack_type;
+
+            cds::gc::hp::GarbageCollector::Construct( stack_type::c_nHazardPtrCount, 1, 16 );
+            cds::threading::Manager::attachThread();
+        }
+
+        void TearDown()
+        {
+            cds::threading::Manager::detachThread();
+            cds::gc::hp::GarbageCollector::Destruct( true );
+        }
+
+        template <typename Stack>
+        void test()
+        {
+            Stack stack;
+            base_class::test( stack );
+        }
+
+        template <typename Stack>
+        void test_dyn( size_t elimination_size )
+        {
+            Stack stack( elimination_size );
+            base_class::test( stack );
+        }
+    };
+
     TEST_F( TreiberStack_HP, defaulted )
     {
         typedef cc::TreiberStack< gc_type, int > stack_type;
 
         test<stack_type>();
     }
-\r
+
     TEST_F( TreiberStack_HP, backoff )
     {
         typedef cc::TreiberStack< gc_type, int
@@ -89,7 +89,7 @@ namespace {
 
         test<stack_type>();
     }
-\r
+
     TEST_F( TreiberStack_HP, alloc )
     {
         // allocator must be rebinded for real value type
@@ -105,7 +105,7 @@ namespace {
 
         test<stack_type>();
     }
-\r
+
     TEST_F( TreiberStack_HP, elimination )
     {
         typedef cc::TreiberStack< gc_type, int
@@ -116,7 +116,7 @@ namespace {
 
         test<stack_type>();
     }
-\r
+
     TEST_F( TreiberStack_HP, elimination_backoff )
     {
         struct traits : public cc::treiber_stack::traits
@@ -130,7 +130,7 @@ namespace {
 
         test<stack_type>();
     }
-\r
+
     TEST_F( TreiberStack_HP, elimination_dynamic )
     {
         typedef cc::TreiberStack< gc_type, int
@@ -142,7 +142,7 @@ namespace {
 
         test_dyn<stack_type>( 4 );
     }
-\r
+
     TEST_F( TreiberStack_HP, elimination_stat )
     {
         typedef cc::TreiberStack< gc_type, int
@@ -154,7 +154,7 @@ namespace {
 
         test<stack_type>();
     }
-\r
+
     TEST_F( TreiberStack_HP, elimination_dynamic_backoff )
     {
         struct traits : public cc::treiber_stack::traits
@@ -169,5 +169,5 @@ namespace {
 
         test_dyn<stack_type>( 2 );
     }
-\r
-} // namespace\r
+
+} // namespace