Merge branch 'flat_combinig_add_stress_and_unint_tests' of https://github.com/mgalimu...

[libcds.git] / test / unit / pqueue / test_fcpqueue.h

diff --git a/test/unit/pqueue/test_fcpqueue.h b/test/unit/pqueue/test_fcpqueue.h
index 9943a7aa4a76b388c304542fd30f1896e7c3b32f..79e293672cdf6aa51c33aade590840d1c9991303 100644 (file)
--- a/test/unit/pqueue/test_fcpqueue.h
+++ b/test/unit/pqueue/test_fcpqueue.h
@@ -1,7 +1,7 @@
 /*
     This file is a part of libcds - Concurrent Data Structures library
 
-    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
@@ -45,33 +45,33 @@ namespace cds_test {
             value_type * pFirst = arr.begin();
             value_type * pLast = arr.end();
 
-            ASSERT_TRUE( pq.empty() );
+            ASSERT_TRUE( pq.empty());
             ASSERT_TRUE( pq.size() == 0 );
 
             size_t nSize = 0;
 
             // Push test
             for ( value_type * p = pFirst; p < pLast; ++p ) {
-                ASSERT_TRUE( pq.push( *p ) );
-                ASSERT_TRUE( !pq.empty() );
+                ASSERT_TRUE( pq.push( *p ));
+                ASSERT_TRUE( !pq.empty());
                 ASSERT_EQ( pq.size(), ++nSize );
             }
 
-            ASSERT_EQ( pq.size(), PQueueTest::c_nCapacity );
+            ASSERT_EQ( pq.size(), static_cast<size_t>(PQueueTest::c_nCapacity ));
 
             // Pop test
             key_type nPrev = PQueueTest::c_nMinValue + key_type( PQueueTest::c_nCapacity ) - 1;
             value_type kv( 0 );
 
-            ASSERT_TRUE( pq.pop( kv ) );
+            ASSERT_TRUE( pq.pop( kv ));
             EXPECT_EQ( kv.k, nPrev );
 
-            ASSERT_EQ( pq.size(), PQueueTest::c_nCapacity - 1 );
-            ASSERT_TRUE( !pq.empty() );
+            ASSERT_EQ( pq.size(), static_cast<size_t>( PQueueTest::c_nCapacity - 1 ));
+            ASSERT_TRUE( !pq.empty());
 
             nSize = pq.size();
             while ( pq.size() > 1 ) {
-                ASSERT_TRUE( pq.pop( kv ) );
+                ASSERT_TRUE( pq.pop( kv ));
                 EXPECT_EQ( kv.k, nPrev - 1 );
                 nPrev = kv.k;
 
@@ -79,14 +79,14 @@ namespace cds_test {
                 ASSERT_EQ( pq.size(), nSize );
             }
 
-            ASSERT_TRUE( !pq.empty() );
-            ASSERT_EQ( pq.size(), 1 );
+            ASSERT_TRUE( !pq.empty());
+            ASSERT_EQ( pq.size(), 1u );
 
-            ASSERT_TRUE( pq.pop( kv ) );
+            ASSERT_TRUE( pq.pop( kv ));
             EXPECT_EQ( kv.k, PQueueTest::c_nMinValue );
 
-            ASSERT_TRUE( pq.empty() );
-            ASSERT_EQ( pq.size(), 0 );
+            ASSERT_TRUE( pq.empty());
+            ASSERT_EQ( pq.size(), 0u );
 
             // pop from empty pqueue
             kv.k = PQueueTest::c_nCapacity * 2;
@@ -95,14 +95,14 @@ namespace cds_test {
 
             // Clear test
             for ( value_type * p = pFirst; p < pLast; ++p )
-                ASSERT_TRUE( pq.push( *p ) );
+                ASSERT_TRUE( pq.push( *p ));
 
-            ASSERT_TRUE( !pq.empty() );
-            ASSERT_EQ( pq.size(), PQueueTest::c_nCapacity );
+            ASSERT_TRUE( !pq.empty());
+            ASSERT_EQ( pq.size(), static_cast<size_t>( PQueueTest::c_nCapacity ));
 
             pq.clear();
-            ASSERT_TRUE( pq.empty() );
-            ASSERT_EQ( pq.size(), 0 );
+            ASSERT_TRUE( pq.empty());
+            ASSERT_EQ( pq.size(), 0u );
         }
     };
 } // namespace cds_test