2 files changed, 41 insertions, 38 deletions

diff --git a/tests/ChunkData/ArraytoCoord.cpp b/tests/ChunkData/ArraytoCoord.cpp
index 4942ababb..0daf38f7b 100644
--- a/tests/ChunkData/ArraytoCoord.cpp
+++ b/tests/ChunkData/ArraytoCoord.cpp
@@ -11,26 +11,26 @@ int main(int argc, char** argv)
 		cChunkData buffer;
 
 		BLOCKTYPE SrcBlockBuffer[16 * 16 * 256];
-		memset(SrcBlockBuffer, 0x00, 16 * 16 * 256);
-		SrcBlockBuffer[7 + (4 * 16) + (5 * 16 * 16)] = 0xCD;
+		memset(SrcBlockBuffer, 0x00, sizeof(SrcBlockBuffer));
+		SrcBlockBuffer[7 + (4 * 16) + (5 * 16 * 16)] = 0xcd;
 		buffer.SetBlockTypes(SrcBlockBuffer);
-		testassert(buffer.GetBlock(7,5,4) == 0xCD);
+		testassert(buffer.GetBlock(7, 5, 4) == 0xcd);
 	
 		NIBBLETYPE SrcNibbleBuffer[16 * 16 * 256 / 2];
-		memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 / 2);
-		SrcNibbleBuffer[(6 + (1 * 16) + (2 * 16 * 16)) / 2] = 0xE;
+		memset(SrcNibbleBuffer, 0x00, sizeof(SrcNibbleBuffer));
+		SrcNibbleBuffer[(6 + (1 * 16) + (2 * 16 * 16)) / 2] = 0xe;
 		buffer.SetMetas(SrcNibbleBuffer);
-		testassert(buffer.GetMeta(6, 2, 1) == 0xE);
+		testassert(buffer.GetMeta(6, 2, 1) == 0xe);
 	
-		memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 / 2);
-		SrcNibbleBuffer[(6 + (1 * 16) + (2 * 16 * 16)) / 2] = 0xE;
+		memset(SrcNibbleBuffer, 0x00, sizeof(SrcNibbleBuffer));
+		SrcNibbleBuffer[(6 + (1 * 16) + (2 * 16 * 16)) / 2] = 0xe;
 		buffer.SetBlockLight(SrcNibbleBuffer);
-		testassert(buffer.GetBlockLight(6, 2, 1) == 0xE);
+		testassert(buffer.GetBlockLight(6, 2, 1) == 0xe);
 	
-		memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 / 2);
-		SrcNibbleBuffer[(6 + (1 * 16) + (2 * 16 * 16)) / 2] = 0xE;
+		memset(SrcNibbleBuffer, 0x00, sizeof(SrcNibbleBuffer));
+		SrcNibbleBuffer[(6 + (1 * 16) + (2 * 16 * 16)) / 2] = 0xe;
 		buffer.SetSkyLight(SrcNibbleBuffer);
-		testassert(buffer.GetSkyLight(6, 2, 1) == 0xE);
+		testassert(buffer.GetSkyLight(6, 2, 1) == 0xe);
 	}
 	
 	{
@@ -38,26 +38,26 @@ int main(int argc, char** argv)
 		cChunkData buffer;
 
 		BLOCKTYPE SrcBlockBuffer[16 * 16 * 256];
-		memset(SrcBlockBuffer, 0x00, 16 * 16 * 256);
-		SrcBlockBuffer[7 + (4 * 16) + (24 * 16 * 16)] = 0xCD;
+		memset(SrcBlockBuffer, 0x00, sizeof(SrcBlockBuffer));
+		SrcBlockBuffer[7 + (4 * 16) + (24 * 16 * 16)] = 0xcd;
 		buffer.SetBlockTypes(SrcBlockBuffer);
-		testassert(buffer.GetBlock(7, 24, 4) == 0xCD);
+		testassert(buffer.GetBlock(7, 24, 4) == 0xcd);
 	
 		NIBBLETYPE SrcNibbleBuffer[16 * 16 * 256 / 2];
-		memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 / 2);
-		SrcNibbleBuffer[(6 + (1 * 16) + (24 * 16 * 16)) / 2] = 0xE;
+		memset(SrcNibbleBuffer, 0x00, sizeof(SrcNibbleBuffer));
+		SrcNibbleBuffer[(6 + (1 * 16) + (24 * 16 * 16)) / 2] = 0xe;
 		buffer.SetMetas(SrcNibbleBuffer);
-		testassert(buffer.GetMeta(6, 24, 1) == 0xE);
+		testassert(buffer.GetMeta(6, 24, 1) == 0xe);
 	
-		memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 /2);
-		SrcNibbleBuffer[(6+1*16+24*16*16)/2] = 0xE;
+		memset(SrcNibbleBuffer, 0x00, sizeof(SrcNibbleBuffer));
+		SrcNibbleBuffer[(6 + 1 * 16 + 24 * 16 * 16) / 2] = 0xe;
 		buffer.SetBlockLight(SrcNibbleBuffer);
-		testassert(buffer.GetBlockLight(6,24,1) == 0xE);
+		testassert(buffer.GetBlockLight(6, 24, 1) == 0xe);
 	
-		memset(SrcNibbleBuffer, 0xFF, 16 * 16 * 256 / 2);
-		SrcNibbleBuffer[(6 + (1 * 16) + (24 * 16 * 16))/2] = 0xE;
+		memset(SrcNibbleBuffer, 0xff, sizeof(SrcNibbleBuffer));
+		SrcNibbleBuffer[(6 + (1 * 16) + (24 * 16 * 16)) / 2] = 0xe;
 		buffer.SetSkyLight(SrcNibbleBuffer);
-		testassert(buffer.GetSkyLight(6, 24, 1) == 0xE);
+		testassert(buffer.GetSkyLight(6, 24, 1) == 0xe);
 	}
 	
 	{
@@ -65,22 +65,25 @@ int main(int argc, char** argv)
 		cChunkData buffer;
 
 		BLOCKTYPE SrcBlockBuffer[16 * 16 * 256];
-		memset(SrcBlockBuffer, 0x00, 16 * 16 * 256);
+		memset(SrcBlockBuffer, 0x00, sizeof(SrcBlockBuffer));
 		buffer.SetBlockTypes(SrcBlockBuffer);
 		testassert(buffer.GetBlock(7, 24, 4) == 0x00);
 	
-		NIBBLETYPE SrcNibbleBuffer[16 * 16 * 256/2];
-		memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 /2);
+		NIBBLETYPE SrcNibbleBuffer[16 * 16 * 256 / 2];
+		memset(SrcNibbleBuffer, 0x00, sizeof(SrcNibbleBuffer));
 		buffer.SetMetas(SrcNibbleBuffer);
 		testassert(buffer.GetMeta(6, 24, 1) == 0x0);
 	
-		memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 /2);
+		memset(SrcNibbleBuffer, 0x00, sizeof(SrcNibbleBuffer));
 		buffer.SetBlockLight(SrcNibbleBuffer);
-		testassert(buffer.GetBlockLight(6,24,1) == 0x0);
+		testassert(buffer.GetBlockLight(6, 24, 1) == 0x0);
 	
-		memset(SrcNibbleBuffer, 0xFF, 16 * 16 * 256 /2);
+		memset(SrcNibbleBuffer, 0xff, sizeof(SrcNibbleBuffer));
 		buffer.SetSkyLight(SrcNibbleBuffer);
-		testassert(buffer.GetSkyLight(6, 24, 1) == 0xF);
+		testassert(buffer.GetSkyLight(6, 24, 1) == 0xf);
 	}
+	
+	// All tests passed:
+	return 0;
 }
 
diff --git a/tests/ChunkData/Copies.cpp b/tests/ChunkData/Copies.cpp
index 788d2c558..312441eee 100644
--- a/tests/ChunkData/Copies.cpp
+++ b/tests/ChunkData/Copies.cpp
@@ -34,8 +34,8 @@ int main(int argc, char** argv)
 		buffer.SetBlockTypes(SrcBlockBuffer);
 		buffer.CopyBlockTypes(DstBlockBuffer);
 		testassert(memcmp(SrcBlockBuffer, DstBlockBuffer, (16 * 16 * 256) - 1) == 0);
-	
 	}
+	
 	{
 		cChunkData buffer;
 	
@@ -57,9 +57,8 @@ int main(int argc, char** argv)
 		buffer.SetMetas(SrcNibbleBuffer);
 		buffer.CopyMetas(DstNibbleBuffer);
 		testassert(memcmp(SrcNibbleBuffer, DstNibbleBuffer, (16 * 16 * 256 / 2) - 1) == 0);
-
-	
 	}
+	
 	{
 		cChunkData buffer;
 		
@@ -81,9 +80,8 @@ int main(int argc, char** argv)
 		buffer.SetBlockLight(SrcNibbleBuffer);
 		buffer.CopyBlockLight(DstNibbleBuffer);
 		testassert(memcmp(SrcNibbleBuffer, DstNibbleBuffer, (16 * 16 * 256 /2) - 1) == 0);
-	
-		
 	}
+	
 	{
 		cChunkData buffer;
 		
@@ -101,13 +99,12 @@ int main(int argc, char** argv)
 		buffer.CopySkyLight(DstNibbleBuffer);
 		testassert(memcmp(SrcNibbleBuffer, DstNibbleBuffer, (16 * 16 * 256 / 2) - 1) == 0);
 	
-
 		memset(SrcNibbleBuffer, 0xFF, 16 * 16 * 256 / 2);
 		buffer.SetSkyLight(SrcNibbleBuffer);
 		buffer.CopySkyLight(DstNibbleBuffer);
 		testassert(memcmp(SrcNibbleBuffer, DstNibbleBuffer, (16 * 16 * 256 / 2) - 1) == 0);
-		
 	}
+	
 	{
 		cChunkData buffer;
 		
@@ -131,4 +128,7 @@ int main(int argc, char** argv)
 		buffer.CopySkyLight(DstNibbleBuffer);
 		testassert(memcmp(SrcNibbleBuffer, DstNibbleBuffer, (16 * 16 * 256 / 2) - 1) == 0);
 	}
+	
+	// All tests successful:
+	return 0;
 }