removed some duplicate code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
@@ -21,9 +21,6 @@ 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
|
||||
TEST_NAME ResourcePackParse)
|
||||
|
||||
ecm_add_test(ResourceModel_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
|
||||
TEST_NAME ResourceModel)
|
||||
|
||||
ecm_add_test(TexturePackParse_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
|
||||
TEST_NAME TexturePackParse)
|
||||
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include <QJsonDocument>
|
||||
|
||||
#include <modplatform/ResourceAPI.h>
|
||||
|
||||
class SearchTask : public Task {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
void executeTask() override { emitSucceeded(); }
|
||||
};
|
||||
|
||||
class DummyResourceAPI : public ResourceAPI {
|
||||
public:
|
||||
static auto searchRequestResult()
|
||||
{
|
||||
static QByteArray json_response =
|
||||
"{\"hits\":["
|
||||
"{"
|
||||
"\"author\":\"flowln\","
|
||||
"\"description\":\"the bestest mod\","
|
||||
"\"project_id\":\"something\","
|
||||
"\"project_type\":\"mod\","
|
||||
"\"slug\":\"bip_bop\","
|
||||
"\"title\":\"AAAAAAAA\","
|
||||
"\"versions\":[\"2.71\"]"
|
||||
"}"
|
||||
"]}";
|
||||
|
||||
return QJsonDocument::fromJson(json_response);
|
||||
}
|
||||
|
||||
DummyResourceAPI() : ResourceAPI() {}
|
||||
auto getSortingMethods() const -> QList<SortingMethod> override { return {}; }
|
||||
|
||||
Task::Ptr searchProjects(SearchArgs&&, SearchCallbacks&& callbacks) const override
|
||||
{
|
||||
auto task = makeShared<SearchTask>();
|
||||
QObject::connect(task.get(), &Task::succeeded, [callbacks] {
|
||||
auto json = searchRequestResult();
|
||||
callbacks.on_succeed(json);
|
||||
});
|
||||
return task;
|
||||
}
|
||||
};
|
||||
@@ -1,95 +0,0 @@
|
||||
#include <QAbstractItemModelTester>
|
||||
#include <QTest>
|
||||
#include <QTimer>
|
||||
|
||||
#include <Json.h>
|
||||
|
||||
#include <ui/pages/modplatform/ResourceModel.h>
|
||||
|
||||
#include "DummyResourceAPI.h"
|
||||
|
||||
using ResourceDownload::ResourceModel;
|
||||
|
||||
#define EXEC_TASK(EXEC) \
|
||||
QEventLoop loop; \
|
||||
\
|
||||
connect(model, &ResourceModel::dataChanged, &loop, &QEventLoop::quit); \
|
||||
\
|
||||
QTimer expire_timer; \
|
||||
expire_timer.callOnTimeout(&loop, &QEventLoop::quit); \
|
||||
expire_timer.setSingleShot(true); \
|
||||
expire_timer.start(4000); \
|
||||
\
|
||||
EXEC; \
|
||||
if (model->hasActiveSearchJob()) \
|
||||
loop.exec(); \
|
||||
\
|
||||
QVERIFY2(expire_timer.isActive(), "Timer has expired. The search never finished."); \
|
||||
expire_timer.stop(); \
|
||||
\
|
||||
disconnect(model, nullptr, &loop, nullptr)
|
||||
|
||||
class ResourceModelTest;
|
||||
|
||||
class DummyResourceModel : public ResourceModel {
|
||||
Q_OBJECT
|
||||
|
||||
friend class ResourceModelTest;
|
||||
|
||||
public:
|
||||
DummyResourceModel() : ResourceModel(new DummyResourceAPI) {}
|
||||
~DummyResourceModel() {}
|
||||
|
||||
auto metaEntryBase() const -> QString override { return ""; }
|
||||
|
||||
ResourceAPI::SearchArgs createSearchArguments() override { return {}; }
|
||||
ResourceAPI::VersionSearchArgs createVersionsArguments(const QModelIndex&) override { return {}; }
|
||||
ResourceAPI::ProjectInfoArgs createInfoArguments(const QModelIndex&) override { return {}; }
|
||||
|
||||
QJsonArray documentToArray(QJsonDocument& doc) const override { return doc.object().value("hits").toArray(); }
|
||||
|
||||
void loadIndexedPack(ModPlatform::IndexedPack& pack, QJsonObject& obj) override
|
||||
{
|
||||
pack.authors.append({ Json::requireString(obj, "author"), "" });
|
||||
pack.description = Json::requireString(obj, "description");
|
||||
pack.addonId = Json::requireString(obj, "project_id");
|
||||
}
|
||||
};
|
||||
|
||||
class ResourceModelTest : public QObject {
|
||||
Q_OBJECT
|
||||
private slots:
|
||||
void test_abstract_item_model()
|
||||
{
|
||||
auto dummy = DummyResourceModel();
|
||||
auto tester = QAbstractItemModelTester(&dummy);
|
||||
}
|
||||
|
||||
void test_search()
|
||||
{
|
||||
auto model = new DummyResourceModel;
|
||||
|
||||
QVERIFY(model->m_packs.isEmpty());
|
||||
|
||||
EXEC_TASK(model->search());
|
||||
|
||||
QVERIFY(model->m_packs.size() == 1);
|
||||
QVERIFY(model->m_search_state == DummyResourceModel::SearchState::Finished);
|
||||
|
||||
auto processed_pack = model->m_packs.at(0);
|
||||
auto search_json = DummyResourceAPI::searchRequestResult();
|
||||
auto processed_response = model->documentToArray(search_json).first().toObject();
|
||||
|
||||
QVERIFY(processed_pack->addonId.toString() == Json::requireString(processed_response, "project_id"));
|
||||
QVERIFY(processed_pack->description == Json::requireString(processed_response, "description"));
|
||||
QVERIFY(processed_pack->authors.first().name == Json::requireString(processed_response, "author"));
|
||||
|
||||
delete model;
|
||||
}
|
||||
};
|
||||
|
||||
QTEST_GUILESS_MAIN(ResourceModelTest)
|
||||
|
||||
#include "ResourceModel_test.moc"
|
||||
|
||||
#include "moc_DummyResourceAPI.cpp"
|
||||
Reference in New Issue
Block a user