Turn Card, Settings and Utility into libraries.

Took 4 hours 3 minutes

Took 2 minutes

Took 38 seconds

Took 5 minutes

Took 5 minutes

Took 9 minutes


Took 15 minutes
This commit is contained in:
Lukas Brübach 2025-10-02 17:41:07 +02:00
parent 30e6b52783
commit 53d80efab8
262 changed files with 1025 additions and 918 deletions

View file

@ -1,70 +1,70 @@
cmake_minimum_required(VERSION 3.16)
project(CardDatabaseTests VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
# ------------------------
# Definitions
# ------------------------
add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VERSION_NAME}::Network
${COCKATRICE_QT_VERSION_NAME}::Widgets ${COCKATRICE_QT_VERSION_NAME}::Svg
# ------------------------
# Qt modules
# ------------------------
set(TEST_QT_MODULES
${COCKATRICE_QT_VERSION_NAME}::Concurrent
${COCKATRICE_QT_VERSION_NAME}::Network
${COCKATRICE_QT_VERSION_NAME}::Widgets
${COCKATRICE_QT_VERSION_NAME}::Svg
)
if(Qt6_FOUND)
qt6_wrap_cpp(
MOCKS_SOURCES ../../cockatrice/src/settings/cache_settings.h ../../cockatrice/src/settings/card_database_settings.h
)
elseif(Qt5_FOUND)
qt5_wrap_cpp(
MOCKS_SOURCES ../../cockatrice/src/settings/cache_settings.h ../../cockatrice/src/settings/card_database_settings.h
)
endif()
# ------------------------
# Card Database Test
# ------------------------
add_executable(carddatabase_test
${MOCKS_SOURCES}
${VERSION_STRING_CPP}
carddatabase_test.cpp
mocks.cpp
)
add_executable(
carddatabase_test
${MOCKS_SOURCES}
${VERSION_STRING_CPP}
../../cockatrice/src/card/card_info.cpp
../../cockatrice/src/card/card_relation.cpp
../../cockatrice/src/card/card_set.cpp
../../cockatrice/src/card/card_set_list.cpp
../../cockatrice/src/card/exact_card.cpp
../../cockatrice/src/card/printing_info.cpp
../../cockatrice/src/database/card_database.cpp
../../cockatrice/src/database/card_database_loader.cpp
../../cockatrice/src/database/card_database_querier.cpp
../../cockatrice/src/database/parser/card_database_parser.cpp
../../cockatrice/src/database/parser/cockatrice_xml_3.cpp
../../cockatrice/src/database/parser/cockatrice_xml_4.cpp
../../cockatrice/src/settings/settings_manager.cpp
carddatabase_test.cpp
mocks.cpp
target_link_libraries(carddatabase_test
PRIVATE cardlib
PRIVATE settingslib
PRIVATE cockatrice_common
PRIVATE Threads::Threads
PRIVATE ${GTEST_BOTH_LIBRARIES}
PRIVATE ${TEST_QT_MODULES}
)
add_executable(
filter_string_test
${MOCKS_SOURCES}
${VERSION_STRING_CPP}
../../cockatrice/src/card/card_info.cpp
../../cockatrice/src/card/card_relation.cpp
../../cockatrice/src/card/card_set.cpp
../../cockatrice/src/card/card_set_list.cpp
../../cockatrice/src/card/exact_card.cpp
../../cockatrice/src/card/printing_info.cpp
../../cockatrice/src/database/card_database.cpp
../../cockatrice/src/database/card_database_loader.cpp
../../cockatrice/src/database/card_database_querier.cpp
../../cockatrice/src/database/card_database_manager.cpp
../../cockatrice/src/database/parser/card_database_parser.cpp
../../cockatrice/src/database/parser/cockatrice_xml_3.cpp
../../cockatrice/src/database/parser/cockatrice_xml_4.cpp
../../cockatrice/src/filters/filter_card.cpp
../../cockatrice/src/filters/filter_string.cpp
../../cockatrice/src/filters/filter_tree.cpp
../../cockatrice/src/settings/settings_manager.cpp
filter_string_test.cpp
mocks.cpp
add_test(NAME carddatabase_test COMMAND carddatabase_test)
# ------------------------
# Filter String Test
# ------------------------
add_executable(filter_string_test
${MOCKS_SOURCES}
${VERSION_STRING_CPP}
../../cockatrice/src/filters/filter_card.cpp
../../cockatrice/src/filters/filter_string.cpp
../../cockatrice/src/filters/filter_tree.cpp
filter_string_test.cpp
mocks.cpp
)
target_link_libraries(filter_string_test
PRIVATE cardlib
PRIVATE settingslib
PRIVATE cockatrice_common
PRIVATE Threads::Threads
PRIVATE ${GTEST_BOTH_LIBRARIES}
PRIVATE ${TEST_QT_MODULES}
)
add_test(NAME filter_string_test COMMAND filter_string_test)
# ------------------------
# Dependencies on gtest
# ------------------------
if(NOT GTEST_FOUND)
add_dependencies(carddatabase_test gtest)
add_dependencies(filter_string_test gtest)
endif()
target_link_libraries(carddatabase_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
target_link_libraries(filter_string_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
add_test(NAME carddatabase_test COMMAND carddatabase_test)
add_test(NAME filter_string_test COMMAND filter_string_test)

View file

@ -1,5 +1,5 @@
#include "../../cockatrice/src/database/card_database_manager.h"
#include "../../cockatrice/src/filters/filter_string.h"
#include "card/card_database/card_database_manager.h"
#include "mocks.h"
#include "gtest/gtest.h"

View file

@ -452,7 +452,7 @@ void SettingsCache::setRoundCardCorners(bool /* _roundCardCorners */)
{
}
void PictureLoader::clearPixmapCache(CardInfoPtr /* card */)
void CardPictureLoader::clearPixmapCache(CardInfoPtr /* card */)
{
}

View file

@ -10,13 +10,13 @@
#define PICTURELOADER_H
#include "../../cockatrice/src/database/card_database.h"
#include "../../cockatrice/src/settings/cache_settings.h"
#include "../../cockatrice/src/utility/macros.h"
#include "card/card_database/card_database.h"
#include "settings/cache_settings.h"
#include "utility/macros.h"
extern SettingsCache *settingsCache;
class PictureLoader
class CardPictureLoader
{
public:
static void clearPixmapCache(CardInfoPtr card);