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

Conflicts:
	CMakeLists.txt

1 files changed, 31 insertions, 0 deletions

diff --git a/tests/TestUtil.h b/tests/TestUtil.h
new file mode 100644
index 00000000..64ee1675
--- /dev/null
+++ b/tests/TestUtil.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <QFile>
+#include <QCoreApplication>
+#include <QTest>
+#include <QDir>
+
+#include "MultiMC.h"
+
+struct TestsInternal
+{
+        static QByteArray readFile(const QString &fileName)
+        {
+                QFile f(fileName);
+                f.open(QFile::ReadOnly);
+                return f.readAll();
+        }
+};
+
+#define MULTIMC_GET_TEST_FILE(file) TestsInternal::readFile(QFINDTESTDATA( file ))
+
+#define QTEST_GUILESS_MAIN_MULTIMC(TestObject) \
+int main(int argc, char *argv[]) \
+{ \
+	char *argv_[] = { argv[0] }; \
+	int argc_ = 1; \
+	MultiMC app(argc_, argv_, QDir::temp().absoluteFilePath("MultiMC_Test")); \
+	app.setAttribute(Qt::AA_Use96Dpi, true); \
+	TestObject tc; \
+	return QTest::qExec(&tc, argc, argv); \
+}