From f2b77d3b4b896be82466999c662362d19afa953f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sun, 28 Sep 2025 20:05:11 +0200 Subject: [PATCH] filter_string_test.cpp doesn't care about the singleton and can create its own NoopCardPreferenceProvider Database. Took 18 minutes --- tests/carddatabase/filter_string_test.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/carddatabase/filter_string_test.cpp b/tests/carddatabase/filter_string_test.cpp index 3055bb76a..1925f5263 100644 --- a/tests/carddatabase/filter_string_test.cpp +++ b/tests/carddatabase/filter_string_test.cpp @@ -18,10 +18,13 @@ class CardQuery : public ::testing::Test protected: void SetUp() override { - cat = CardDatabaseManager::query()->getCardBySimpleName("Cat"); - notDeadAfterAll = CardDatabaseManager::query()->getCardBySimpleName("Not Dead"); - truth = CardDatabaseManager::query()->getCardBySimpleName("Truth"); - doctor = CardDatabaseManager::query()->getCardBySimpleName("Doctor"); + CardDatabase *db = new CardDatabase(nullptr, QSharedPointer::create()); + db->loadCardDatabases(); + + cat = db->query()->getCardBySimpleName("Cat"); + notDeadAfterAll = db->query()->getCardBySimpleName("Not Dead"); + truth = db->query()->getCardBySimpleName("Truth"); + doctor = db->query()->getCardBySimpleName("Doctor"); } // void TearDown() override {} @@ -70,7 +73,6 @@ QUERY(Color4, cat, "c!gw", false) int main(int argc, char **argv) { settingsCache = new SettingsCache; - CardDatabaseManager::getInstance()->loadCardDatabases(); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS();