From f3cae427f197c614cc05ad55084edc32051093bd Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Mon, 28 Oct 2024 21:09:45 +0000
Subject: [PATCH] Fix tests (make them green)

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/minecraft/mod/ModFolderModel.h |  1 -
 tests/ResourceFolderModel_test.cpp      | 16 ++++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/launcher/minecraft/mod/ModFolderModel.h b/launcher/minecraft/mod/ModFolderModel.h
index 629a2621c..c9a5fc226 100644
--- a/launcher/minecraft/mod/ModFolderModel.h
+++ b/launcher/minecraft/mod/ModFolderModel.h
@@ -75,7 +75,6 @@ class ModFolderModel : public ResourceFolderModel {
         ReleaseTypeColumn,
         NUM_COLUMNS
     };
-    enum ModStatusAction { Disable, Enable, Toggle };
     ModFolderModel(const QDir& dir, BaseInstance* instance, bool is_indexed, bool create_dir, QObject* parent = nullptr);
 
     virtual QString id() const override { return "mods"; }
diff --git a/tests/ResourceFolderModel_test.cpp b/tests/ResourceFolderModel_test.cpp
index 350ab615e..f2201a5e9 100644
--- a/tests/ResourceFolderModel_test.cpp
+++ b/tests/ResourceFolderModel_test.cpp
@@ -87,7 +87,7 @@ class ResourceFolderModelTest : public QObject {
 
             QEventLoop loop;
 
-            ModFolderModel m(tempDir.path(), nullptr, true);
+            ModFolderModel m(tempDir.path(), nullptr, true, true);
 
             connect(&m, &ModFolderModel::updateFinished, &loop, &QEventLoop::quit);
 
@@ -96,7 +96,7 @@ class ResourceFolderModelTest : public QObject {
             expire_timer.setSingleShot(true);
             expire_timer.start(4000);
 
-            m.installMod(folder);
+            m.installResource(folder);
 
             loop.exec();
 
@@ -111,7 +111,7 @@ class ResourceFolderModelTest : public QObject {
             QString folder = source + '/';
             QTemporaryDir tempDir;
             QEventLoop loop;
-            ModFolderModel m(tempDir.path(), nullptr, true);
+            ModFolderModel m(tempDir.path(), nullptr, true, true);
 
             connect(&m, &ModFolderModel::updateFinished, &loop, &QEventLoop::quit);
 
@@ -120,7 +120,7 @@ class ResourceFolderModelTest : public QObject {
             expire_timer.setSingleShot(true);
             expire_timer.start(4000);
 
-            m.installMod(folder);
+            m.installResource(folder);
 
             loop.exec();
 
@@ -134,7 +134,7 @@ class ResourceFolderModelTest : public QObject {
     void test_addFromWatch()
     {
         QString source = QFINDTESTDATA("testdata/ResourceFolderModel");
-        ModFolderModel model(source, nullptr);
+        ModFolderModel model(source, nullptr, false, true);
 
         QCOMPARE(model.size(), 0);
 
@@ -154,7 +154,7 @@ class ResourceFolderModelTest : public QObject {
         QString file_mod = QFINDTESTDATA("testdata/ResourceFolderModel/supercoolmod.jar");
 
         QTemporaryDir tmp;
-        ResourceFolderModel model(QDir(tmp.path()), nullptr);
+        ResourceFolderModel model(QDir(tmp.path()), nullptr, false, false);
 
         QCOMPARE(model.size(), 0);
 
@@ -199,7 +199,7 @@ class ResourceFolderModelTest : public QObject {
         QString file_mod = QFINDTESTDATA("testdata/ResourceFolderModel/supercoolmod.jar");
 
         QTemporaryDir tmp;
-        ResourceFolderModel model(tmp.path(), nullptr);
+        ResourceFolderModel model(tmp.path(), nullptr, false, false);
 
         QCOMPARE(model.size(), 0);
 
@@ -210,7 +210,7 @@ class ResourceFolderModelTest : public QObject {
             EXEC_UPDATE_TASK(model.installResource(file_mod), QVERIFY)
         }
 
-        for (auto res : model.all())
+        for (auto res : model.allResources())
             qDebug() << res->name();
 
         QCOMPARE(model.size(), 2);