Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

Conflicts:
	CMakeLists.txt
	gui/MainWindow.cpp

1 files changed, 27 insertions, 0 deletions

diff --git a/mmc_updater/src/tests/TestUpdateScript.cpp b/mmc_updater/src/tests/TestUpdateScript.cpp
new file mode 100644
index 00000000..30a7572a
--- /dev/null
+++ b/mmc_updater/src/tests/TestUpdateScript.cpp
@@ -0,0 +1,27 @@
+#include "TestUpdateScript.h"
+
+#include "TestUtils.h"
+#include "UpdateScript.h"
+
+#include <iostream>
+#include <algorithm>
+
+void TestUpdateScript::testV2Script()
+{
+	UpdateScript newFormat;
+	UpdateScript oldFormat;
+
+	newFormat.parse("file_list.xml");
+	oldFormat.parse("v2_file_list.xml");
+
+	TEST_COMPARE(newFormat.filesToInstall(),oldFormat.filesToInstall());
+	TEST_COMPARE(newFormat.filesToUninstall(),oldFormat.filesToUninstall());
+}
+
+int main(int,char**)
+{
+	TestList<TestUpdateScript> tests;
+	tests.addTest(&TestUpdateScript::testV2Script);
+	return TestUtils::runTest(tests);
+}
+