mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-11 08:34:52 -07:00
Turn Card, Deck_List, Protocol, RNG, Network (Client, Server), Settings and Utility into libraries and remove cockatrice_common. (#6212)
--------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de> Co-authored-by: ebbit1q <ebbit1q@gmail.com>
This commit is contained in:
parent
be1403c920
commit
1ef07309d6
605 changed files with 3812 additions and 3408 deletions
|
|
@ -1,70 +1,63 @@
|
|||
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/\"")
|
||||
|
||||
# ------------------------
|
||||
# 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(
|
||||
target_link_libraries(
|
||||
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
|
||||
PRIVATE libcockatrice_card
|
||||
PRIVATE libcockatrice_settings
|
||||
PRIVATE Threads::Threads
|
||||
PRIVATE ${GTEST_BOTH_LIBRARIES}
|
||||
PRIVATE ${TEST_QT_MODULES}
|
||||
)
|
||||
|
||||
add_test(NAME carddatabase_test COMMAND carddatabase_test)
|
||||
|
||||
# ------------------------
|
||||
# Filter String Test
|
||||
# ------------------------
|
||||
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
|
||||
)
|
||||
|
||||
target_link_libraries(
|
||||
filter_string_test
|
||||
PRIVATE libcockatrice_card
|
||||
PRIVATE libcockatrice_settings
|
||||
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)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#include "../../cockatrice/src/database/card_database_manager.h"
|
||||
#include "../../cockatrice/src/filters/filter_string.h"
|
||||
#include "mocks.h"
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
#include <libcockatrice/card/card_database/card_database_manager.h>
|
||||
|
||||
#define QUERY(name, card, query, match) \
|
||||
TEST_F(CardQuery, name) \
|
||||
|
|
|
|||
|
|
@ -452,7 +452,7 @@ void SettingsCache::setRoundCardCorners(bool /* _roundCardCorners */)
|
|||
{
|
||||
}
|
||||
|
||||
void PictureLoader::clearPixmapCache(CardInfoPtr /* card */)
|
||||
void CardPictureLoader::clearPixmapCache(CardInfoPtr /* card */)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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 <libcockatrice/card/card_database/card_database.h>
|
||||
#include <libcockatrice/settings/cache_settings.h>
|
||||
#include <libcockatrice/utility/macros.h>
|
||||
|
||||
extern SettingsCache *settingsCache;
|
||||
|
||||
class PictureLoader
|
||||
class CardPictureLoader
|
||||
{
|
||||
public:
|
||||
static void clearPixmapCache(CardInfoPtr card);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue