merged from 0.6.7 codebase

1 files changed, 137 insertions, 137 deletions

diff --git a/api/logic/FileSystem_test.cpp b/api/logic/FileSystem_test.cpp
index d5e1eedb..df653ea1 100644
--- a/api/logic/FileSystem_test.cpp
+++ b/api/logic/FileSystem_test.cpp
@@ -7,155 +7,155 @@
 
 class FileSystemTest : public QObject
 {
-	Q_OBJECT
+    Q_OBJECT
 
-	const QString bothSlash = "/foo/";
-	const QString trailingSlash = "foo/";
-	const QString leadingSlash = "/foo";
+    const QString bothSlash = "/foo/";
+    const QString trailingSlash = "foo/";
+    const QString leadingSlash = "/foo";
 
 private
 slots:
-	void test_pathCombine()
-	{
-		QCOMPARE(QString("/foo/foo"), FS::PathCombine(bothSlash, bothSlash));
-		QCOMPARE(QString("foo/foo"), FS::PathCombine(trailingSlash, trailingSlash));
-		QCOMPARE(QString("/foo/foo"), FS::PathCombine(leadingSlash, leadingSlash));
-
-		QCOMPARE(QString("/foo/foo/foo"), FS::PathCombine(bothSlash, bothSlash, bothSlash));
-		QCOMPARE(QString("foo/foo/foo"), FS::PathCombine(trailingSlash, trailingSlash, trailingSlash));
-		QCOMPARE(QString("/foo/foo/foo"), FS::PathCombine(leadingSlash, leadingSlash, leadingSlash));
-	}
-
-	void test_PathCombine1_data()
-	{
-		QTest::addColumn<QString>("result");
-		QTest::addColumn<QString>("path1");
-		QTest::addColumn<QString>("path2");
-
-		QTest::newRow("qt 1") << "/abc/def/ghi/jkl" << "/abc/def" << "ghi/jkl";
-		QTest::newRow("qt 2") << "/abc/def/ghi/jkl" << "/abc/def/" << "ghi/jkl";
+    void test_pathCombine()
+    {
+        QCOMPARE(QString("/foo/foo"), FS::PathCombine(bothSlash, bothSlash));
+        QCOMPARE(QString("foo/foo"), FS::PathCombine(trailingSlash, trailingSlash));
+        QCOMPARE(QString("/foo/foo"), FS::PathCombine(leadingSlash, leadingSlash));
+
+        QCOMPARE(QString("/foo/foo/foo"), FS::PathCombine(bothSlash, bothSlash, bothSlash));
+        QCOMPARE(QString("foo/foo/foo"), FS::PathCombine(trailingSlash, trailingSlash, trailingSlash));
+        QCOMPARE(QString("/foo/foo/foo"), FS::PathCombine(leadingSlash, leadingSlash, leadingSlash));
+    }
+
+    void test_PathCombine1_data()
+    {
+        QTest::addColumn<QString>("result");
+        QTest::addColumn<QString>("path1");
+        QTest::addColumn<QString>("path2");
+
+        QTest::newRow("qt 1") << "/abc/def/ghi/jkl" << "/abc/def" << "ghi/jkl";
+        QTest::newRow("qt 2") << "/abc/def/ghi/jkl" << "/abc/def/" << "ghi/jkl";
 #if defined(Q_OS_WIN)
-		QTest::newRow("win native, from C:") << "C:/abc" << "C:" << "abc";
-		QTest::newRow("win native 1") << "C:/abc/def/ghi/jkl" << "C:\\abc\\def" << "ghi\\jkl";
-		QTest::newRow("win native 2") << "C:/abc/def/ghi/jkl" << "C:\\abc\\def\\" << "ghi\\jkl";
+        QTest::newRow("win native, from C:") << "C:/abc" << "C:" << "abc";
+        QTest::newRow("win native 1") << "C:/abc/def/ghi/jkl" << "C:\\abc\\def" << "ghi\\jkl";
+        QTest::newRow("win native 2") << "C:/abc/def/ghi/jkl" << "C:\\abc\\def\\" << "ghi\\jkl";
 #endif
-	}
-
-	void test_PathCombine1()
-	{
-		QFETCH(QString, result);
-		QFETCH(QString, path1);
-		QFETCH(QString, path2);
-
-		QCOMPARE(FS::PathCombine(path1, path2), result);
-	}
-
-	void test_PathCombine2_data()
-	{
-		QTest::addColumn<QString>("result");
-		QTest::addColumn<QString>("path1");
-		QTest::addColumn<QString>("path2");
-		QTest::addColumn<QString>("path3");
-
-		QTest::newRow("qt 1") << "/abc/def/ghi/jkl" << "/abc" << "def" << "ghi/jkl";
-		QTest::newRow("qt 2") << "/abc/def/ghi/jkl" << "/abc/" << "def" << "ghi/jkl";
-		QTest::newRow("qt 3") << "/abc/def/ghi/jkl" << "/abc" << "def/" << "ghi/jkl";
-		QTest::newRow("qt 4") << "/abc/def/ghi/jkl" << "/abc/" << "def/" << "ghi/jkl";
+    }
+
+    void test_PathCombine1()
+    {
+        QFETCH(QString, result);
+        QFETCH(QString, path1);
+        QFETCH(QString, path2);
+
+        QCOMPARE(FS::PathCombine(path1, path2), result);
+    }
+
+    void test_PathCombine2_data()
+    {
+        QTest::addColumn<QString>("result");
+        QTest::addColumn<QString>("path1");
+        QTest::addColumn<QString>("path2");
+        QTest::addColumn<QString>("path3");
+
+        QTest::newRow("qt 1") << "/abc/def/ghi/jkl" << "/abc" << "def" << "ghi/jkl";
+        QTest::newRow("qt 2") << "/abc/def/ghi/jkl" << "/abc/" << "def" << "ghi/jkl";
+        QTest::newRow("qt 3") << "/abc/def/ghi/jkl" << "/abc" << "def/" << "ghi/jkl";
+        QTest::newRow("qt 4") << "/abc/def/ghi/jkl" << "/abc/" << "def/" << "ghi/jkl";
 #if defined(Q_OS_WIN)
-		QTest::newRow("win 1") << "C:/abc/def/ghi/jkl" << "C:\\abc" << "def" << "ghi\\jkl";
-		QTest::newRow("win 2") << "C:/abc/def/ghi/jkl" << "C:\\abc\\" << "def" << "ghi\\jkl";
-		QTest::newRow("win 3") << "C:/abc/def/ghi/jkl" << "C:\\abc" << "def\\" << "ghi\\jkl";
-		QTest::newRow("win 4") << "C:/abc/def/ghi/jkl" << "C:\\abc\\" << "def" << "ghi\\jkl";
+        QTest::newRow("win 1") << "C:/abc/def/ghi/jkl" << "C:\\abc" << "def" << "ghi\\jkl";
+        QTest::newRow("win 2") << "C:/abc/def/ghi/jkl" << "C:\\abc\\" << "def" << "ghi\\jkl";
+        QTest::newRow("win 3") << "C:/abc/def/ghi/jkl" << "C:\\abc" << "def\\" << "ghi\\jkl";
+        QTest::newRow("win 4") << "C:/abc/def/ghi/jkl" << "C:\\abc\\" << "def" << "ghi\\jkl";
 #endif
-	}
-
-	void test_PathCombine2()
-	{
-		QFETCH(QString, result);
-		QFETCH(QString, path1);
-		QFETCH(QString, path2);
-		QFETCH(QString, path3);
-
-		QCOMPARE(FS::PathCombine(path1, path2, path3), result);
-	}
-
-	void test_copy()
-	{
-		QString folder = QFINDTESTDATA("data/test_folder");
-		auto f = [&folder]()
-		{
-			QTemporaryDir tempDir;
-			tempDir.setAutoRemove(true);
-			qDebug() << "From:" << folder << "To:" << tempDir.path();
-
-			QDir target_dir(FS::PathCombine(tempDir.path(), "test_folder"));
-			qDebug() << tempDir.path();
-			qDebug() << target_dir.path();
-			FS::copy c(folder, target_dir.path());
-			c();
-
-			for(auto entry: target_dir.entryList())
-			{
-				qDebug() << entry;
-			}
-			QVERIFY(target_dir.entryList().contains("pack.mcmeta"));
-			QVERIFY(target_dir.entryList().contains("assets"));
-		};
-
-		// first try variant without trailing /
-		QVERIFY(!folder.endsWith('/'));
-		f();
-
-		// then variant with trailing /
-		folder.append('/');
-		QVERIFY(folder.endsWith('/'));
-		f();
-	}
-
-	void test_getDesktop()
-	{
-		QCOMPARE(FS::getDesktopDir(), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation));
-	}
+    }
+
+    void test_PathCombine2()
+    {
+        QFETCH(QString, result);
+        QFETCH(QString, path1);
+        QFETCH(QString, path2);
+        QFETCH(QString, path3);
+
+        QCOMPARE(FS::PathCombine(path1, path2, path3), result);
+    }
+
+    void test_copy()
+    {
+        QString folder = QFINDTESTDATA("data/test_folder");
+        auto f = [&folder]()
+        {
+            QTemporaryDir tempDir;
+            tempDir.setAutoRemove(true);
+            qDebug() << "From:" << folder << "To:" << tempDir.path();
+
+            QDir target_dir(FS::PathCombine(tempDir.path(), "test_folder"));
+            qDebug() << tempDir.path();
+            qDebug() << target_dir.path();
+            FS::copy c(folder, target_dir.path());
+            c();
+
+            for(auto entry: target_dir.entryList())
+            {
+                qDebug() << entry;
+            }
+            QVERIFY(target_dir.entryList().contains("pack.mcmeta"));
+            QVERIFY(target_dir.entryList().contains("assets"));
+        };
+
+        // first try variant without trailing /
+        QVERIFY(!folder.endsWith('/'));
+        f();
+
+        // then variant with trailing /
+        folder.append('/');
+        QVERIFY(folder.endsWith('/'));
+        f();
+    }
+
+    void test_getDesktop()
+    {
+        QCOMPARE(FS::getDesktopDir(), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation));
+    }
 
 // this is only valid on linux
 // FIXME: implement on windows, OSX, then test.
 #if defined(Q_OS_LINUX)
-	void test_createShortcut_data()
-	{
-		QTest::addColumn<QString>("location");
-		QTest::addColumn<QString>("dest");
-		QTest::addColumn<QStringList>("args");
-		QTest::addColumn<QString>("name");
-		QTest::addColumn<QString>("iconLocation");
-		QTest::addColumn<QByteArray>("result");
-
-		QTest::newRow("unix") << QDir::currentPath()
-							  << "asdfDest"
-							  << (QStringList() << "arg1" << "arg2")
-							  << "asdf"
-							  << QString()
-						 #if defined(Q_OS_LINUX)
-							  << MULTIMC_GET_TEST_FILE("data/FileSystem-test_createShortcut-unix")
-						 #elif defined(Q_OS_WIN)
-							  << QByteArray()
-						 #endif
-								 ;
-	}
-
-	void test_createShortcut()
-	{
-		QFETCH(QString, location);
-		QFETCH(QString, dest);
-		QFETCH(QStringList, args);
-		QFETCH(QString, name);
-		QFETCH(QString, iconLocation);
-		QFETCH(QByteArray, result);
-
-		QVERIFY(FS::createShortCut(location, dest, args, name, iconLocation));
-		QCOMPARE(QString::fromLocal8Bit(TestsInternal::readFile(location + QDir::separator() + name + ".desktop")), QString::fromLocal8Bit(result));
-
-		//QDir().remove(location);
-	}
+    void test_createShortcut_data()
+    {
+        QTest::addColumn<QString>("location");
+        QTest::addColumn<QString>("dest");
+        QTest::addColumn<QStringList>("args");
+        QTest::addColumn<QString>("name");
+        QTest::addColumn<QString>("iconLocation");
+        QTest::addColumn<QByteArray>("result");
+
+        QTest::newRow("unix") << QDir::currentPath()
+                              << "asdfDest"
+                              << (QStringList() << "arg1" << "arg2")
+                              << "asdf"
+                              << QString()
+                         #if defined(Q_OS_LINUX)
+                              << MULTIMC_GET_TEST_FILE("data/FileSystem-test_createShortcut-unix")
+                         #elif defined(Q_OS_WIN)
+                              << QByteArray()
+                         #endif
+                                 ;
+    }
+
+    void test_createShortcut()
+    {
+        QFETCH(QString, location);
+        QFETCH(QString, dest);
+        QFETCH(QStringList, args);
+        QFETCH(QString, name);
+        QFETCH(QString, iconLocation);
+        QFETCH(QByteArray, result);
+
+        QVERIFY(FS::createShortCut(location, dest, args, name, iconLocation));
+        QCOMPARE(QString::fromLocal8Bit(TestsInternal::readFile(location + QDir::separator() + name + ".desktop")), QString::fromLocal8Bit(result));
+
+        //QDir().remove(location);
+    }
 #endif
 };