Migrated intrusive FeldmanHashSet unit test to gtest framework

[libcds.git] / test / unit / set / test_intrusive_set_rcu.h

diff --git a/test/unit/set/test_intrusive_set_rcu.h b/test/unit/set/test_intrusive_set_rcu.h
index 416f3e9473d1c9f8efffcdc793ada4b4e588d006..ff28bef3968f51bda89bbbcaa76c7136dcc88072 100644 (file)
--- a/test/unit/set/test_intrusive_set_rcu.h
+++ b/test/unit/set/test_intrusive_set_rcu.h
@@ -122,46 +122,53 @@ namespace cds_test {
                     rcu_lock l;
                     EXPECT_EQ( i.nFindCount, 0 );
                     rp = s.get( i );
-                    ASSERT_TRUE( rp );
+                    ASSERT_FALSE( !rp );
                     ++rp->nFindCount;
                     EXPECT_EQ( i.nFindCount, 1 );
 
                     rp = s.get( i.key() );
-                    ASSERT_TRUE( rp );
+                    ASSERT_FALSE( !rp );
                     ++rp->nFindCount;
                     EXPECT_EQ( i.nFindCount, 2 );
 
                     rp = s.get_with( other_item( i.key()), other_less());
-                    ASSERT_TRUE( rp );
+                    ASSERT_FALSE( !rp );
                     ++rp->nFindCount;
                     EXPECT_EQ( i.nFindCount, 3 );
                 }
 
                 if ( Set::c_bExtractLockExternal ) {
-                    rcu_lock l;
+                    {
+                        rcu_lock l;
+
+                        EXPECT_EQ( i.nEraseCount, 0 );
+                        switch ( i.key() % 3 ) {
+                        case 0:
+                            xp = s.extract( i.key());
+                            break;
+                        case 1:
+                            xp = s.extract( i );
+                            break;
+                        case 2:
+                            xp = s.extract_with( other_item( i.key() ), other_less() );
+                            break;
+                        }
+                        ASSERT_FALSE( !xp );
+                        ++xp->nEraseCount;
+                    }
+                    EXPECT_EQ( i.nEraseCount, 1 );
+                    xp.release();
+
+                    {
+                        rcu_lock l;
 
-                    EXPECT_EQ( i.nEraseCount, 0 );
-                    switch ( i.key() % 3 ) {
-                    case 0:
-                        xp = s.extract( i.key());
-                        break;
-                    case 1:
                         xp = s.extract( i );
-                        break;
-                    case 2:
+                        ASSERT_TRUE( !xp );
+                        xp = s.extract( i.key() );
+                        ASSERT_TRUE( !xp );
                         xp = s.extract_with( other_item( i.key() ), other_less() );
-                        break;
+                        ASSERT_TRUE( !xp );
                     }
-                    ASSERT_TRUE( xp );
-                    ++xp->nEraseCount;
-                    EXPECT_EQ( i.nEraseCount, 1 );
-
-                    xp = s.extract( i );
-                    ASSERT_TRUE( !xp );
-                    xp = s.extract( i.key() );
-                    ASSERT_TRUE( !xp );
-                    xp = s.extract_with( other_item( i.key() ), other_less() );
-                    ASSERT_TRUE( !xp );
                 }
                 else {
                     EXPECT_EQ( i.nEraseCount, 0 );
@@ -176,7 +183,7 @@ namespace cds_test {
                         xp = s.extract_with( other_item( i.key() ), other_less() );
                         break;
                     }
-                    ASSERT_TRUE( xp );
+                    ASSERT_FALSE( !xp );
                     ++xp->nEraseCount;
                     EXPECT_EQ( i.nEraseCount, 1 );