Index: src/libchcore/Tests/TReadBufferQueueWrapperTests.cpp =================================================================== diff -u -N -r71bc7ffbd5b707e2cbb78eb30677d82577d62ee1 -r980c1a0de537813728871676200a0960410b11fb --- src/libchcore/Tests/TReadBufferQueueWrapperTests.cpp (.../TReadBufferQueueWrapperTests.cpp) (revision 71bc7ffbd5b707e2cbb78eb30677d82577d62ee1) +++ src/libchcore/Tests/TReadBufferQueueWrapperTests.cpp (.../TReadBufferQueueWrapperTests.cpp) (revision 980c1a0de537813728871676200a0960410b11fb) @@ -76,10 +76,10 @@ TOverlappedDataBuffer buffer2(1024, nullptr); TOverlappedDataBuffer buffer3(1024, nullptr); TOverlappedDataBuffer buffer4(1024, nullptr); - queue.Push(&buffer4, false); - queue.Push(&buffer3, false); - queue.Push(&buffer2, false); queue.Push(&buffer1, false); + queue.Push(&buffer2, false); + queue.Push(&buffer3, false); + queue.Push(&buffer4, false); EXPECT_SIGNALED(queue.GetHasBuffersEvent()); EXPECT_EQ(&buffer4, queue.Pop()); @@ -121,16 +121,16 @@ queue.Push(&buffer4, false); EXPECT_SIGNALED(queue.GetHasBuffersEvent()); - EXPECT_EQ(&buffer3, queue.Pop()); - EXPECT_EQ(0, buffer3.GetFilePosition()); - EXPECT_EQ(1024, buffer3.GetRequestedDataSize()); - - EXPECT_SIGNALED(queue.GetHasBuffersEvent()); EXPECT_EQ(&buffer4, queue.Pop()); - EXPECT_EQ(1024, buffer4.GetFilePosition()); + EXPECT_EQ(0, buffer4.GetFilePosition()); EXPECT_EQ(1024, buffer4.GetRequestedDataSize()); EXPECT_SIGNALED(queue.GetHasBuffersEvent()); + EXPECT_EQ(&buffer3, queue.Pop()); + EXPECT_EQ(1024, buffer3.GetFilePosition()); + EXPECT_EQ(1024, buffer3.GetRequestedDataSize()); + + EXPECT_SIGNALED(queue.GetHasBuffersEvent()); EXPECT_EQ(&buffer2, queue.Pop()); EXPECT_EQ(2048, buffer2.GetFilePosition()); EXPECT_EQ(1024, buffer2.GetRequestedDataSize());