1 files changed, 22 insertions, 17 deletions

diff --git a/tests/ChunkData/ArraytoCoord.cpp b/tests/ChunkData/ArraytoCoord.cpp
index 440730e46..e4ca9ce8d 100644
--- a/tests/ChunkData/ArraytoCoord.cpp
+++ b/tests/ChunkData/ArraytoCoord.cpp
@@ -1,12 +1,13 @@
 
 #include "Globals.h"
+#include "../TestHelpers.h"
 #include "ChunkData.h"
 
 
 
-int main(int argc, char** argv)
+/** Performs the entire ArrayToCoords test. */
+static void test()
 {
-	LOGD("Test started");
 
 	class cMockAllocationPool
 		: public cAllocationPool<cChunkData::sChunkSection>
@@ -35,23 +36,23 @@ int main(int argc, char** argv)
 		memset(SrcBlockBuffer, 0x00, sizeof(SrcBlockBuffer));
 		SrcBlockBuffer[7 + (4 * 16) + (5 * 16 * 16)] = 0xcd;
 		buffer.SetBlockTypes(SrcBlockBuffer);
-		testassert(buffer.GetBlock({ 7, 5, 4 }) == 0xcd);
+		TEST_EQUAL(buffer.GetBlock({ 7, 5, 4 }), 0xcd);
 
 		NIBBLETYPE SrcNibbleBuffer[16 * 16 * 256 / 2];
 		memset(SrcNibbleBuffer, 0x00, sizeof(SrcNibbleBuffer));
 		SrcNibbleBuffer[(6 + (1 * 16) + (2 * 16 * 16)) / 2] = 0xe;
 		buffer.SetMetas(SrcNibbleBuffer);
-		testassert(buffer.GetMeta({ 6, 2, 1 }) == 0xe);
+		TEST_EQUAL(buffer.GetMeta({ 6, 2, 1 }), 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);
+		TEST_EQUAL(buffer.GetBlockLight({ 6, 2, 1 }), 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);
+		TEST_EQUAL(buffer.GetSkyLight({ 6, 2, 1 }), 0xe);
 	}
 
 	{
@@ -62,23 +63,23 @@ int main(int argc, char** argv)
 		memset(SrcBlockBuffer, 0x00, sizeof(SrcBlockBuffer));
 		SrcBlockBuffer[7 + (4 * 16) + (24 * 16 * 16)] = 0xcd;
 		buffer.SetBlockTypes(SrcBlockBuffer);
-		testassert(buffer.GetBlock({ 7, 24, 4 }) == 0xcd);
+		TEST_EQUAL(buffer.GetBlock({ 7, 24, 4 }), 0xcd);
 
 		NIBBLETYPE SrcNibbleBuffer[16 * 16 * 256 / 2];
 		memset(SrcNibbleBuffer, 0x00, sizeof(SrcNibbleBuffer));
 		SrcNibbleBuffer[(6 + (1 * 16) + (24 * 16 * 16)) / 2] = 0xe;
 		buffer.SetMetas(SrcNibbleBuffer);
-		testassert(buffer.GetMeta({ 6, 24, 1 }) == 0xe);
+		TEST_EQUAL(buffer.GetMeta({ 6, 24, 1 }), 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);
+		TEST_EQUAL(buffer.GetBlockLight({ 6, 24, 1 }), 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);
+		TEST_EQUAL(buffer.GetSkyLight({ 6, 24, 1 }), 0xe);
 	}
 
 	{
@@ -88,23 +89,27 @@ int main(int argc, char** argv)
 		BLOCKTYPE SrcBlockBuffer[16 * 16 * 256];
 		memset(SrcBlockBuffer, 0x00, sizeof(SrcBlockBuffer));
 		buffer.SetBlockTypes(SrcBlockBuffer);
-		testassert(buffer.GetBlock({ 7, 24, 4 }) == 0x00);
+		TEST_EQUAL(buffer.GetBlock({ 7, 24, 4 }), 0x00);
 
 		NIBBLETYPE SrcNibbleBuffer[16 * 16 * 256 / 2];
 		memset(SrcNibbleBuffer, 0x00, sizeof(SrcNibbleBuffer));
 		buffer.SetMetas(SrcNibbleBuffer);
-		testassert(buffer.GetMeta({ 6, 24, 1 }) == 0x0);
+		TEST_EQUAL(buffer.GetMeta({ 6, 24, 1 }), 0x0);
 
 		memset(SrcNibbleBuffer, 0x00, sizeof(SrcNibbleBuffer));
 		buffer.SetBlockLight(SrcNibbleBuffer);
-		testassert(buffer.GetBlockLight({ 6, 24, 1 }) == 0x0);
+		TEST_EQUAL(buffer.GetBlockLight({ 6, 24, 1 }), 0x0);
 
 		memset(SrcNibbleBuffer, 0xff, sizeof(SrcNibbleBuffer));
 		buffer.SetSkyLight(SrcNibbleBuffer);
-		testassert(buffer.GetSkyLight({ 6, 24, 1 }) == 0xf);
+		TEST_EQUAL(buffer.GetSkyLight({ 6, 24, 1 }), 0xf);
 	}
-
-	// All tests passed:
-	return 0;
 }
 
+
+
+
+
+IMPLEMENT_TEST_MAIN("ChunkData ArrayToCoord",
+	test();
+)