Index: src/libchcore/Tests/TReadBufferQueueWrapperTests.cpp
===================================================================
diff -u -N -r3ccbdb8d3eac3427e6d3354854476e57fdc7ceb9 -r71bc7ffbd5b707e2cbb78eb30677d82577d62ee1
--- src/libchcore/Tests/TReadBufferQueueWrapperTests.cpp	(.../TReadBufferQueueWrapperTests.cpp)	(revision 3ccbdb8d3eac3427e6d3354854476e57fdc7ceb9)
+++ src/libchcore/Tests/TReadBufferQueueWrapperTests.cpp	(.../TReadBufferQueueWrapperTests.cpp)	(revision 71bc7ffbd5b707e2cbb78eb30677d82577d62ee1)
@@ -3,12 +3,242 @@
 #include "gmock/gmock.h"
 #include "../TReadBufferQueueWrapper.h"
 #include <memory>
+#include "../TCoreException.h"
+#include "../GTestMacros.h"
 
 using namespace chcore;
 
-TEST(TReadBufferQueueWrapperTests, DefaultTest)
+TEST(TReadBufferQueueWrapperTests, ConstructorWithZeroChunkSize)
 {
 	TBufferListPtr spList(std::make_shared<TBufferList>());
 
-	TReadBufferQueueWrapper queueWrapper(spList, 0, 0);
+	EXPECT_THROW(TReadBufferQueueWrapper(spList, 0, 0), TCoreException);
 }
+
+TEST(TReadBufferQueueWrapperTests, Constructor)
+{
+	TBufferListPtr spList(std::make_shared<TBufferList>());
+
+	TReadBufferQueueWrapper queue(spList, 0, 1024);
+	EXPECT_EQ(0, queue.GetCount());
+	EXPECT_TIMEOUT(queue.GetHasBuffersEvent());
+	EXPECT_EQ(false, queue.IsDataSourceFinished());
+}
+
+TEST(TReadBufferQueueWrapperTests, Pop_EmptyQueue)
+{
+	TBufferListPtr spList(std::make_shared<TBufferList>());
+
+	TReadBufferQueueWrapper queue(spList, 0, 1024);
+
+	EXPECT_EQ(nullptr, queue.Pop());
+}
+
+TEST(TReadBufferQueueWrapperTests, Pop_FromBufferList)
+{
+	TBufferListPtr spList(std::make_shared<TBufferList>());
+	TOverlappedDataBuffer buffer1(1024, nullptr);
+	TOverlappedDataBuffer buffer2(1024, nullptr);
+	TOverlappedDataBuffer buffer3(1024, nullptr);
+	TOverlappedDataBuffer buffer4(1024, nullptr);
+	spList->Push(&buffer1);
+	spList->Push(&buffer2);
+	spList->Push(&buffer3);
+	spList->Push(&buffer4);
+
+	TReadBufferQueueWrapper queue(spList, 0, 1024);
+
+	EXPECT_EQ(&buffer4, queue.Pop());
+	EXPECT_EQ(0, buffer4.GetFilePosition());
+	EXPECT_EQ(1024, buffer4.GetRequestedDataSize());
+
+	EXPECT_EQ(&buffer3, queue.Pop());
+	EXPECT_EQ(1024, buffer3.GetFilePosition());
+	EXPECT_EQ(1024, buffer3.GetRequestedDataSize());
+
+	EXPECT_EQ(&buffer2, queue.Pop());
+	EXPECT_EQ(2048, buffer2.GetFilePosition());
+	EXPECT_EQ(1024, buffer2.GetRequestedDataSize());
+
+	EXPECT_EQ(&buffer1, queue.Pop());
+	EXPECT_EQ(3072, buffer1.GetFilePosition());
+	EXPECT_EQ(1024, buffer1.GetRequestedDataSize());
+
+	EXPECT_EQ(nullptr, queue.Pop());
+}
+
+TEST(TReadBufferQueueWrapperTests, PushPop_ClaimedBuffers)
+{
+	TBufferListPtr spList(std::make_shared<TBufferList>());
+	TReadBufferQueueWrapper queue(spList, 0, 1024);
+
+	TOverlappedDataBuffer buffer1(1024, nullptr);
+	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);
+
+	EXPECT_SIGNALED(queue.GetHasBuffersEvent());
+	EXPECT_EQ(&buffer4, queue.Pop());
+	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());
+
+	EXPECT_SIGNALED(queue.GetHasBuffersEvent());
+	EXPECT_EQ(&buffer1, queue.Pop());
+	EXPECT_EQ(3072, buffer1.GetFilePosition());
+	EXPECT_EQ(1024, buffer1.GetRequestedDataSize());
+
+	EXPECT_TIMEOUT(queue.GetHasBuffersEvent());
+	EXPECT_EQ(nullptr, queue.Pop());
+}
+
+TEST(TReadBufferQueueWrapperTests, PushPop_MixedBuffers)
+{
+	TBufferListPtr spList(std::make_shared<TBufferList>());
+	TOverlappedDataBuffer buffer1(1024, nullptr);
+	TOverlappedDataBuffer buffer2(1024, nullptr);
+	spList->Push(&buffer1);
+	spList->Push(&buffer2);
+
+	TReadBufferQueueWrapper queue(spList, 0, 1024);
+
+	TOverlappedDataBuffer buffer3(1024, nullptr);
+	TOverlappedDataBuffer buffer4(1024, nullptr);
+	queue.Push(&buffer3, false);
+	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(1024, buffer4.GetRequestedDataSize());
+
+	EXPECT_SIGNALED(queue.GetHasBuffersEvent());
+	EXPECT_EQ(&buffer2, queue.Pop());
+	EXPECT_EQ(2048, buffer2.GetFilePosition());
+	EXPECT_EQ(1024, buffer2.GetRequestedDataSize());
+
+	EXPECT_SIGNALED(queue.GetHasBuffersEvent());
+	EXPECT_EQ(&buffer1, queue.Pop());
+	EXPECT_EQ(3072, buffer1.GetFilePosition());
+	EXPECT_EQ(1024, buffer1.GetRequestedDataSize());
+
+	EXPECT_TIMEOUT(queue.GetHasBuffersEvent());
+	EXPECT_EQ(nullptr, queue.Pop());
+}
+
+/////////////////////////////////////////////////////////////////////////////////
+// data source finished mode
+
+TEST(TReadBufferQueueWrapperTests, PushPop_DataSourceFinished)
+{
+	TBufferListPtr spList(std::make_shared<TBufferList>());
+
+	TOverlappedDataBuffer buffer1(1024, nullptr);
+	buffer1.SetLastPart(true);
+
+	spList->Push(&buffer1);
+
+	TReadBufferQueueWrapper queue(spList, 0, 1024);
+	queue.SetDataSourceFinished(&buffer1);
+
+	EXPECT_EQ(true, queue.IsDataSourceFinished());
+	EXPECT_EQ(nullptr, queue.Pop());
+}
+
+TEST(TReadBufferQueueWrapperTests, PushPop_DataSourceFinishedUsingInvalidBuffer)
+{
+	TBufferListPtr spList(std::make_shared<TBufferList>());
+
+	TOverlappedDataBuffer buffer1(1024, nullptr);
+	spList->Push(&buffer1);
+
+	TReadBufferQueueWrapper queue(spList, 0, 1024);
+
+	EXPECT_THROW(queue.SetDataSourceFinished(&buffer1), TCoreException);
+}
+
+TEST(TReadBufferQueueWrapperTests, PushPop_DataSourceFinished_CheckBufferMaintenance)
+{
+	TBufferListPtr spList(std::make_shared<TBufferList>());
+	TReadBufferQueueWrapper queue(spList, 0, 1024);
+
+	TOverlappedDataBuffer buffer1(1024, nullptr);
+	buffer1.SetFilePosition(0);
+	buffer1.SetLastPart(true);
+	queue.Push(&buffer1, true);
+	TOverlappedDataBuffer buffer2(1024, nullptr);
+	buffer2.SetFilePosition(1024);
+	buffer2.SetLastPart(true);
+	queue.Push(&buffer2, true);
+
+	queue.SetDataSourceFinished(&buffer1);
+
+	EXPECT_EQ(1, queue.GetCount());
+	EXPECT_EQ(&buffer1, queue.Pop());
+
+	EXPECT_EQ(1, spList->GetCount());
+	EXPECT_EQ(&buffer2, spList->Pop());
+}
+
+TEST(TReadBufferQueueWrapperTests, PushPop_DataSourceFinished_ValidPushAfterFinished)
+{
+	TBufferListPtr spList(std::make_shared<TBufferList>());
+	TReadBufferQueueWrapper queue(spList, 0, 1024);
+
+	TOverlappedDataBuffer buffer1(1024, nullptr);
+	buffer1.SetLastPart(true);
+	queue.Push(&buffer1, true);
+
+	queue.SetDataSourceFinished(&buffer1);
+
+	EXPECT_EQ(1, queue.GetCount());
+	EXPECT_EQ(0, spList->GetCount());
+
+	TOverlappedDataBuffer buffer2(1024, nullptr);
+	buffer2.SetLastPart(true);
+	queue.Push(&buffer2, true);
+
+	EXPECT_EQ(1, queue.GetCount());
+	EXPECT_EQ(&buffer1, queue.Pop());
+	EXPECT_EQ(1, spList->GetCount());
+	EXPECT_EQ(&buffer2, spList->Pop());
+}
+
+TEST(TReadBufferQueueWrapperTests, PushPop_DataSourceFinished_InvalidPushAfterFinished)
+{
+	TBufferListPtr spList(std::make_shared<TBufferList>());
+	TReadBufferQueueWrapper queue(spList, 0, 1024);
+
+	TOverlappedDataBuffer buffer1(1024, nullptr);
+	buffer1.SetLastPart(true);
+	buffer1.SetFilePosition(0);
+	queue.Push(&buffer1, true);
+
+	queue.SetDataSourceFinished(&buffer1);
+
+	EXPECT_EQ(1, queue.GetCount());
+	EXPECT_EQ(&buffer1, queue.Pop());
+	EXPECT_EQ(0, spList->GetCount());
+
+	TOverlappedDataBuffer buffer2(1024, nullptr);
+	buffer2.SetFilePosition(1000);
+	EXPECT_THROW(queue.Push(&buffer2, true), TCoreException);
+}