Merge branch 'develop' into better-launch

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>

23 files changed, 5097 insertions, 426 deletions

diff --git a/tests/DataPackParse_test.cpp b/tests/DataPackParse_test.cpp
index 61ce1e2b..cd6ae8e8 100644
--- a/tests/DataPackParse_test.cpp
+++ b/tests/DataPackParse_test.cpp
@@ -30,13 +30,13 @@
 class DataPackParseTest : public QObject {
     Q_OBJECT
 
-    private slots:
+   private slots:
     void test_parseZIP()
     {
         QString source = QFINDTESTDATA("testdata/DataPackParse");
 
         QString zip_dp = FS::PathCombine(source, "test_data_pack_boogaloo.zip");
-        DataPack pack { QFileInfo(zip_dp) };
+        DataPack pack{ QFileInfo(zip_dp) };
 
         bool valid = DataPackUtils::processZIP(pack);
 
@@ -50,7 +50,7 @@ class DataPackParseTest : public QObject {
         QString source = QFINDTESTDATA("testdata/DataPackParse");
 
         QString folder_dp = FS::PathCombine(source, "test_folder");
-        DataPack pack { QFileInfo(folder_dp) };
+        DataPack pack{ QFileInfo(folder_dp) };
 
         bool valid = DataPackUtils::processFolder(pack);
 
@@ -64,7 +64,7 @@ class DataPackParseTest : public QObject {
         QString source = QFINDTESTDATA("testdata/DataPackParse");
 
         QString folder_dp = FS::PathCombine(source, "another_test_folder");
-        DataPack pack { QFileInfo(folder_dp) };
+        DataPack pack{ QFileInfo(folder_dp) };
 
         bool valid = DataPackUtils::process(pack);
 
diff --git a/tests/DummyResourceAPI.h b/tests/DummyResourceAPI.h
index 0cc90958..35de9515 100644
--- a/tests/DummyResourceAPI.h
+++ b/tests/DummyResourceAPI.h
@@ -32,7 +32,7 @@ class DummyResourceAPI : public ResourceAPI {
     }
 
     DummyResourceAPI() : ResourceAPI() {}
-    [[nodiscard]] auto getSortingMethods() const -> QList<SortingMethod> override { return {}; };
+    [[nodiscard]] auto getSortingMethods() const -> QList<SortingMethod> override { return {}; }
 
     [[nodiscard]] Task::Ptr searchProjects(SearchArgs&&, SearchCallbacks&& callbacks) const override
     {
diff --git a/tests/FileSystem_test.cpp b/tests/FileSystem_test.cpp
index a41345c2..e1941042 100644
--- a/tests/FileSystem_test.cpp
+++ b/tests/FileSystem_test.cpp
@@ -1,7 +1,7 @@
-#include <QTest>
 #include <QDir>
-#include <QTemporaryDir>
 #include <QStandardPaths>
+#include <QTemporaryDir>
+#include <QTest>
 
 #include <tasks/Task.h>
 
@@ -11,16 +11,16 @@
 // Snippet from https://github.com/gulrak/filesystem#using-it-as-single-file-header
 
 #ifdef __APPLE__
-#include <Availability.h> // for deployment target to support pre-catalina targets without std::fs
-#endif // __APPLE__
+#include <Availability.h>  // for deployment target to support pre-catalina targets without std::fs
+#endif                     // __APPLE__
 
 #if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) || (defined(__cplusplus) && __cplusplus >= 201703L)) && defined(__has_include)
 #if __has_include(<filesystem>) && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)
 #define GHC_USE_STD_FS
 #include <filesystem>
 namespace fs = std::filesystem;
-#endif // MacOS min version check
-#endif // Other OSes version check
+#endif  // MacOS min version check
+#endif  // Other OSes version check
 
 #ifndef GHC_USE_STD_FS
 #include <ghc/filesystem.hpp>
@@ -29,8 +29,6 @@ namespace fs = ghc::filesystem;
 
 #include <pathmatcher/RegexpMatcher.h>
 
-
-
 class LinkTask : public Task {
     Q_OBJECT
 
@@ -42,41 +40,30 @@ class LinkTask : public Task {
         m_lnk->debug(true);
     }
 
-    ~LinkTask() {
-        delete m_lnk;
-    }
+    ~LinkTask() { delete m_lnk; }
 
-    void matcher(const IPathMatcher *filter)
-    {
-        m_lnk->matcher(filter);
-    }
+    void matcher(const IPathMatcher* filter) { m_lnk->matcher(filter); }
 
-    void linkRecursively(bool recursive) 
+    void linkRecursively(bool recursive)
     {
         m_lnk->linkRecursively(recursive);
         m_linkRecursive = recursive;
     }
 
-    void whitelist(bool b)
-    {
-        m_lnk->whitelist(b);
-    }
+    void whitelist(bool b) { m_lnk->whitelist(b); }
 
-    void setMaxDepth(int depth)
-    {
-        m_lnk->setMaxDepth(depth);
-    }
+    void setMaxDepth(int depth) { m_lnk->setMaxDepth(depth); }
 
    private:
     void executeTask() override
     {
-        if(!(*m_lnk)()){
+        if (!(*m_lnk)()) {
 #if defined Q_OS_WIN32
             if (!m_useHard) {
                 qDebug() << "EXPECTED: Link failure, Windows requires permissions for symlinks";
 
                 qDebug() << "atempting to run with privelage";
-                connect(m_lnk, &FS::create_link::finishedPrivileged, this, [&](bool gotResults){
+                connect(m_lnk, &FS::create_link::finishedPrivileged, this, [&](bool gotResults) {
                     if (gotResults) {
                         emitSucceeded();
                     } else {
@@ -87,32 +74,28 @@ class LinkTask : public Task {
                 m_lnk->runPrivileged();
             } else {
                 qDebug() << "Link Failed!" << m_lnk->getOSError().value() << m_lnk->getOSError().message().c_str();
-            }      
+            }
 #else
             qDebug() << "Link Failed!" << m_lnk->getOSError().value() << m_lnk->getOSError().message().c_str();
 #endif
         } else {
             emitSucceeded();
         }
-        
-    };
+    }
 
-    FS::create_link *m_lnk;
-    bool m_useHard = false;
+    FS::create_link* m_lnk;
+    [[maybe_unused]] bool m_useHard = false;
     bool m_linkRecursive = true;
 };
 
-
-class FileSystemTest : public QObject
-{
+class FileSystemTest : public QObject {
     Q_OBJECT
 
     const QString bothSlash = "/foo/";
     const QString trailingSlash = "foo/";
     const QString leadingSlash = "/foo";
 
-private
-slots:
+   private slots:
     void test_pathCombine()
     {
         QCOMPARE(QString("/foo/foo"), FS::PathCombine(bothSlash, bothSlash));
@@ -130,12 +113,22 @@ slots:
         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";
+        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
     }
 
@@ -155,15 +148,39 @@ slots:
         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";
+        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
     }
 
@@ -180,8 +197,7 @@ slots:
     void test_copy()
     {
         QString folder = QFINDTESTDATA("testdata/FileSystem/test_folder");
-        auto f = [&folder]()
-        {
+        auto f = [&folder]() {
             QTemporaryDir tempDir;
             tempDir.setAutoRemove(true);
             qDebug() << "From:" << folder << "To:" << tempDir.path();
@@ -192,8 +208,7 @@ slots:
             FS::copy c(folder, target_dir.path());
             c();
 
-            for(auto entry: target_dir.entryList())
-            {
+            for (auto entry : target_dir.entryList()) {
                 qDebug() << entry;
             }
             QVERIFY(target_dir.entryList().contains("pack.mcmeta"));
@@ -213,8 +228,7 @@ slots:
     void test_copy_with_blacklist()
     {
         QString folder = QFINDTESTDATA("testdata/FileSystem/test_folder");
-        auto f = [&folder]()
-        {
+        auto f = [&folder]() {
             QTemporaryDir tempDir;
             tempDir.setAutoRemove(true);
             qDebug() << "From:" << folder << "To:" << tempDir.path();
@@ -227,8 +241,7 @@ slots:
             c.matcher(&re);
             c();
 
-            for(auto entry: target_dir.entryList())
-            {
+            for (auto entry : target_dir.entryList()) {
                 qDebug() << entry;
             }
             QVERIFY(!target_dir.entryList().contains("pack.mcmeta"));
@@ -248,8 +261,7 @@ slots:
     void test_copy_with_whitelist()
     {
         QString folder = QFINDTESTDATA("testdata/FileSystem/test_folder");
-        auto f = [&folder]()
-        {
+        auto f = [&folder]() {
             QTemporaryDir tempDir;
             tempDir.setAutoRemove(true);
             qDebug() << "From:" << folder << "To:" << tempDir.path();
@@ -263,8 +275,7 @@ slots:
             c.whitelist(true);
             c();
 
-            for(auto entry: target_dir.entryList())
-            {
+            for (auto entry : target_dir.entryList()) {
                 qDebug() << entry;
             }
             QVERIFY(target_dir.entryList().contains("pack.mcmeta"));
@@ -284,8 +295,7 @@ slots:
     void test_copy_with_dot_hidden()
     {
         QString folder = QFINDTESTDATA("testdata/FileSystem/test_folder");
-        auto f = [&folder]()
-        {
+        auto f = [&folder]() {
             QTemporaryDir tempDir;
             tempDir.setAutoRemove(true);
             qDebug() << "From:" << folder << "To:" << tempDir.path();
@@ -298,7 +308,7 @@ slots:
 
             auto filter = QDir::Filter::Files | QDir::Filter::Dirs | QDir::Filter::Hidden;
 
-            for (auto entry: target_dir.entryList(filter)) {
+            for (auto entry : target_dir.entryList(filter)) {
                 qDebug() << entry;
             }
 
@@ -335,7 +345,7 @@ slots:
 
             auto filter = QDir::Filter::Files;
 
-            for (auto entry: target_dir.entryList(filter)) {
+            for (auto entry : target_dir.entryList(filter)) {
                 qDebug() << entry;
             }
 
@@ -348,12 +358,10 @@ slots:
         QCOMPARE(FS::getDesktopDir(), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation));
     }
 
-
     void test_link()
     {
         QString folder = QFINDTESTDATA("testdata/FileSystem/test_folder");
-        auto f = [&folder, this]()
-        {
+        auto f = [&folder]() {
             QTemporaryDir tempDir;
             tempDir.setAutoRemove(true);
             qDebug() << "From:" << folder << "To:" << tempDir.path();
@@ -364,17 +372,13 @@ slots:
 
             LinkTask lnk_tsk(folder, target_dir.path());
             lnk_tsk.linkRecursively(false);
-            QObject::connect(&lnk_tsk, &Task::finished, [&]{ 
-                QVERIFY2(lnk_tsk.wasSuccessful(), "Task finished but was not successful when it should have been."); 
-            });
+            QObject::connect(&lnk_tsk, &Task::finished,
+                             [&] { QVERIFY2(lnk_tsk.wasSuccessful(), "Task finished but was not successful when it should have been."); });
             lnk_tsk.start();
 
-            QVERIFY2(QTest::qWaitFor([&]() {
-                return lnk_tsk.isFinished();
-            }, 100000), "Task didn't finish as it should.");
+            QVERIFY2(QTest::qWaitFor([&]() { return lnk_tsk.isFinished(); }, 100000), "Task didn't finish as it should.");
 
-            for(auto entry: target_dir.entryList())
-            {
+            for (auto entry : target_dir.entryList()) {
                 qDebug() << entry;
                 QFileInfo entry_lnk_info(target_dir.filePath(entry));
                 if (!entry_lnk_info.isDir())
@@ -402,10 +406,9 @@ slots:
     void test_hard_link()
     {
         QString folder = QFINDTESTDATA("testdata/FileSystem/test_folder");
-        auto f = [&folder]()
-        {   
+        auto f = [&folder]() {
             // use working dir to prevent makeing a hard link to a tmpfs or across devices
-            QTemporaryDir tempDir("./tmp"); 
+            QTemporaryDir tempDir("./tmp");
             tempDir.setAutoRemove(true);
             qDebug() << "From:" << folder << "To:" << tempDir.path();
 
@@ -415,23 +418,20 @@ slots:
             FS::create_link lnk(folder, target_dir.path());
             lnk.useHardLinks(true);
             lnk.debug(true);
-            if(!lnk()){
+            if (!lnk()) {
                 qDebug() << "Link Failed!" << lnk.getOSError().value() << lnk.getOSError().message().c_str();
             }
 
-            for(auto entry: target_dir.entryList())
-            {
+            for (auto entry : target_dir.entryList()) {
                 qDebug() << entry;
                 QFileInfo entry_lnk_info(target_dir.filePath(entry));
                 QVERIFY(!entry_lnk_info.isSymLink());
                 QFileInfo entry_orig_info(QDir(folder).filePath(entry));
                 if (!entry_lnk_info.isDir()) {
                     qDebug() << "hard link equivalency?" << entry_lnk_info.absoluteFilePath() << "vs" << entry_orig_info.absoluteFilePath();
-                    QVERIFY(fs::equivalent(
-                        fs::path(StringUtils::toStdString(entry_lnk_info.absoluteFilePath())),
-                        fs::path(StringUtils::toStdString(entry_orig_info.absoluteFilePath()))
-                    ));
-                } 
+                    QVERIFY(fs::equivalent(fs::path(StringUtils::toStdString(entry_lnk_info.absoluteFilePath())),
+                                           fs::path(StringUtils::toStdString(entry_orig_info.absoluteFilePath()))));
+                }
             }
 
             QFileInfo lnk_info(target_dir.path());
@@ -455,8 +455,7 @@ slots:
     void test_link_with_blacklist()
     {
         QString folder = QFINDTESTDATA("testdata/FileSystem/test_folder");
-        auto f = [&folder]()
-        {
+        auto f = [&folder]() {
             QTemporaryDir tempDir;
             tempDir.setAutoRemove(true);
             qDebug() << "From:" << folder << "To:" << tempDir.path();
@@ -469,18 +468,13 @@ slots:
             RegexpMatcher re("[.]?mcmeta");
             lnk_tsk.matcher(&re);
             lnk_tsk.linkRecursively(true);
-            QObject::connect(&lnk_tsk, &Task::finished, [&]{ 
-                QVERIFY2(lnk_tsk.wasSuccessful(), "Task finished but was not successful when it should have been."); 
-            });
+            QObject::connect(&lnk_tsk, &Task::finished,
+                             [&] { QVERIFY2(lnk_tsk.wasSuccessful(), "Task finished but was not successful when it should have been."); });
             lnk_tsk.start();
 
-            QVERIFY2(QTest::qWaitFor([&]() {
-                return lnk_tsk.isFinished();
-            }, 100000), "Task didn't finish as it should.");
-
+            QVERIFY2(QTest::qWaitFor([&]() { return lnk_tsk.isFinished(); }, 100000), "Task didn't finish as it should.");
 
-            for(auto entry: target_dir.entryList())
-            {
+            for (auto entry : target_dir.entryList()) {
                 qDebug() << entry;
                 QFileInfo entry_lnk_info(target_dir.filePath(entry));
                 if (!entry_lnk_info.isDir())
@@ -507,8 +501,7 @@ slots:
     void test_link_with_whitelist()
     {
         QString folder = QFINDTESTDATA("testdata/FileSystem/test_folder");
-        auto f = [&folder]()
-        {
+        auto f = [&folder]() {
             QTemporaryDir tempDir;
             tempDir.setAutoRemove(true);
             qDebug() << "From:" << folder << "To:" << tempDir.path();
@@ -522,17 +515,13 @@ slots:
             lnk_tsk.matcher(&re);
             lnk_tsk.linkRecursively(true);
             lnk_tsk.whitelist(true);
-            QObject::connect(&lnk_tsk, &Task::finished, [&]{ 
-                QVERIFY2(lnk_tsk.wasSuccessful(), "Task finished but was not successful when it should have been."); 
-            });
+            QObject::connect(&lnk_tsk, &Task::finished,
+                             [&] { QVERIFY2(lnk_tsk.wasSuccessful(), "Task finished but was not successful when it should have been."); });
             lnk_tsk.start();
 
-            QVERIFY2(QTest::qWaitFor([&]() {
-                return lnk_tsk.isFinished();
-            }, 100000), "Task didn't finish as it should.");
+            QVERIFY2(QTest::qWaitFor([&]() { return lnk_tsk.isFinished(); }, 100000), "Task didn't finish as it should.");
 
-            for(auto entry: target_dir.entryList())
-            {
+            for (auto entry : target_dir.entryList()) {
                 qDebug() << entry;
                 QFileInfo entry_lnk_info(target_dir.filePath(entry));
                 if (!entry_lnk_info.isDir())
@@ -559,8 +548,7 @@ slots:
     void test_link_with_dot_hidden()
     {
         QString folder = QFINDTESTDATA("testdata/FileSystem/test_folder");
-        auto f = [&folder]()
-        {
+        auto f = [&folder]() {
             QTemporaryDir tempDir;
             tempDir.setAutoRemove(true);
             qDebug() << "From:" << folder << "To:" << tempDir.path();
@@ -571,18 +559,15 @@ slots:
 
             LinkTask lnk_tsk(folder, target_dir.path());
             lnk_tsk.linkRecursively(true);
-            QObject::connect(&lnk_tsk, &Task::finished, [&]{ 
-                QVERIFY2(lnk_tsk.wasSuccessful(), "Task finished but was not successful when it should have been."); 
-            });
+            QObject::connect(&lnk_tsk, &Task::finished,
+                             [&] { QVERIFY2(lnk_tsk.wasSuccessful(), "Task finished but was not successful when it should have been."); });
             lnk_tsk.start();
 
-            QVERIFY2(QTest::qWaitFor([&]() {
-                return lnk_tsk.isFinished();
-            }, 100000), "Task didn't finish as it should.");
+            QVERIFY2(QTest::qWaitFor([&]() { return lnk_tsk.isFinished(); }, 100000), "Task didn't finish as it should.");
 
             auto filter = QDir::Filter::Files | QDir::Filter::Dirs | QDir::Filter::Hidden;
 
-            for (auto entry: target_dir.entryList(filter)) {
+            for (auto entry : target_dir.entryList(filter)) {
                 qDebug() << entry;
                 QFileInfo entry_lnk_info(target_dir.filePath(entry));
                 if (!entry_lnk_info.isDir())
@@ -621,19 +606,16 @@ slots:
             qDebug() << tempDir.path();
             qDebug() << target_dir.path();
 
-            LinkTask lnk_tsk(file,  target_dir.filePath("pack.mcmeta"));
-            QObject::connect(&lnk_tsk, &Task::finished, [&]{ 
-                QVERIFY2(lnk_tsk.wasSuccessful(), "Task finished but was not successful when it should have been."); 
-            });
+            LinkTask lnk_tsk(file, target_dir.filePath("pack.mcmeta"));
+            QObject::connect(&lnk_tsk, &Task::finished,
+                             [&] { QVERIFY2(lnk_tsk.wasSuccessful(), "Task finished but was not successful when it should have been."); });
             lnk_tsk.start();
 
-            QVERIFY2(QTest::qWaitFor([&]() {
-                return lnk_tsk.isFinished();
-            }, 100000), "Task didn't finish as it should.");
+            QVERIFY2(QTest::qWaitFor([&]() { return lnk_tsk.isFinished(); }, 100000), "Task didn't finish as it should.");
 
             auto filter = QDir::Filter::Files;
 
-            for (auto entry: target_dir.entryList(filter)) {
+            for (auto entry : target_dir.entryList(filter)) {
                 qDebug() << entry;
             }
 
@@ -648,8 +630,7 @@ slots:
     void test_link_with_max_depth()
     {
         QString folder = QFINDTESTDATA("testdata/FileSystem/test_folder");
-        auto f = [&folder, this]()
-        {
+        auto f = [&folder]() {
             QTemporaryDir tempDir;
             tempDir.setAutoRemove(true);
             qDebug() << "From:" << folder << "To:" << tempDir.path();
@@ -661,22 +642,19 @@ slots:
             LinkTask lnk_tsk(folder, target_dir.path());
             lnk_tsk.linkRecursively(true);
             lnk_tsk.setMaxDepth(0);
-            QObject::connect(&lnk_tsk, &Task::finished, [&]{ 
-                QVERIFY2(lnk_tsk.wasSuccessful(), "Task finished but was not successful when it should have been."); 
-            });
+            QObject::connect(&lnk_tsk, &Task::finished,
+                             [&] { QVERIFY2(lnk_tsk.wasSuccessful(), "Task finished but was not successful when it should have been."); });
             lnk_tsk.start();
 
-            QVERIFY2(QTest::qWaitFor([&]() {
-                return lnk_tsk.isFinished();
-            }, 100000), "Task didn't finish as it should.");
+            QVERIFY2(QTest::qWaitFor([&]() { return lnk_tsk.isFinished(); }, 100000), "Task didn't finish as it should.");
 
             QVERIFY(!QFileInfo(target_dir.path()).isSymLink());
 
             auto filter = QDir::Filter::Files | QDir::Filter::Dirs | QDir::Filter::Hidden;
-            for(auto entry: target_dir.entryList(filter))
-            {
+            for (auto entry : target_dir.entryList(filter)) {
                 qDebug() << entry;
-                if (entry == "." || entry == "..") continue;
+                if (entry == "." || entry == "..")
+                    continue;
                 QFileInfo entry_lnk_info(target_dir.filePath(entry));
                 QVERIFY(entry_lnk_info.isSymLink());
             }
@@ -687,8 +665,6 @@ slots:
 
             QVERIFY(target_dir.entryList().contains("pack.mcmeta"));
             QVERIFY(target_dir.entryList().contains("assets"));
-
-
         };
 
         // first try variant without trailing /
@@ -704,8 +680,7 @@ slots:
     void test_link_with_no_max_depth()
     {
         QString folder = QFINDTESTDATA("testdata/FileSystem/test_folder");
-        auto f = [&folder]()
-        {
+        auto f = [&folder]() {
             QTemporaryDir tempDir;
             tempDir.setAutoRemove(true);
             qDebug() << "From:" << folder << "To:" << tempDir.path();
@@ -717,24 +692,19 @@ slots:
             LinkTask lnk_tsk(folder, target_dir.path());
             lnk_tsk.linkRecursively(true);
             lnk_tsk.setMaxDepth(-1);
-            QObject::connect(&lnk_tsk, &Task::finished, [&]{ 
-                QVERIFY2(lnk_tsk.wasSuccessful(), "Task finished but was not successful when it should have been."); 
-            });
+            QObject::connect(&lnk_tsk, &Task::finished,
+                             [&] { QVERIFY2(lnk_tsk.wasSuccessful(), "Task finished but was not successful when it should have been."); });
             lnk_tsk.start();
 
-            QVERIFY2(QTest::qWaitFor([&]() {
-                return lnk_tsk.isFinished();
-            }, 100000), "Task didn't finish as it should.");
-
+            QVERIFY2(QTest::qWaitFor([&]() { return lnk_tsk.isFinished(); }, 100000), "Task didn't finish as it should.");
 
             std::function<void(QString)> verify_check = [&](QString check_path) {
                 QDir check_dir(check_path);
                 auto filter = QDir::Filter::Files | QDir::Filter::Dirs | QDir::Filter::Hidden;
-                for(auto entry: check_dir.entryList(filter))
-                {
+                for (auto entry : check_dir.entryList(filter)) {
                     QFileInfo entry_lnk_info(check_dir.filePath(entry));
                     qDebug() << entry << check_dir.filePath(entry);
-                    if (!entry_lnk_info.isDir()){
+                    if (!entry_lnk_info.isDir()) {
                         QVERIFY(entry_lnk_info.isSymLink());
                     } else if (entry != "." && entry != "..") {
                         qDebug() << "Decending tree to verify symlinks:" << check_dir.filePath(entry);
@@ -742,9 +712,8 @@ slots:
                     }
                 }
             };
-            
+
             verify_check(target_dir.path());
-            
 
             QFileInfo lnk_info(target_dir.path());
             QVERIFY(lnk_info.exists());
@@ -763,7 +732,8 @@ slots:
         f();
     }
 
-    void test_path_depth() {
+    void test_path_depth()
+    {
         QCOMPARE(FS::pathDepth(""), 0);
         QCOMPARE(FS::pathDepth("."), 0);
         QCOMPARE(FS::pathDepth("foo.txt"), 0);
@@ -777,7 +747,8 @@ slots:
         QCOMPARE(FS::pathDepth("/baz/../bar/foo.txt"), 1);
     }
 
-    void test_path_trunc() {
+    void test_path_trunc()
+    {
         QCOMPARE(FS::pathTruncate("", 0), QDir::toNativeSeparators(""));
         QCOMPARE(FS::pathTruncate("foo.txt", 0), QDir::toNativeSeparators(""));
         QCOMPARE(FS::pathTruncate("foo.txt", 1), QDir::toNativeSeparators(""));
diff --git a/tests/GZip_test.cpp b/tests/GZip_test.cpp
index 82503d81..c11ba271 100644
--- a/tests/GZip_test.cpp
+++ b/tests/GZip_test.cpp
@@ -3,18 +3,16 @@
 #include <GZip.h>
 #include <random>
 
-void fib(int &prev, int &cur)
+void fib(int& prev, int& cur)
 {
     auto ret = prev + cur;
     prev = cur;
     cur = ret;
 }
 
-class GZipTest : public QObject
-{
+class GZipTest : public QObject {
     Q_OBJECT
-private
-slots:
+   private slots:
 
     void test_Through()
     {
@@ -27,9 +25,8 @@ slots:
         std::uniform_int_distribution<uint16_t> idis(0, std::numeric_limits<uint8_t>::max());
 
         // initialize random buffer
-        for(int i = 0; i < size; i++)
-        {
-            random.append((char)idis(eng));
+        for (int i = 0; i < size; i++) {
+            random.append(static_cast<char>(idis(eng)));
         }
 
         // initialize fibonacci
@@ -37,8 +34,7 @@ slots:
         int cur = 1;
 
         // test if fibonacci long random buffers pass through GZip
-        do
-        {
+        do {
             QByteArray copy = random;
             copy.resize(cur);
             compressed.clear();
diff --git a/tests/GradleSpecifier_test.cpp b/tests/GradleSpecifier_test.cpp
index 850f8388..fa3c4ad9 100644
--- a/tests/GradleSpecifier_test.cpp
+++ b/tests/GradleSpecifier_test.cpp
@@ -2,19 +2,11 @@
 
 #include <minecraft/GradleSpecifier.h>
 
-class GradleSpecifierTest : public QObject
-{
+class GradleSpecifierTest : public QObject {
     Q_OBJECT
-private
-slots:
-    void initTestCase()
-    {
-
-    }
-    void cleanupTestCase()
-    {
-
-    }
+   private slots:
+    void initTestCase() {}
+    void cleanupTestCase() {}
 
     void test_Positive_data()
     {
@@ -40,8 +32,10 @@ slots:
         QTest::addColumn<QString>("spec");
         QTest::addColumn<QString>("expected");
 
-        QTest::newRow("3 parter") << "group.id:artifact:1.0" << "group/id/artifact/1.0/artifact-1.0.jar";
-        QTest::newRow("doom") << "id.software:doom:1.666:demons@wad" << "id/software/doom/1.666/doom-1.666-demons.wad";
+        QTest::newRow("3 parter") << "group.id:artifact:1.0"
+                                  << "group/id/artifact/1.0/artifact-1.0.jar";
+        QTest::newRow("doom") << "id.software:doom:1.666:demons@wad"
+                              << "id/software/doom/1.666/doom-1.666-demons.wad";</