Test drafts

test/CMapEditManagerTest.cpp

@@ -110,11 +110,11 @@ BOOST_AUTO_TEST_CASE(CMapEditManager_DrawTerrain_View)
 	{
 		// Load maps and json config
 
-		#if defined(__MINGW32__)
+//		#if defined(__MINGW32__)
 		const std::string TEST_DATA_DIR = "test/";
-		#else
-		const std::string TEST_DATA_DIR = ".";
-		#endif // defined
+//		#else
+//		const std::string TEST_DATA_DIR = ".";
+//		#endif // defined
 
 
 		auto loader = new CFilesystemLoader("test/", TEST_DATA_DIR);

test/CMapFormatTest.cpp

@@ -0,0 +1,63 @@
+
+/*
+ * CMapFormatTest.cpp, part of VCMI engine
+ *
+ * Authors: listed in file AUTHORS in main folder
+ *
+ * License: GNU General Public License v2.0 or later
+ * Full text of license available in license.txt file, in main folder
+ *
+ */
+
+
+#include "StdInc.h"
+#include <boost/test/unit_test.hpp>
+
+#include "../lib/mapping/CMap.h"
+#include "../lib/rmg/CMapGenOptions.h"
+#include "../lib/rmg/CMapGenerator.h"
+
+static const int TEST_RANDOM_SEED = 1337;
+
+static CMap * initialMap;
+
+class CMapTestFixture
+{
+public:	
+	CMapTestFixture()
+	{
+		CMapGenOptions opt;
+		
+		opt.setHeight(72);
+		opt.setWidth(72);
+		opt.setHasTwoLevels(false);
+		opt.setPlayerCount(2);
+		
+		CMapGenerator gen;
+		
+		initialMap = gen.generate(&opt, TEST_RANDOM_SEED).release();
+	};
+	~CMapTestFixture()
+	{
+		delete initialMap;
+	};
+};
+
+BOOST_GLOBAL_FIXTURE(CMapTestFixture);
+
+BOOST_AUTO_TEST_CASE(CMapFormatVCMI_Simple)
+{
+	try
+	{
+
+		//TODO: serialize map
+		//TODO: deserialize map
+		//TODO: compare results
+		
+	}
+	catch(const std::exception & e)
+	{
+		logGlobal-> errorStream() << e.what();
+		throw;
+	}
+}

test/Test.cbp

@@ -10,6 +10,7 @@
 				<Option platforms="Windows;" />
 				<Option output="../Test" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/x86/" />
+				<Option working_dir="../." />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -57,6 +58,7 @@
 			<Add directory="../" />
 		</Linker>
 		<Unit filename="CMapEditManagerTest.cpp" />
+		<Unit filename="CMapFormatTest.cpp" />
 		<Unit filename="CVcmiTestConfig.cpp" />
 		<Unit filename="CVcmiTestConfig.h" />
 		<Unit filename="StdInc.cpp">