Added MichaelMap<HP> based on IterableList

[libcds.git] / test / unit / map / test_map_hp.h

diff --git a/test/unit/map/test_map_hp.h b/test/unit/map/test_map_hp.h
index 220951150c6d560ae261d3de49baa5d5f58587dd..d3305706029c61567b7c6954a0a1a07eed866a5d 100644 (file)
--- a/test/unit/map/test_map_hp.h
+++ b/test/unit/map/test_map_hp.h
@@ -25,7 +25,7 @@
     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.     
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #ifndef CDSUNIT_MAP_TEST_MAP_HP_H
@@ -48,8 +48,8 @@ namespace cds_test {
 
             base_class::test( m );
 
-            ASSERT_TRUE( m.empty());
-            ASSERT_CONTAINER_SIZE( m, 0 );
+            EXPECT_TRUE( m.empty());
+            EXPECT_CONTAINER_SIZE( m, 0 );
 
             typedef typename Map::value_type map_pair;
             size_t const kkSize = base_class::kSize;
@@ -68,9 +68,9 @@ namespace cds_test {
             }
 
             for ( auto const& i : arrKeys )
-                ASSERT_TRUE( m.insert( i ) );
-            ASSERT_FALSE( m.empty() );
-            ASSERT_CONTAINER_SIZE( m, kkSize );
+                EXPECT_TRUE( m.insert( i ) );
+            EXPECT_FALSE( m.empty() );
+            EXPECT_CONTAINER_SIZE( m, kkSize );
 
             // iterators
             size_t nCount = 0;
@@ -97,15 +97,15 @@ namespace cds_test {
 
                 gp = m.get( i.nKey );
                 ASSERT_FALSE( !gp );
-                ASSERT_EQ( gp->first.nKey, i.nKey );
+                EXPECT_EQ( gp->first.nKey, i.nKey );
                 gp.release();
                 gp = m.get( i );
                 ASSERT_FALSE( !gp );
-                ASSERT_EQ( gp->first.nKey, i.nKey );
+                EXPECT_EQ( gp->first.nKey, i.nKey );
                 gp.release();
                 gp = m.get_with( other_item( i.nKey ), other_less());
                 ASSERT_FALSE( !gp );
-                ASSERT_EQ( gp->first.nKey, i.nKey );
+                EXPECT_EQ( gp->first.nKey, i.nKey );
 
                 switch ( i.nKey % 4 ) {
                 case 0:
@@ -122,7 +122,7 @@ namespace cds_test {
                     break;
                 }
                 ASSERT_FALSE( !gp );
-                ASSERT_EQ( gp->first.nKey, i.nKey );
+                EXPECT_EQ( gp->first.nKey, i.nKey );
                 gp.release();
 
                 gp = m.get( i.nKey );
@@ -132,8 +132,8 @@ namespace cds_test {
                 gp = m.get_with( other_item( i.nKey ), other_less() );
                 ASSERT_TRUE( !gp );
             }
-            ASSERT_TRUE( m.empty() );
-            ASSERT_CONTAINER_SIZE( m, 0 );
+            EXPECT_TRUE( m.empty() );
+            EXPECT_CONTAINER_SIZE( m, 0 );
         }
     };