diff options
author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-05-12 01:00:26 -0700 |
---|---|---|
committer | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-05-12 01:00:26 -0700 |
commit | 82287e0407318724c5a460340eef2855c75449e8 (patch) | |
tree | f083d018d24ce86a02cc8d1edce9b56ef0f4f93d /tests/ResourceFolderModel_test.cpp | |
parent | a3173b53717fcea686f267f4eb8fd9788e6677db (diff) | |
parent | c5aff7cc1ef43a1326bd3ce0c83e29669e2ff43f (diff) | |
download | PrismLauncher-82287e0407318724c5a460340eef2855c75449e8.tar.gz PrismLauncher-82287e0407318724c5a460340eef2855c75449e8.tar.bz2 PrismLauncher-82287e0407318724c5a460340eef2855c75449e8.zip |
Merge branch 'develop' into curseforge-url-handle
Diffstat (limited to 'tests/ResourceFolderModel_test.cpp')
-rw-r--r-- | tests/ResourceFolderModel_test.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/tests/ResourceFolderModel_test.cpp b/tests/ResourceFolderModel_test.cpp index e38b8e93..054d81c4 100644 --- a/tests/ResourceFolderModel_test.cpp +++ b/tests/ResourceFolderModel_test.cpp @@ -36,6 +36,7 @@ #include <QTest> #include <QTemporaryDir> #include <QTimer> +#include "BaseInstance.h" #include <FileSystem.h> @@ -89,7 +90,9 @@ slots: QEventLoop loop; - ModFolderModel m(tempDir.path(), true); + InstancePtr instance; + + ModFolderModel m(tempDir.path(), instance, true); connect(&m, &ModFolderModel::updateFinished, &loop, &QEventLoop::quit); @@ -113,7 +116,8 @@ slots: QString folder = source + '/'; QTemporaryDir tempDir; QEventLoop loop; - ModFolderModel m(tempDir.path(), true); + InstancePtr instance; + ModFolderModel m(tempDir.path(), instance, true); connect(&m, &ModFolderModel::updateFinished, &loop, &QEventLoop::quit); @@ -136,8 +140,8 @@ slots: void test_addFromWatch() { QString source = QFINDTESTDATA("testdata/ResourceFolderModel"); - - ModFolderModel model(source); + InstancePtr instance; + ModFolderModel model(source, instance); QCOMPARE(model.size(), 0); @@ -157,8 +161,9 @@ slots: QString file_mod = QFINDTESTDATA("testdata/ResourceFolderModel/supercoolmod.jar"); QTemporaryDir tmp; + InstancePtr instance; - ResourceFolderModel model(QDir(tmp.path())); + ResourceFolderModel model(QDir(tmp.path()), instance); QCOMPARE(model.size(), 0); @@ -209,7 +214,8 @@ slots: QString file_mod = QFINDTESTDATA("testdata/ResourceFolderModel/supercoolmod.jar"); QTemporaryDir tmp; - ResourceFolderModel model(tmp.path()); + InstancePtr instance; + ResourceFolderModel model(tmp.path(), instance); QCOMPARE(model.size(), 0); |