fix: tests

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu 2022-09-04 15:05:11 +02:00
parent 07dcefabcb
commit aad6f74db6
No known key found for this signature in database
GPG Key ID: C10411294912A422
7 changed files with 6 additions and 7 deletions

View File

@ -24,7 +24,7 @@ ecm_add_test(ResourceFolderModel_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_V
ecm_add_test(ResourcePackParse_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test ecm_add_test(ResourcePackParse_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
TEST_NAME ResourcePackParse) TEST_NAME ResourcePackParse)
ecm_add_test(minecraft/mod/TexturePackParse_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test ecm_add_test(TexturePackParse_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
TEST_NAME TexturePackParse) TEST_NAME TexturePackParse)
ecm_add_test(ParseUtils_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test ecm_add_test(ParseUtils_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test

View File

@ -146,7 +146,6 @@ slots:
for (auto mod : model.allMods()) for (auto mod : model.allMods())
qDebug() << mod->name(); qDebug() << mod->name();
// FIXME: It considers every file in the directory as a mod, but we should probably filter that out somehow.
QCOMPARE(model.size(), 4); QCOMPARE(model.size(), 4);
model.stopWatching(); model.stopWatching();

View File

@ -21,8 +21,8 @@
#include "FileSystem.h" #include "FileSystem.h"
#include "TexturePack.h" #include "minecraft/mod/TexturePack.h"
#include "tasks/LocalTexturePackParseTask.h" #include "minecraft/mod/tasks/LocalTexturePackParseTask.h"
class TexturePackParseTest : public QObject { class TexturePackParseTest : public QObject {
Q_OBJECT Q_OBJECT
@ -30,7 +30,7 @@ class TexturePackParseTest : public QObject {
private slots: private slots:
void test_parseZIP() void test_parseZIP()
{ {
QString source = QFINDTESTDATA("testdata"); QString source = QFINDTESTDATA("testdata/TexturePackParse");
QString zip_rp = FS::PathCombine(source, "test_texture_pack_idk.zip"); QString zip_rp = FS::PathCombine(source, "test_texture_pack_idk.zip");
TexturePack pack { QFileInfo(zip_rp) }; TexturePack pack { QFileInfo(zip_rp) };
@ -42,7 +42,7 @@ class TexturePackParseTest : public QObject {
void test_parseFolder() void test_parseFolder()
{ {
QString source = QFINDTESTDATA("testdata"); QString source = QFINDTESTDATA("testdata/TexturePackParse");
QString folder_rp = FS::PathCombine(source, "test_texturefolder"); QString folder_rp = FS::PathCombine(source, "test_texturefolder");
TexturePack pack { QFileInfo(folder_rp) }; TexturePack pack { QFileInfo(folder_rp) };
@ -54,7 +54,7 @@ class TexturePackParseTest : public QObject {
void test_parseFolder2() void test_parseFolder2()
{ {
QString source = QFINDTESTDATA("testdata"); QString source = QFINDTESTDATA("testdata/TexturePackParse");
QString folder_rp = FS::PathCombine(source, "another_test_texturefolder"); QString folder_rp = FS::PathCombine(source, "another_test_texturefolder");
TexturePack pack { QFileInfo(folder_rp) }; TexturePack pack { QFileInfo(folder_rp) };