Improved SkipListSet unit tests
authorkhizmax <libcds.dev@gmail.com>
Wed, 13 Apr 2016 21:03:46 +0000 (00:03 +0300)
committerkhizmax <libcds.dev@gmail.com>
Wed, 13 Apr 2016 21:03:46 +0000 (00:03 +0300)
projects/Win/vc14/gtest-set.vcxproj
projects/Win/vc14/gtest-set.vcxproj.filters
test/unit/set/skiplist_dhp.cpp
test/unit/set/skiplist_hp.cpp
test/unit/set/test_ordered_set_hp.h [new file with mode: 0644]
test/unit/set/test_skiplist_rcu.h

index 4aacc4701e70e1dd506a0348ea1608459094a8f3..350ac81a3e0e947f8f108be85f0e2272b7d62040 100644 (file)
     <ClInclude Include="..\..\..\test\unit\set\test_feldman_hashset_rcu.h" />\r
     <ClInclude Include="..\..\..\test\unit\set\test_michael_lazy_rcu.h" />\r
     <ClInclude Include="..\..\..\test\unit\set\test_michael_michael_rcu.h" />\r
+    <ClInclude Include="..\..\..\test\unit\set\test_ordered_set_hp.h" />\r
     <ClInclude Include="..\..\..\test\unit\set\test_set.h" />\r
     <ClInclude Include="..\..\..\test\unit\set\test_set_hp.h" />\r
     <ClInclude Include="..\..\..\test\unit\set\test_set_nogc.h" />\r
index e86e1df2fb73255627d9ab296496e5254b50937d..80a2f7e6156e6c8343ea0ad91e2eec37cded9713 100644 (file)
     <ClInclude Include="..\..\..\test\unit\set\test_feldman_hashset_rcu.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\..\test\unit\set\test_ordered_set_hp.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file
index 5eb2c0e817342a4704ba24a2e2434aec2f9e4020..c03f10505d95305806f6e08d40d5e2434d0bdb83 100644 (file)
@@ -28,7 +28,7 @@
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.     
 */
 
-#include "test_set_hp.h"
+#include "test_ordered_set_hp.h"
 
 #include <cds/container/skip_list_set_dhp.h>
 
@@ -36,10 +36,10 @@ namespace {
     namespace cc = cds::container;
     typedef cds::gc::DHP gc_type;
 
-    class SkipListSet_DHP : public cds_test::container_set_hp
+    class SkipListSet_DHP : public cds_test::container_ordered_set_hp
     {
     protected:
-        typedef cds_test::container_set_hp base_class;
+        typedef cds_test::container_ordered_set_hp base_class;
 
         void SetUp()
         {
index bf9727ebc2011a5ca670dda8da1b05108537d1de..22b157aa8733db5b84ed327b5b9ebcc7be31a927 100644 (file)
@@ -28,7 +28,7 @@
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.     
 */
 
-#include "test_set_hp.h"
+#include "test_ordered_set_hp.h"
 
 #include <cds/container/skip_list_set_hp.h>
 
@@ -36,10 +36,10 @@ namespace {
     namespace cc = cds::container;
     typedef cds::gc::HP gc_type;
 
-    class SkipListSet_HP : public cds_test::container_set_hp
+    class SkipListSet_HP : public cds_test::container_ordered_set_hp
     {
     protected:
-        typedef cds_test::container_set_hp base_class;
+        typedef cds_test::container_ordered_set_hp base_class;
 
         void SetUp()
         {
diff --git a/test/unit/set/test_ordered_set_hp.h b/test/unit/set/test_ordered_set_hp.h
new file mode 100644 (file)
index 0000000..255e920
--- /dev/null
@@ -0,0 +1,117 @@
+/*
+    This file is a part of libcds - Concurrent Data Structures library
+
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+
+    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:
+
+    * Redistributions of source code must retain the above copyright notice, this
+      list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+    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.     
+*/
+
+#ifndef CDSUNIT_SET_TEST_ORDERED_SET_HP_H
+#define CDSUNIT_SET_TEST_ORDERED_SET_HP_H
+
+#include "test_set_hp.h"
+
+namespace cds_test {
+
+    class container_ordered_set_hp: public container_set_hp
+    {
+        typedef container_set_hp base_class;
+
+    protected:
+        template <typename Set>
+        void test( Set& s )
+        {
+            // Precondition: set is empty
+            // Postcondition: set is empty
+
+            base_class::test( s );
+
+            ASSERT_TRUE( s.empty() );
+            ASSERT_CONTAINER_SIZE( s, 0 );
+
+            typedef typename Set::value_type value_type;
+
+            size_t const nSetSize = kSize;
+            std::vector< value_type > data;
+            std::vector< size_t> indices;
+            data.reserve( kSize );
+            indices.reserve( kSize );
+            for ( size_t key = 0; key < kSize; ++key ) {
+                data.push_back( value_type( static_cast<int>(key) ) );
+                indices.push_back( key );
+            }
+            shuffle( indices.begin(), indices.end() );
+
+            for ( auto i : indices ) {
+                ASSERT_TRUE( s.insert( data[i] ));
+            }
+            ASSERT_FALSE( s.empty() );
+            ASSERT_CONTAINER_SIZE( s, nSetSize );
+
+            typedef typename Set::guarded_ptr guarded_ptr;
+            guarded_ptr gp;
+
+            // extract_min
+            size_t nCount = 0;
+            int nKey = -1;
+            while ( !s.empty() ) {
+                gp = s.extract_min();
+                ASSERT_FALSE( !gp );
+                EXPECT_EQ( nKey + 1, gp->key());
+                ++nCount;
+                nKey = gp->key();
+            }
+            gp.release();
+            EXPECT_EQ( nCount, nSetSize );
+
+            ASSERT_TRUE( s.empty() );
+            ASSERT_CONTAINER_SIZE( s, 0 );
+
+            // extract_max
+            for ( auto i : indices ) {
+                ASSERT_TRUE( s.insert( data[i] ) );
+            }
+            ASSERT_FALSE( s.empty() );
+            ASSERT_CONTAINER_SIZE( s, nSetSize );
+
+            nCount = 0;
+            nKey = nSetSize;
+            while ( !s.empty() ) {
+                gp = s.extract_max();
+                ASSERT_FALSE( !gp );
+                EXPECT_EQ( nKey - 1, gp->key());
+                ++nCount;
+                nKey = gp->key();
+            }
+            gp.release();
+            EXPECT_EQ( nCount, nSetSize );
+
+            ASSERT_TRUE( s.empty() );
+            ASSERT_CONTAINER_SIZE( s, 0 );
+        }
+    };
+} // namespace cds_test
+
+#endif // CDSUNIT_SET_TEST_ORDERED_SET_HP_H
index ca931319e2c03559c208bd28440935fe20d2a716..d5b3864ea3cdbbb9289ef6f637bae1ede31adfb2 100644 (file)
@@ -43,6 +43,78 @@ public:
     typedef cds::urcu::gc<RCU> rcu_type;
 
 protected:
+    template <typename Set>
+    void test( Set& s )
+    {
+        // Precondition: set is empty
+        // Postcondition: set is empty
+
+        base_class::test( s );
+
+        ASSERT_TRUE( s.empty() );
+        ASSERT_CONTAINER_SIZE( s, 0 );
+
+        typedef typename Set::value_type value_type;
+
+        size_t const nSetSize = base_class::kSize;
+        std::vector< value_type > data;
+        std::vector< size_t> indices;
+        data.reserve( nSetSize );
+        indices.reserve( nSetSize );
+        for ( size_t key = 0; key < nSetSize; ++key ) {
+            data.push_back( value_type( static_cast<int>(key) ) );
+            indices.push_back( key );
+        }
+        shuffle( indices.begin(), indices.end() );
+
+        for ( auto i : indices ) {
+            ASSERT_TRUE( s.insert( data[i] ) );
+        }
+        ASSERT_FALSE( s.empty() );
+        ASSERT_CONTAINER_SIZE( s, nSetSize );
+
+        typedef typename Set::exempt_ptr exempt_ptr;
+        exempt_ptr xp;
+
+        // extract_min
+        size_t nCount = 0;
+        int nKey = -1;
+        while ( !s.empty() ) {
+            xp = s.extract_min();
+            ASSERT_FALSE( !xp );
+            EXPECT_EQ( nKey + 1, xp->key() );
+            ++nCount;
+            nKey = xp->key();
+        }
+        xp.release();
+        EXPECT_EQ( nCount, nSetSize );
+
+        ASSERT_TRUE( s.empty() );
+        ASSERT_CONTAINER_SIZE( s, 0 );
+
+        // extract_max
+        for ( auto i : indices ) {
+            ASSERT_TRUE( s.insert( data[i] ) );
+        }
+        ASSERT_FALSE( s.empty() );
+        ASSERT_CONTAINER_SIZE( s, nSetSize );
+
+        nCount = 0;
+        nKey = nSetSize;
+        while ( !s.empty() ) {
+            xp = s.extract_max();
+            ASSERT_FALSE( !xp );
+            EXPECT_EQ( nKey - 1, xp->key() );
+            ++nCount;
+            nKey = xp->key();
+        }
+        xp.release();
+        EXPECT_EQ( nCount, nSetSize );
+
+        ASSERT_TRUE( s.empty() );
+        ASSERT_CONTAINER_SIZE( s, 0 );
+    }
+
     void SetUp()
     {
         RCU::Construct();