Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-04-29 14:14:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests (make them green)

Browse Source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2024-10-28 21:09:45 +00:00
parent ad1d5ddcdf
commit f3cae427f1
No known key found for this signature in database
GPG Key ID: 5E39D70B4C93C38E
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
launcher/minecraft/mod/ModFolderModel.h
View File

@ -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"; }

16
tests/ResourceFolderModel_test.cpp
View File

@ -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);