Refactors parallel barrier test

[libcds.git] / test / unit / deque / fcdeque.cpp

diff --git a/test/unit/deque/fcdeque.cpp b/test/unit/deque/fcdeque.cpp
index 3968f0cb8b5c42599a93bdfd832550af839274eb..c4d18f2d0139917e80d4acd38cacf7797f8a5cae 100644 (file)
--- a/test/unit/deque/fcdeque.cpp
+++ b/test/unit/deque/fcdeque.cpp
@@ -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/
@@ -28,7 +28,7 @@
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include <gtest/gtest.h>
+#include <cds_test/ext_gtest.h>
 #include <cds/container/fcdeque.h>
 #include <boost/container/deque.hpp>
 
@@ -44,13 +44,13 @@ namespace {
 
             // push_front/pop_front
             for ( int i = 0; i < static_cast<int>( c_nSize ); ++i )
-                EXPECT_TRUE( dq.push_front( i ) );
+                EXPECT_TRUE( dq.push_front( i ));
             EXPECT_EQ( dq.size(), c_nSize );
 
             size_t nCount = 0;
             int val;
-            while ( !dq.empty() ) {
-                EXPECT_TRUE( dq.pop_front( val ) );
+            while ( !dq.empty()) {
+                EXPECT_TRUE( dq.pop_front( val ));
                 ++nCount;
                 EXPECT_EQ( static_cast<int>(c_nSize - nCount), val );
             }
@@ -58,12 +58,12 @@ namespace {
 
             // push_back/pop_back
             for ( int i = 0; i < static_cast<int>( c_nSize ); ++i )
-                EXPECT_TRUE( dq.push_back( i ) );
+                EXPECT_TRUE( dq.push_back( i ));
             EXPECT_EQ( dq.size(), c_nSize );
 
             nCount = 0;
-            while ( !dq.empty() ) {
-                EXPECT_TRUE( dq.pop_back( val ) );
+            while ( !dq.empty()) {
+                EXPECT_TRUE( dq.pop_back( val ));
                 ++nCount;
                 EXPECT_EQ( static_cast<int>(c_nSize - nCount), val );
             }
@@ -71,12 +71,12 @@ namespace {
 
             // push_back/pop_front
             for ( int i = 0; i < static_cast<int>( c_nSize ); ++i )
-                EXPECT_TRUE( dq.push_back( i ) );
+                EXPECT_TRUE( dq.push_back( i ));
             EXPECT_EQ( dq.size(), c_nSize );
 
             nCount = 0;
-            while ( !dq.empty() ) {
-                EXPECT_TRUE( dq.pop_front( val ) );
+            while ( !dq.empty()) {
+                EXPECT_TRUE( dq.pop_front( val ));
                 EXPECT_EQ( static_cast<int>( nCount ), val );
                 ++nCount;
             }
@@ -84,12 +84,12 @@ namespace {
 
             // push_front/pop_back
             for ( int i = 0; i < static_cast<int>( c_nSize ); ++i )
-                EXPECT_TRUE( dq.push_front( i ) );
+                EXPECT_TRUE( dq.push_front( i ));
             EXPECT_EQ( dq.size(), c_nSize );
 
             nCount = 0;
-            while ( !dq.empty() ) {
-                EXPECT_TRUE( dq.pop_back( val ) );
+            while ( !dq.empty()) {
+                EXPECT_TRUE( dq.pop_back( val ));
                 EXPECT_EQ( static_cast<int>( nCount ), val );
                 ++nCount;
             }
@@ -97,12 +97,12 @@ namespace {
 
             // clear
             for ( int i = 0; i < static_cast<int>( c_nSize ); ++i )
-                EXPECT_TRUE( dq.push_front( i ) );
+                EXPECT_TRUE( dq.push_front( i ));
             EXPECT_EQ( dq.size(), c_nSize );
 
-            EXPECT_FALSE( dq.empty() );
+            EXPECT_FALSE( dq.empty());
             dq.clear();
-            EXPECT_TRUE( dq.empty() );
+            EXPECT_TRUE( dq.empty());
         }
     };