jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Turn Card, Deck_List, Protocol, RNG, Network (Client, Server), Settings and Utility into libraries and remove cockatrice_common. (#6212)

Browse source 
---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
Co-authored-by: ebbit1q <ebbit1q@gmail.com>
This commit is contained in:
BruebachL 2025-10-09 07:36:12 +02:00 • committed by GitHub
parent be1403c920
commit 1ef07309d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
605 changed files with 3812 additions and 3408 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/CMakeLists.txt
View file

@ -45,9 +45,11 @@ endif()
include_directories(${GTEST_INCLUDE_DIRS})
target_link_libraries(dummy_test Threads::Threads ${GTEST_BOTH_LIBRARIES})
target_link_libraries(expression_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
target_link_libraries(expression_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
target_link_libraries(test_age_formatting Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
target_link_libraries(password_hash_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
target_link_libraries(
password_hash_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
)
add_subdirectory(carddatabase)
add_subdirectory(loading_from_clipboard)

87
tests/carddatabase/CMakeLists.txt
View file

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

2
tests/carddatabase/filter_string_test.cpp
View file

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

2
tests/carddatabase/mocks.cpp
View file

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

8
tests/carddatabase/mocks.h
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 <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);

3
tests/expression_test.cpp
View file

@ -1,7 +1,6 @@
#include "../common/expression.h"
#include "gtest/gtest.h"
#include <QtMath>
#include <libcockatrice/utility/expression.h>
#define TEST_EXPR(name, a, b) \
TEST(ExpressionTest, name) \

6
tests/loading_from_clipboard/CMakeLists.txt
View file

@ -1,7 +1,5 @@
add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
add_executable(
loading_from_clipboard_test ../../common/deck_list.cpp clipboard_testing.cpp loading_from_clipboard_test.cpp
)
add_executable(loading_from_clipboard_test clipboard_testing.cpp loading_from_clipboard_test.cpp)
if(NOT GTEST_FOUND)
add_dependencies(loading_from_clipboard_test gtest)
@ -12,6 +10,6 @@ set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VE
)
target_link_libraries(
loading_from_clipboard_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
loading_from_clipboard_test libcockatrice_deck_list Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
)
add_test(NAME loading_from_clipboard_test COMMAND loading_from_clipboard_test)

3
tests/loading_from_clipboard/clipboard_testing.cpp
View file

@ -1,8 +1,7 @@
#include "clipboard_testing.h"
#include "../../common/deck_list_card_node.h"
#include <QTextStream>
#include <libcockatrice/deck_list/deck_list_card_node.h>
void testEmpty(const QString &clipboard)
{

3
tests/loading_from_clipboard/clipboard_testing.h
View file

@ -1,9 +1,8 @@
#ifndef CLIPBOARD_TESTING_H
#define CLIPBOARD_TESTING_H
#include "../../common/deck_list.h"
#include "gtest/gtest.h"
#include <libcockatrice/deck_list/deck_list.h>
// using std types because qt types aren't understood by gtest (without this you'll get less nice errors)
using CardRows = QVector<std::pair<std::string, int>>;

2
tests/oracle/CMakeLists.txt
View file

@ -6,6 +6,6 @@ endif()
set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Widgets)
target_link_libraries(parse_cipt_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
target_link_libraries(parse_cipt_test Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
add_test(NAME parse_cipt_test COMMAND parse_cipt_test)

7
tests/password_hash_test.cpp
View file

@ -1,8 +1,7 @@
#include "../common/passwordhasher.h"
#include "../common/rng_abstract.h"
#include "../common/rng_sfmt.h"
#include "gtest/gtest.h"
#include <libcockatrice/rng/rng_abstract.h>
#include <libcockatrice/rng/rng_sfmt.h>
#include <libcockatrice/utility/passwordhasher.h>
RNG_Abstract *rng;