jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 22:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Convert structure to open-std Document P1204R0: Canonical Project Structure

Browse source 
Took 2 hours 50 minutes
This commit is contained in:
Lukas Brübach 2025-10-05 23:58:53 +02:00
parent 3e0cf97dff
commit 3fb9689bbb
585 changed files with 1548 additions and 1584 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 utility 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 utility 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)

10
tests/carddatabase/CMakeLists.txt
View file

@ -20,9 +20,8 @@ add_executable(carddatabase_test ${MOCKS_SOURCES} ${VERSION_STRING_CPP} carddata
target_link_libraries(
carddatabase_test
PRIVATE cockatrice_card
PRIVATE cockatrice_settings
PRIVATE cockatrice_common
PRIVATE libcockatrice_card
PRIVATE libcockatrice_settings
PRIVATE Threads::Threads
PRIVATE ${GTEST_BOTH_LIBRARIES}
PRIVATE ${TEST_QT_MODULES}
@ -46,9 +45,8 @@ add_executable(
target_link_libraries(
filter_string_test
PRIVATE cockatrice_card
PRIVATE cockatrice_settings
PRIVATE cockatrice_common
PRIVATE libcockatrice_card
PRIVATE libcockatrice_settings
PRIVATE Threads::Threads
PRIVATE ${GTEST_BOTH_LIBRARIES}
PRIVATE ${TEST_QT_MODULES}

2
tests/carddatabase/filter_string_test.cpp
View file

@ -1,8 +1,8 @@
#include "../../cockatrice/src/filters/filter_string.h"
#include "card/card_database/card_database_manager.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) \

6
tests/carddatabase/mocks.h
View file

@ -10,9 +10,9 @@
#define PICTURELOADER_H
#include "card/card_database/card_database.h"
#include "settings/cache_settings.h"
#include "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;

3
tests/expression_test.cpp
View file

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

3
tests/loading_from_clipboard/CMakeLists.txt
View file

@ -10,7 +10,6 @@ set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VE
)
target_link_libraries(
loading_from_clipboard_test cockatrice_common cockatrice_deck_list 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 "deck_list/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 "deck_list/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 "../libs/rng/include/rng/rng_abstract.h"
#include "../libs/rng/include/rng/rng_sfmt.h"
#include "../libs/utility/include/utility/passwordhasher.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;