Index: src/libchengine/Tests/TOrderedBufferQueueTests.cpp =================================================================== diff -u -N -r301444777085263aae7aff911dd56722f302597e -r16c91e1039e6e64701b2daad3f9fd44ad89707e8 --- src/libchengine/Tests/TOrderedBufferQueueTests.cpp (.../TOrderedBufferQueueTests.cpp) (revision 301444777085263aae7aff911dd56722f302597e) +++ src/libchengine/Tests/TOrderedBufferQueueTests.cpp (.../TOrderedBufferQueueTests.cpp) (revision 16c91e1039e6e64701b2daad3f9fd44ad89707e8) @@ -23,7 +23,7 @@ TBufferListPtr spEmptyBuffers(std::make_shared()); TOrderedBufferQueue queue(spEmptyBuffers, 0); - EXPECT_EQ(0, queue.GetCount()); + EXPECT_EQ(0UL, queue.GetCount()); EXPECT_EQ(true, queue.IsEmpty()); EXPECT_TIMEOUT(queue.GetHasBuffersEvent()); EXPECT_EQ(nullptr, queue.Peek()); @@ -38,7 +38,7 @@ queue.Push(&buffer); - EXPECT_EQ(1, queue.GetCount()); + EXPECT_EQ(1UL, queue.GetCount()); EXPECT_EQ(false, queue.IsEmpty()); EXPECT_SIGNALED(queue.GetHasBuffersEvent()); EXPECT_EQ(&buffer, queue.Peek()); @@ -53,7 +53,7 @@ queue.Push(&buffer); - EXPECT_EQ(1, queue.GetCount()); + EXPECT_EQ(1UL, queue.GetCount()); EXPECT_EQ(false, queue.IsEmpty()); EXPECT_TIMEOUT(queue.GetHasBuffersEvent()); EXPECT_EQ(&buffer, queue.Peek()); @@ -74,7 +74,7 @@ queue.Push(&buffer1); queue.Push(&buffer2); - EXPECT_EQ(2, queue.GetCount()); + EXPECT_EQ(2UL, queue.GetCount()); EXPECT_EQ(false, queue.IsEmpty()); EXPECT_SIGNALED(queue.GetHasBuffersEvent()); EXPECT_EQ(&buffer2, queue.Peek()); @@ -91,7 +91,7 @@ queue.Push(&buffer); EXPECT_EQ(&buffer, queue.Pop()); - EXPECT_EQ(0, queue.GetCount()); + EXPECT_EQ(0UL, queue.GetCount()); EXPECT_EQ(true, queue.IsEmpty()); EXPECT_TIMEOUT(queue.GetHasBuffersEvent()); EXPECT_EQ(nullptr, queue.Peek()); @@ -106,7 +106,7 @@ queue.Push(&buffer); queue.ClearBuffers(); - EXPECT_EQ(1, spEmptyBuffers->GetCount()); + EXPECT_EQ(1UL, spEmptyBuffers->GetCount()); } TEST(TOrderedBufferQueueTests, ExpectedPos_ReleaseBuffersUnordered) @@ -119,7 +119,7 @@ queue.Push(&buffer); queue.ClearBuffers(); - EXPECT_EQ(1, spEmptyBuffers->GetCount()); + EXPECT_EQ(1UL, spEmptyBuffers->GetCount()); } /////////////////////////////////////////////////////////////////////////////////////////// @@ -133,7 +133,7 @@ TBufferListPtr spEmptyBuffers(std::make_shared()); TOrderedBufferQueue queue(spEmptyBuffers, 0); - EXPECT_EQ(0, queue.GetCount()); + EXPECT_EQ(0UL, queue.GetCount()); EXPECT_TIMEOUT(queue.GetHasErrorEvent()); EXPECT_EQ(true, queue.IsEmpty()); } @@ -151,7 +151,7 @@ FallbackCollection collection; queue.PushError(&buffer, collection); - EXPECT_EQ(1, queue.GetCount()); + EXPECT_EQ(1UL, queue.GetCount()); EXPECT_SIGNALED(queue.GetHasErrorEvent()); EXPECT_EQ(true, collection.empty()); } @@ -172,12 +172,12 @@ queue.PushError(&buffer1, collection); queue.PushError(&buffer2, collection); - EXPECT_EQ(1, queue.GetCount()); + EXPECT_EQ(1UL, queue.GetCount()); EXPECT_SIGNALED(queue.GetHasErrorEvent()); - EXPECT_EQ(1, collection.size()); + EXPECT_EQ(1UL, collection.size()); EXPECT_EQ(&buffer2, collection.front()); EXPECT_EQ(1000, collection.front()->GetFilePosition()); - EXPECT_EQ(0, collection.front()->GetErrorCode()); + EXPECT_EQ(0UL, collection.front()->GetErrorCode()); } TEST(TOrderedBufferQueueTests, PushBuffer_TwoFailuresOutOfOrder) @@ -196,12 +196,12 @@ queue.PushError(&buffer2, collection); queue.PushError(&buffer1, collection); - EXPECT_EQ(1, queue.GetCount()); + EXPECT_EQ(1UL, queue.GetCount()); EXPECT_SIGNALED(queue.GetHasErrorEvent()); - EXPECT_EQ(1, collection.size()); + EXPECT_EQ(1UL, collection.size()); EXPECT_EQ(&buffer2, collection.front()); EXPECT_EQ(1000, collection.front()->GetFilePosition()); - EXPECT_EQ(0, collection.front()->GetErrorCode()); + EXPECT_EQ(0UL, collection.front()->GetErrorCode()); } TEST(TOrderedBufferQueueTests, PushBuffer_ThrowOnNonErrorBuffer) @@ -244,10 +244,10 @@ queue.PushError(&buffer1, collection); queue.PopError(); - EXPECT_EQ(0, collection.size()); + EXPECT_EQ(0UL, collection.size()); EXPECT_TIMEOUT(queue.GetHasErrorEvent()); queue.PushError(&buffer2, collection); - EXPECT_EQ(0, queue.GetCount()); - EXPECT_EQ(1, collection.size()); + EXPECT_EQ(0UL, queue.GetCount()); + EXPECT_EQ(1UL, collection.size()); }