2 files changed, 8 insertions, 61 deletions
diff --git a/tests/BlockTypeRegistry/BlockStateTest.cpp b/tests/BlockTypeRegistry/BlockStateTest.cpp
index d3ce92455..57317cbdf 100644
--- a/tests/BlockTypeRegistry/BlockStateTest.cpp
+++ b/tests/BlockTypeRegistry/BlockStateTest.cpp
@@ -109,37 +109,8 @@ static void testReplacing()
 
 
 
-int main()
-{
-	LOGD("BlockStateTest started");
-
-	try
-	{
-		testStaticCreation();
-		testDynamicCreation();
-		testReplacing();
-	}
-	catch (const TestException & exc)
-	{
-		LOGERROR("BlockStateTest has failed explicitly: %s", exc.mMessage.c_str());
-		return 1;
-	}
-	catch (const std::runtime_error & exc)
-	{
-		LOGERROR("BlockStateTest has failed, an unhandled exception was thrown: %s", exc.what());
-		return 1;
-	}
-	catch (...)
-	{
-		LOGERROR("BlockStateTest has failed, an unknown exception was thrown.");
-		return 1;
-	}
-
-	LOGD("BlockStateTest finished");
-
-	return 0;
-}
-
-
-
-
+IMPLEMENT_TEST_MAIN("BlockStateTest",
+	testStaticCreation();
+	testDynamicCreation();
+	testReplacing();
+)
diff --git a/tests/BlockTypeRegistry/BlockTypeRegistryTest.cpp b/tests/BlockTypeRegistry/BlockTypeRegistryTest.cpp
index 3479e55d7..6616dfdc0 100644
--- a/tests/BlockTypeRegistry/BlockTypeRegistryTest.cpp
+++ b/tests/BlockTypeRegistry/BlockTypeRegistryTest.cpp
@@ -236,30 +236,6 @@ static void testBlockTypeRegistry()
 
 
 
-int main()
-{
-	LOGD("BlockTypeRegistryTest started");
-
-	try
-	{
-		testBlockTypeRegistry();
-	}
-	catch (const TestException & exc)
-	{
-		LOGERROR("BlockTypeRegistryTest has failed, an unhandled exception was thrown: %s", exc.mMessage.c_str());
-		return 1;
-	}
-	catch (...)
-	{
-		LOGERROR("BlockTypeRegistryTest has failed, an unhandled exception was thrown.");
-		return 1;
-	}
-
-	LOGD("BlockTypeRegistryTest finished");
-
-	return 0;
-}
-
-
-
-
+IMPLEMENT_TEST_MAIN("BlockTypeRegistryTest",
+	testBlockTypeRegistry();
+)