mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2025-12-26 04:40:50 -08:00
5f4ad87a47
* Refactor CardDatabase *db global variable to singleton CardDatabaseManager. This commit refactors the global variable CardDatabase *db into a singleton encapsulated by the DatabaseManager class, accessible via DatabaseManager::getInstance(). This change centralizes access to the database instance, improving code modularity and encapsulation, resolving dependencies on main.h for code that requires access to the database instance. - Added DatabaseManager class with getInstance() method returning a pointer to the singleton CardDatabase. - Removed global db variable and updated references across the codebase. - Thread-safe static initialization for the singleton. Impact: This refactor should have no functional impact on the application, as it maintains the same interface for accessing the CardDatabase instance. However, the codebase now benefits from improved encapsulation, lifetime management, and thread-safety. * Refactor CardDatabase *db global variable to singleton CardDatabaseManager. This commit refactors the global variable CardDatabase *db into a singleton encapsulated by the DatabaseManager class, accessible via DatabaseManager::getInstance(). This change centralizes access to the database instance, improving code modularity and encapsulation, resolving dependencies on main.h for code that requires access to the database instance. - Added DatabaseManager class with getInstance() method returning a pointer to the singleton CardDatabase. - Removed global db variable and updated references across the codebase. - Thread-safe static initialization for the singleton. Impact: This refactor should have no functional impact on the application, as it maintains the same interface for accessing the CardDatabase instance. However, the codebase now benefits from improved encapsulation, lifetime management, and thread-safety. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
55 lines
2.1 KiB
CMake
55 lines
2.1 KiB
CMake
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
|
|
)
|
|
|
|
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()
|
|
|
|
add_executable(
|
|
carddatabase_test
|
|
${MOCKS_SOURCES}
|
|
${VERSION_STRING_CPP}
|
|
../../cockatrice/src/game/cards/card_database.cpp
|
|
../../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp
|
|
../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
|
|
../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
|
|
../../cockatrice/src/settings/settings_manager.cpp
|
|
carddatabase_test.cpp
|
|
mocks.cpp
|
|
)
|
|
add_executable(
|
|
filter_string_test
|
|
${MOCKS_SOURCES}
|
|
${VERSION_STRING_CPP}
|
|
../../cockatrice/src/game/cards/card_database.cpp
|
|
../../cockatrice/src/game/cards/card_database_manager.cpp
|
|
../../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp
|
|
../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
|
|
../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
|
|
../../cockatrice/src/game/filters/filter_card.cpp
|
|
../../cockatrice/src/game/filters/filter_string.cpp
|
|
../../cockatrice/src/game/filters/filter_tree.cpp
|
|
../../cockatrice/src/settings/settings_manager.cpp
|
|
filter_string_test.cpp
|
|
mocks.cpp
|
|
)
|
|
if(NOT GTEST_FOUND)
|
|
add_dependencies(carddatabase_test gtest)
|
|
add_dependencies(filter_string_test gtest)
|
|
endif()
|
|
|
|
target_link_libraries(carddatabase_test Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
|
|
target_link_libraries(filter_string_test 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)
|