diff options
author | Trial97 <alexandru.tripon97@gmail.com> | 2023-05-04 20:29:33 +0300 |
---|---|---|
committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-05-04 20:29:33 +0300 |
commit | 9fbec3793f02f6bb3e692f98f2d86cad12c52190 (patch) | |
tree | 9f375cbb5e46020f172fd01acd92988fe17655bc /tests/ResourceFolderModel_test.cpp | |
parent | b2ecb9ac09573d13c6edf8f6ea0924c1f7006b4b (diff) | |
parent | 64ba5e4ed1456bed159cfe7b41ed9175b8baf5c4 (diff) | |
download | PrismLauncher-9fbec3793f02f6bb3e692f98f2d86cad12c52190.tar.gz PrismLauncher-9fbec3793f02f6bb3e692f98f2d86cad12c52190.tar.bz2 PrismLauncher-9fbec3793f02f6bb3e692f98f2d86cad12c52190.zip |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
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); |