aboutsummaryrefslogtreecommitdiff
path: root/tests/ResourceFolderModel_test.cpp
diff options
context:
space:
mode:
authorRachel Powers <508861+Ryex@users.noreply.github.com>2023-05-28 11:25:58 -0700
committerRachel Powers <508861+Ryex@users.noreply.github.com>2023-07-11 21:42:29 -0700
commit9957aeb003a28f24a7d3b2bbc46d21c31506615d (patch)
tree891048851c7819f334abf384a7d99dbeec7bf0ea /tests/ResourceFolderModel_test.cpp
parenteb079c80605f88cbd0aaff8285dafc459c6f42eb (diff)
parent640aaa8c23d714ce17bc8e78754af6219abc6466 (diff)
downloadPrismLauncher-9957aeb003a28f24a7d3b2bbc46d21c31506615d.tar.gz
PrismLauncher-9957aeb003a28f24a7d3b2bbc46d21c31506615d.tar.bz2
PrismLauncher-9957aeb003a28f24a7d3b2bbc46d21c31506615d.zip
Merge branch 'develop' into curseforge-url-handle
Diffstat (limited to 'tests/ResourceFolderModel_test.cpp')
-rw-r--r--tests/ResourceFolderModel_test.cpp17
1 files changed, 5 insertions, 12 deletions
diff --git a/tests/ResourceFolderModel_test.cpp b/tests/ResourceFolderModel_test.cpp
index 054d81c4..962d89f1 100644
--- a/tests/ResourceFolderModel_test.cpp
+++ b/tests/ResourceFolderModel_test.cpp
@@ -90,9 +90,7 @@ slots:
QEventLoop loop;
- InstancePtr instance;
-
- ModFolderModel m(tempDir.path(), instance, true);
+ ModFolderModel m(tempDir.path(), nullptr, true);
connect(&m, &ModFolderModel::updateFinished, &loop, &QEventLoop::quit);
@@ -116,8 +114,7 @@ slots:
QString folder = source + '/';
QTemporaryDir tempDir;
QEventLoop loop;
- InstancePtr instance;
- ModFolderModel m(tempDir.path(), instance, true);
+ ModFolderModel m(tempDir.path(), nullptr, true);
connect(&m, &ModFolderModel::updateFinished, &loop, &QEventLoop::quit);
@@ -140,8 +137,7 @@ slots:
void test_addFromWatch()
{
QString source = QFINDTESTDATA("testdata/ResourceFolderModel");
- InstancePtr instance;
- ModFolderModel model(source, instance);
+ ModFolderModel model(source, nullptr);
QCOMPARE(model.size(), 0);
@@ -161,9 +157,7 @@ slots:
QString file_mod = QFINDTESTDATA("testdata/ResourceFolderModel/supercoolmod.jar");
QTemporaryDir tmp;
- InstancePtr instance;
-
- ResourceFolderModel model(QDir(tmp.path()), instance);
+ ResourceFolderModel model(QDir(tmp.path()), nullptr);
QCOMPARE(model.size(), 0);
@@ -214,8 +208,7 @@ slots:
QString file_mod = QFINDTESTDATA("testdata/ResourceFolderModel/supercoolmod.jar");
QTemporaryDir tmp;
- InstancePtr instance;
- ResourceFolderModel model(tmp.path(), instance);
+ ResourceFolderModel model(tmp.path(), nullptr);
QCOMPARE(model.size(), 0);