From 0db477665c5a4b40149aed231c09ce00a075baf7 Mon Sep 17 00:00:00 2001 From: nerix Date: Sun, 29 Sep 2024 14:05:28 +0200 Subject: [PATCH] fix: don't initialize GIFTimer in tests (#5608) --- CHANGELOG.md | 1 + benchmarks/src/RecentMessages.cpp | 4 ++-- mocks/include/mocks/Emotes.hpp | 38 +++++++++++++++++++++++++++++++ tests/src/Commands.cpp | 4 ++-- tests/src/Filters.cpp | 4 ++-- tests/src/InputCompletion.cpp | 3 ++- tests/src/MessageBuilder.cpp | 4 ++-- tests/src/ModerationAction.cpp | 4 ++-- tests/src/SplitInput.cpp | 4 ++-- 9 files changed, 53 insertions(+), 13 deletions(-) create mode 100644 mocks/include/mocks/Emotes.hpp diff --git a/CHANGELOG.md b/CHANGELOG.md index 969cb8b8c..59f9ee7c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -94,6 +94,7 @@ - Dev: Refactored legacy Unicode zero-width-joiner replacement. (#5594) - Dev: The JSON output when copying a message (SHIFT + right-click) is now more extensive. (#5600) - Dev: Twitch messages are now sent using Twitch's Helix API instead of IRC by default. (#5607) +- Dev: `GIFTimer` is no longer initialized in tests. (#5608) ## 2.5.1 diff --git a/benchmarks/src/RecentMessages.cpp b/benchmarks/src/RecentMessages.cpp index 24ebd127f..883b2bb69 100644 --- a/benchmarks/src/RecentMessages.cpp +++ b/benchmarks/src/RecentMessages.cpp @@ -4,6 +4,7 @@ #include "messages/Emote.hpp" #include "mocks/BaseApplication.hpp" #include "mocks/DisabledStreamerMode.hpp" +#include "mocks/Emotes.hpp" #include "mocks/LinkResolver.hpp" #include "mocks/TwitchIrcServer.hpp" #include "mocks/UserData.hpp" @@ -16,7 +17,6 @@ #include "providers/seventv/SeventvEmotes.hpp" #include "providers/twitch/TwitchBadges.hpp" #include "providers/twitch/TwitchChannel.hpp" -#include "singletons/Emotes.hpp" #include "singletons/Resources.hpp" #include @@ -111,7 +111,7 @@ public: } AccountController accounts; - Emotes emotes; + mock::Emotes emotes; mock::UserDataController userData; mock::MockTwitchIrcServer twitch; mock::EmptyLinkResolver linkResolver; diff --git a/mocks/include/mocks/Emotes.hpp b/mocks/include/mocks/Emotes.hpp new file mode 100644 index 000000000..96c5dcc6a --- /dev/null +++ b/mocks/include/mocks/Emotes.hpp @@ -0,0 +1,38 @@ +#pragma once + +#include "singletons/Emotes.hpp" + +namespace chatterino::mock { + +class Emotes : public IEmotes +{ +public: + Emotes() + { + this->emojis.load(); + // don't initialize GIFTimer + } + + ITwitchEmotes *getTwitchEmotes() override + { + return &this->twitch; + } + + IEmojis *getEmojis() override + { + return &this->emojis; + } + + GIFTimer &getGIFTimer() override + { + return this->gifTimer; + } + +private: + TwitchEmotes twitch; + Emojis emojis; + + GIFTimer gifTimer; +}; + +} // namespace chatterino::mock diff --git a/tests/src/Commands.cpp b/tests/src/Commands.cpp index f1b872b7d..e44366f20 100644 --- a/tests/src/Commands.cpp +++ b/tests/src/Commands.cpp @@ -4,12 +4,12 @@ #include "controllers/commands/CommandController.hpp" #include "controllers/commands/common/ChannelAction.hpp" #include "mocks/BaseApplication.hpp" +#include "mocks/Emotes.hpp" #include "mocks/Helix.hpp" #include "mocks/Logging.hpp" #include "mocks/TwitchIrcServer.hpp" #include "providers/twitch/TwitchAccount.hpp" #include "providers/twitch/TwitchChannel.hpp" -#include "singletons/Emotes.hpp" #include "singletons/Settings.hpp" #include "Test.hpp" @@ -59,7 +59,7 @@ public: AccountController accounts; CommandController commands; mock::MockTwitchIrcServer twitch; - Emotes emotes; + mock::Emotes emotes; }; } // namespace diff --git a/tests/src/Filters.cpp b/tests/src/Filters.cpp index 6456d0594..b0c728059 100644 --- a/tests/src/Filters.cpp +++ b/tests/src/Filters.cpp @@ -7,6 +7,7 @@ #include "mocks/BaseApplication.hpp" #include "mocks/Channel.hpp" #include "mocks/ChatterinoBadges.hpp" +#include "mocks/Emotes.hpp" #include "mocks/EmptyApplication.hpp" #include "mocks/Logging.hpp" #include "mocks/TwitchIrcServer.hpp" @@ -14,7 +15,6 @@ #include "providers/ffz/FfzBadges.hpp" #include "providers/seventv/SeventvBadges.hpp" #include "providers/twitch/TwitchBadge.hpp" -#include "singletons/Emotes.hpp" #include "Test.hpp" #include @@ -81,7 +81,7 @@ public: mock::EmptyLogging logging; AccountController accounts; - Emotes emotes; + mock::Emotes emotes; mock::UserDataController userData; mock::MockTwitchIrcServer twitch; mock::ChatterinoBadges chatterinoBadges; diff --git a/tests/src/InputCompletion.cpp b/tests/src/InputCompletion.cpp index a365be89d..fe7099fe4 100644 --- a/tests/src/InputCompletion.cpp +++ b/tests/src/InputCompletion.cpp @@ -8,6 +8,7 @@ #include "messages/Emote.hpp" #include "mocks/BaseApplication.hpp" #include "mocks/Channel.hpp" +#include "mocks/Emotes.hpp" #include "mocks/Helix.hpp" #include "mocks/Logging.hpp" #include "mocks/TwitchIrcServer.hpp" @@ -79,7 +80,7 @@ public: mock::EmptyLogging logging; AccountController accounts; mock::MockTwitchIrcServer twitch; - Emotes emotes; + mock::Emotes emotes; BttvEmotes bttvEmotes; FfzEmotes ffzEmotes; SeventvEmotes seventvEmotes; diff --git a/tests/src/MessageBuilder.cpp b/tests/src/MessageBuilder.cpp index 9a3030822..a51a93b62 100644 --- a/tests/src/MessageBuilder.cpp +++ b/tests/src/MessageBuilder.cpp @@ -7,13 +7,13 @@ #include "mocks/Channel.hpp" #include "mocks/ChatterinoBadges.hpp" #include "mocks/DisabledStreamerMode.hpp" +#include "mocks/Emotes.hpp" #include "mocks/Logging.hpp" #include "mocks/TwitchIrcServer.hpp" #include "mocks/UserData.hpp" #include "providers/ffz/FfzBadges.hpp" #include "providers/seventv/SeventvBadges.hpp" #include "providers/twitch/TwitchBadge.hpp" -#include "singletons/Emotes.hpp" #include "Test.hpp" #include "util/IrcHelpers.hpp" @@ -99,7 +99,7 @@ public: mock::EmptyLogging logging; AccountController accounts; - Emotes emotes; + mock::Emotes emotes; mock::UserDataController userData; mock::MockTwitchIrcServer twitch; mock::ChatterinoBadges chatterinoBadges; diff --git a/tests/src/ModerationAction.cpp b/tests/src/ModerationAction.cpp index 39118fe5f..b1c306c97 100644 --- a/tests/src/ModerationAction.cpp +++ b/tests/src/ModerationAction.cpp @@ -2,7 +2,7 @@ #include "messages/Image.hpp" #include "mocks/BaseApplication.hpp" -#include "singletons/Emotes.hpp" +#include "mocks/Emotes.hpp" #include "singletons/Resources.hpp" #include "Test.hpp" @@ -24,7 +24,7 @@ public: return &this->emotes; } - Emotes emotes; + mock::Emotes emotes; }; class ModerationActionTest : public ::testing::Test diff --git a/tests/src/SplitInput.cpp b/tests/src/SplitInput.cpp index 6528583ee..edd9431d5 100644 --- a/tests/src/SplitInput.cpp +++ b/tests/src/SplitInput.cpp @@ -6,7 +6,7 @@ #include "controllers/commands/CommandController.hpp" #include "controllers/hotkeys/HotkeyController.hpp" #include "mocks/BaseApplication.hpp" -#include "singletons/Emotes.hpp" +#include "mocks/Emotes.hpp" #include "singletons/Fonts.hpp" #include "singletons/Paths.hpp" #include "singletons/Settings.hpp" @@ -62,7 +62,7 @@ public: WindowManager windowManager; AccountController accounts; CommandController commands; - Emotes emotes; + mock::Emotes emotes; }; class SplitInputTest