Index: src/libchcore/Tests/TOverlappedDataBufferTests.cpp
===================================================================
diff -u -N -r6e4ac7776b68464371cd8522a2a8d79fbcab3b28 -rbef894e38e5c1486824787cf8c47a87a0828b228
--- src/libchcore/Tests/TOverlappedDataBufferTests.cpp	(.../TOverlappedDataBufferTests.cpp)	(revision 6e4ac7776b68464371cd8522a2a8d79fbcab3b28)
+++ src/libchcore/Tests/TOverlappedDataBufferTests.cpp	(.../TOverlappedDataBufferTests.cpp)	(revision bef894e38e5c1486824787cf8c47a87a0828b228)
@@ -8,30 +8,33 @@
 
 using namespace chcore;
 
+///////////////////////////////////////////////////////////////////////////////
+// construction
+
+TEST(TOverlappedDataBufferTests, Constructor_ZeroSizedBuffer)
+{
+	EXPECT_THROW(TOverlappedDataBuffer(0, nullptr), TCoreException);
+}
+
 TEST(TOverlappedDataBufferTests, Constructor_NullParam)
 {
-	TOverlappedDataBuffer buffer(0, nullptr);
+	TOverlappedDataBuffer buffer(4096, nullptr);
 
 	EXPECT_EQ(nullptr, buffer.GetParam());
 }
 
-TEST(TOverlappedDataBufferTests, SetParam_GetParam)
+TEST(TOverlappedDataBufferTests, Constructor_NonNullParam)
 {
-	int iTest = 5;
+	TOverlappedDataBuffer buffer(4096, (void*)5);
 
-	TOverlappedDataBuffer buffer(0, &iTest);
-
-	EXPECT_EQ(&iTest, buffer.GetParam());
+	EXPECT_EQ((void*)5, buffer.GetParam());
 }
 
 TEST(TOverlappedDataBufferTests, Constructor_SanityTest)
 {
-	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
+	int iParam = 5;
+	TOverlappedDataBuffer buffer(32768, &iParam);
 
-	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
-	TOverlappedDataBuffer buffer(32768, &queue);
-
 	EXPECT_NE(nullptr, buffer.GetBufferPtr());
 	EXPECT_EQ(32768, buffer.GetBufferSize());
 	EXPECT_EQ(0, buffer.GetBytesTransferred());
@@ -43,14 +46,42 @@
 	EXPECT_FALSE(buffer.IsLastPart());
 }
 
-TEST(TOverlappedDataBufferTests, ReinitializeBuffer_ReduceSize)
+///////////////////////////////////////////////////////////////////////////////
+// parameter handling
+
+TEST(TOverlappedDataBufferTests, GetParam)
 {
-	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
+	int iTest = 5;
 
-	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
-	TOverlappedDataBuffer buffer(32768, &queue);
+	TOverlappedDataBuffer buffer(4096, &iTest);
 
+	EXPECT_EQ(&iTest, buffer.GetParam());
+}
+
+TEST(TOverlappedDataBufferTests, SetParam_GetParam)
+{
+	int iTest = 5;
+
+	TOverlappedDataBuffer buffer(4096, &iTest);
+	buffer.SetParam(nullptr);
+
+	EXPECT_EQ(nullptr, buffer.GetParam());
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// buffer re-initialization
+
+TEST(TOverlappedDataBufferTests, ReinitializeBuffer_ZeroSize)
+{
+	TOverlappedDataBuffer buffer(32768, nullptr);
+
+	EXPECT_THROW(buffer.ReinitializeBuffer(0), TCoreException);
+}
+
+TEST(TOverlappedDataBufferTests, ReinitializeBuffer_ReduceSize)
+{
+	TOverlappedDataBuffer buffer(32768, nullptr);
+
 	buffer.ReinitializeBuffer(16384);
 
 	EXPECT_NE(nullptr, buffer.GetBufferPtr());
@@ -59,118 +90,97 @@
 
 TEST(TOverlappedDataBufferTests, ReinitializeBuffer_IncreaseSize)
 {
-	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
+	TOverlappedDataBuffer buffer(16384, nullptr);
 
-	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
-	TOverlappedDataBuffer buffer(16384, &queue);
-
 	buffer.ReinitializeBuffer(32768);
 
 	EXPECT_NE(nullptr, buffer.GetBufferPtr());
 	EXPECT_EQ(32768, buffer.GetBufferSize());
 }
 
-TEST(TOverlappedDataBufferTests, SetRequestedDataSize_GetRequestedDataSize)
+TEST(TOverlappedDataBufferTests, ReinitializeBuffer_SameSize)
 {
-	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
+	TOverlappedDataBuffer buffer(16384, nullptr);
 
-	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
-	TOverlappedDataBuffer buffer(16384, &queue);
+	void* pBuffer = buffer.GetBufferPtr();
 
+	buffer.ReinitializeBuffer(16384);
+
+	EXPECT_EQ(pBuffer, buffer.GetBufferPtr());
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// other attributes
+
+TEST(TOverlappedDataBufferTests, SetRequestedDataSize_GetRequestedDataSize)
+{
+	TOverlappedDataBuffer buffer(16384, nullptr);
+
 	buffer.SetRequestedDataSize(123);
 
 	EXPECT_EQ(123, buffer.GetRequestedDataSize());
 }
 
 TEST(TOverlappedDataBufferTests, SetRealDataSize_GetRealDataSize)
 {
-	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
+	TOverlappedDataBuffer buffer(16384, nullptr);
 
-	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
-	TOverlappedDataBuffer buffer(16384, &queue);
-
 	buffer.SetRealDataSize(123);
 
 	EXPECT_EQ(123, buffer.GetRealDataSize());
 }
 
 TEST(TOverlappedDataBufferTests, SetLastPart_IsLastPart)
 {
-	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
+	TOverlappedDataBuffer buffer(16384, nullptr);
 
-	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
-	TOverlappedDataBuffer buffer(16384, &queue);
-
 	buffer.SetLastPart(true);
 
 	EXPECT_TRUE(buffer.IsLastPart());
 }
 
 TEST(TOverlappedDataBufferTests, SetErrorCode_GetErrorCode)
 {
-	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
+	TOverlappedDataBuffer buffer(16384, nullptr);
 
-	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
-	TOverlappedDataBuffer buffer(16384, &queue);
-
 	buffer.SetErrorCode(123);
 
 	EXPECT_EQ(123, buffer.GetErrorCode());
 }
 
 TEST(TOverlappedDataBufferTests, SetStatusCode_GetStatusCode)
 {
-	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
+	TOverlappedDataBuffer buffer(16384, nullptr);
 
-	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
-	TOverlappedDataBuffer buffer(16384, &queue);
-
 	buffer.SetStatusCode(123);
 
 	EXPECT_EQ(123, buffer.GetStatusCode());
 }
 
 TEST(TOverlappedDataBufferTests, SetBytesTransferred_GetBytesTransferred)
 {
-	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
+	TOverlappedDataBuffer buffer(16384, nullptr);
 
-	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
-	TOverlappedDataBuffer buffer(16384, &queue);
-
 	buffer.SetBytesTransferred(123);
 
 	EXPECT_EQ(123, buffer.GetBytesTransferred());
 }
 
 TEST(TOverlappedDataBufferTests, GetFilePosition_SetFilePosition)
 {
-	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
+	TOverlappedDataBuffer buffer(16384, nullptr);
 
-	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
-	TOverlappedDataBuffer buffer(16384, &queue);
-
 	buffer.SetFilePosition(123);
 
 	EXPECT_EQ(123, buffer.GetFilePosition());
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+// 
 TEST(TOverlappedDataBufferTests, InitForRead)
 {
-	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
+	TOverlappedDataBuffer buffer(16384, nullptr);
 
-	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
-	TOverlappedDataBuffer buffer(16384, &queue);
-
 	buffer.SetRequestedDataSize(123);
 	buffer.SetFilePosition(1);
 	buffer.SetRealDataSize(120);
@@ -192,12 +202,8 @@
 
 TEST(TOverlappedDataBufferTests, InitForWrite)
 {
-	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
+	TOverlappedDataBuffer buffer(16384, nullptr);
 
-	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
-	TOverlappedDataBuffer buffer(16384, &queue);
-
 	buffer.SetRequestedDataSize(123);
 	buffer.SetFilePosition(1);
 	buffer.SetRealDataSize(120);
@@ -215,19 +221,16 @@
 
 TEST(TOverlappedDataBufferTests, Reset)
 {
-	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
+	TOverlappedDataBuffer buffer(16384, nullptr);
 
-	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
-	TOverlappedDataBuffer buffer(16384, &queue);
-
 	buffer.SetRequestedDataSize(123);
 	buffer.SetFilePosition(1);
 	buffer.SetRealDataSize(120);
 	buffer.SetLastPart(true);
 	buffer.SetErrorCode(54);
 	buffer.SetStatusCode(3);
 	buffer.SetBytesTransferred(12);
+	buffer.SetParam((void*)1);
 
 	buffer.Reset();
 
@@ -238,6 +241,7 @@
 	EXPECT_EQ(0, buffer.GetErrorCode());
 	EXPECT_EQ(0, buffer.GetStatusCode());
 	EXPECT_EQ(0, buffer.GetBytesTransferred());
+	EXPECT_EQ(nullptr, buffer.GetParam());
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////