From: khizmax Date: Wed, 13 Apr 2016 21:03:46 +0000 (+0300) Subject: Improved SkipListSet unit tests X-Git-Tag: v2.2.0~278 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=11d639e427002f777b6393b605789d1c65c955e2;p=libcds.git Improved SkipListSet unit tests --- diff --git a/projects/Win/vc14/gtest-set.vcxproj b/projects/Win/vc14/gtest-set.vcxproj index 4aacc470..350ac81a 100644 --- a/projects/Win/vc14/gtest-set.vcxproj +++ b/projects/Win/vc14/gtest-set.vcxproj @@ -208,6 +208,7 @@ + diff --git a/projects/Win/vc14/gtest-set.vcxproj.filters b/projects/Win/vc14/gtest-set.vcxproj.filters index e86e1df2..80a2f7e6 100644 --- a/projects/Win/vc14/gtest-set.vcxproj.filters +++ b/projects/Win/vc14/gtest-set.vcxproj.filters @@ -209,5 +209,8 @@ Header Files + + Header Files + \ No newline at end of file diff --git a/test/unit/set/skiplist_dhp.cpp b/test/unit/set/skiplist_dhp.cpp index 5eb2c0e8..c03f1050 100644 --- a/test/unit/set/skiplist_dhp.cpp +++ b/test/unit/set/skiplist_dhp.cpp @@ -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 @@ -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() { diff --git a/test/unit/set/skiplist_hp.cpp b/test/unit/set/skiplist_hp.cpp index bf9727eb..22b157aa 100644 --- a/test/unit/set/skiplist_hp.cpp +++ b/test/unit/set/skiplist_hp.cpp @@ -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 @@ -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 index 00000000..255e9207 --- /dev/null +++ b/test/unit/set/test_ordered_set_hp.h @@ -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 + 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(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 diff --git a/test/unit/set/test_skiplist_rcu.h b/test/unit/set/test_skiplist_rcu.h index ca931319..d5b3864e 100644 --- a/test/unit/set/test_skiplist_rcu.h +++ b/test/unit/set/test_skiplist_rcu.h @@ -43,6 +43,78 @@ public: typedef cds::urcu::gc rcu_type; protected: + template + 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(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();