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

Conflicts:
	CMakeLists.txt
	gui/MainWindow.h

1 files changed, 24 insertions, 0 deletions

diff --git a/mmc_updater/src/tests/TestParseScript.cpp b/mmc_updater/src/tests/TestParseScript.cpp
new file mode 100644
index 00000000..f4453957
--- /dev/null
+++ b/mmc_updater/src/tests/TestParseScript.cpp
@@ -0,0 +1,24 @@
+#include "TestParseScript.h"
+
+#include "TestUtils.h"
+#include "UpdateScript.h"
+
+#include <iostream>
+#include <algorithm>
+
+void TestParseScript::testParse()
+{
+	UpdateScript script;
+
+	script.parse("file_list.xml");
+
+	TEST_COMPARE(script.isValid(),true);
+}
+
+int main(int,char**)
+{
+	TestList<TestParseScript> tests;
+	tests.addTest(&TestParseScript::testParse);
+	return TestUtils::runTest(tests);
+}
+