tests: better test initializing allowing for better printing (#5379)

Co-authored-by: Nerixyz <nerixdev@outlook.de>

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unversioned
 
 - Dev: Add doxygen build target. (#5377)
+- Dev: Make printing of strings in tests easier. (#5379)
 
 ## 2.5.1
 

tests/CMakeLists.txt

@@ -5,7 +5,8 @@ option(CHATTERINO_TEST_USE_PUBLIC_HTTPBIN "Use public httpbin for testing networ
 set(test_SOURCES
     ${CMAKE_CURRENT_LIST_DIR}/src/main.cpp
     ${CMAKE_CURRENT_LIST_DIR}/resources/test-resources.qrc
-    ${CMAKE_CURRENT_LIST_DIR}/src/TestHelpers.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/src/Test.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/src/Test.cpp
     ${CMAKE_CURRENT_LIST_DIR}/src/ChannelChatters.cpp
     ${CMAKE_CURRENT_LIST_DIR}/src/AccessGuard.cpp
     ${CMAKE_CURRENT_LIST_DIR}/src/NetworkCommon.cpp

tests/src/AccessGuard.cpp

@@ -1,6 +1,6 @@
 #include "common/UniqueAccess.hpp"
+#include "Test.hpp"
 
-#include <gtest/gtest.h>
 #include <QDebug>
 #include <QString>
 

tests/src/BasicPubSub.cpp

@@ -1,7 +1,7 @@
 #include "providers/liveupdates/BasicPubSubClient.hpp"
 #include "providers/liveupdates/BasicPubSubManager.hpp"
+#include "Test.hpp"
 
-#include <gtest/gtest.h>
 #include <QByteArray>
 #include <QJsonDocument>
 #include <QJsonObject>

tests/src/BttvLiveUpdates.cpp

@@ -1,6 +1,7 @@
 #include "providers/bttv/BttvLiveUpdates.hpp"
 
-#include <gtest/gtest.h>
+#include "Test.hpp"
+
 #include <QString>
 
 #include <optional>

tests/src/ChannelChatters.cpp

@@ -1,8 +1,8 @@
 #include "common/ChannelChatters.hpp"
 
 #include "mocks/Channel.hpp"
+#include "Test.hpp"
 
-#include <gtest/gtest.h>
 #include <QColor>
 #include <QStringList>
 

tests/src/ChatterSet.cpp

@@ -1,6 +1,7 @@
 #include "common/ChatterSet.hpp"
 
-#include <gtest/gtest.h>
+#include "Test.hpp"
+
 #include <QStringList>
 
 TEST(ChatterSet, insert)

tests/src/Emojis.cpp

@@ -1,9 +1,8 @@
 #include "providers/emoji/Emojis.hpp"
 
 #include "common/Literals.hpp"
-#include "TestHelpers.hpp"
+#include "Test.hpp"
 
-#include <gtest/gtest.h>
 #include <QDebug>
 #include <QString>
 

tests/src/ExponentialBackoff.cpp

@@ -1,6 +1,6 @@
 #include "util/ExponentialBackoff.hpp"
 
-#include <gtest/gtest.h>
+#include "Test.hpp"
 
 using namespace chatterino;
 

tests/src/Filters.cpp

@@ -13,8 +13,8 @@
 #include "providers/twitch/TwitchBadge.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
 #include "singletons/Emotes.hpp"
+#include "Test.hpp"
 
-#include <gtest/gtest.h>
 #include <QColor>
 #include <QVariant>
 
@@ -101,7 +101,7 @@ namespace chatterino::filters {
 
 std::ostream &operator<<(std::ostream &os, Type t)
 {
-    os << qUtf8Printable(typeToString(t));
+    os << typeToString(t);
     return os;
 }
 
@@ -138,8 +138,8 @@ TEST(Filters, Validity)
         auto filterResult = Filter::fromString(input);
         bool isValid = std::holds_alternative<Filter>(filterResult);
         EXPECT_EQ(isValid, expected)
-            << "Filter::fromString( " << qUtf8Printable(input)
+            << "Filter::fromString( " << input << " ) should be "
-            << " ) should be " << (expected ? "valid" : "invalid");
+            << (expected ? "valid" : "invalid");
     }
 }
 
@@ -168,15 +168,14 @@ TEST(Filters, TypeSynthesis)
     {
         auto filterResult = Filter::fromString(input);
         bool isValid = std::holds_alternative<Filter>(filterResult);
-        ASSERT_TRUE(isValid) << "Filter::fromString( " << qUtf8Printable(input)
+        ASSERT_TRUE(isValid)
-                             << " ) is invalid";
+            << "Filter::fromString( " << input << " ) is invalid";
 
         auto filter = std::move(std::get<Filter>(filterResult));
         T type = filter.returnType();
         EXPECT_EQ(type, expected)
-            << "Filter{ " << qUtf8Printable(input) << " } has type " << type
+            << "Filter{ " << input << " } has type " << type << " instead of "
-            << " instead of " << expected << ".\nDebug: "
+            << expected << ".\nDebug: " << filter.debugString(typingContext);
-            << qUtf8Printable(filter.debugString(typingContext));
     }
 }
 
@@ -244,17 +243,16 @@ TEST(Filters, Evaluation)
     {
         auto filterResult = Filter::fromString(input);
         bool isValid = std::holds_alternative<Filter>(filterResult);
-        ASSERT_TRUE(isValid) << "Filter::fromString( " << qUtf8Printable(input)
+        ASSERT_TRUE(isValid)
-                             << " ) is invalid";
+            << "Filter::fromString( " << input << " ) is invalid";
 
         auto filter = std::move(std::get<Filter>(filterResult));
         auto result = filter.execute(contextMap);
 
         EXPECT_EQ(result, expected)
-            << "Filter{ " << qUtf8Printable(input) << " } evaluated to "
+            << "Filter{ " << input << " } evaluated to " << result.toString()
-            << qUtf8Printable(result.toString()) << " instead of "
+            << " instead of " << expected.toString()
-            << qUtf8Printable(expected.toString()) << ".\nDebug: "
+            << ".\nDebug: " << filter.debugString(typingContext);
-            << qUtf8Printable(filter.debugString(typingContext));
     }
 }
 
@@ -354,20 +352,17 @@ TEST_F(FiltersF, ExpressionDebug)
     {
         const auto filterResult = Filter::fromString(input);
         const auto *filter = std::get_if<Filter>(&filterResult);
-        EXPECT_NE(filter, nullptr)
+        EXPECT_NE(filter, nullptr) << "Filter::fromString(" << input
-            << "Filter::fromString(" << qUtf8Printable(input)
+                                   << ") did not build a proper filter";
-            << ") did not build a proper filter";
 
         const auto actualDebugString = filter->debugString(typingContext);
         EXPECT_EQ(actualDebugString, debugString)
-            << "filter->debugString() on '" << qUtf8Printable(input)
+            << "filter->debugString() on '" << input << "' should be '"
-            << "' should be '" << qUtf8Printable(debugString) << "', but got '"
+            << debugString << "', but got '" << actualDebugString << "'";
-            << qUtf8Printable(actualDebugString) << "'";
 
         const auto actualFilterString = filter->filterString();
         EXPECT_EQ(actualFilterString, filterString)
-            << "filter->filterString() on '" << qUtf8Printable(input)
+            << "filter->filterString() on '" << input << "' should be '"
-            << "' should be '" << qUtf8Printable(filterString) << "', but got '"
+            << filterString << "', but got '" << actualFilterString << "'";
-            << qUtf8Printable(actualFilterString) << "'";
     }
 }

tests/src/FormatTime.cpp

@@ -1,6 +1,6 @@
 #include "util/FormatTime.hpp"
 
-#include <gtest/gtest.h>
+#include "Test.hpp"
 
 #include <chrono>
 
@@ -62,8 +62,8 @@ TEST(FormatTime, Int)
         const auto actual = formatTime(input);
 
         EXPECT_EQ(actual, expected)
-            << qUtf8Printable(actual) << " (" << input
+            << actual << " (" << input << ") did not match expected value "
-            << ") did not match expected value " << qUtf8Printable(expected);
+            << expected;
     }
 }
 
@@ -130,8 +130,8 @@ TEST(FormatTime, QString)
         const auto actual = formatTime(input);
 
         EXPECT_EQ(actual, expected)
-            << qUtf8Printable(actual) << " (" << qUtf8Printable(input)
+            << actual << " (" << input << ") did not match expected value "
-            << ") did not match expected value " << qUtf8Printable(expected);
+            << expected;
     }
 }
 
@@ -202,7 +202,6 @@ TEST(FormatTime, chrono)
         const auto actual = formatTime(input);
 
         EXPECT_EQ(actual, expected)
-            << qUtf8Printable(actual) << " did not match expected value "
+            << actual << " did not match expected value " << expected;
-            << qUtf8Printable(expected);
     }
 }

tests/src/Helpers.cpp

@@ -1,6 +1,6 @@
 #include "util/Helpers.hpp"
 
-#include <gtest/gtest.h>
+#include "Test.hpp"
 
 using namespace chatterino;
 using namespace _helpers_internal;
@@ -275,8 +275,8 @@ TEST(Helpers, skipSpace)
         const auto actual = skipSpace(makeView(c.input), c.startIdx);
 
         EXPECT_EQ(actual, c.expected)
-            << actual << " (" << qUtf8Printable(c.input)
+            << actual << " (" << c.input << ") did not match expected value "
-            << ") did not match expected value " << c.expected;
+            << c.expected;
     }
 }
 
@@ -418,14 +418,13 @@ TEST(Helpers, findUnitMultiplierToSec)
 
         if (c.expectedMultiplier == bad)
         {
-            EXPECT_FALSE(actual.second) << qUtf8Printable(c.input);
+            EXPECT_FALSE(actual.second) << c.input;
         }
         else
         {
             EXPECT_TRUE(pos == c.expectedEndPos && actual.second &&
                         actual.first == c.expectedMultiplier)
-                << qUtf8Printable(c.input)
+                << c.input << ": Expected(end: " << c.expectedEndPos
-                << ": Expected(end: " << c.expectedEndPos
                 << ", mult: " << c.expectedMultiplier << ") Actual(end: " << pos
                 << ", mult: " << actual.first << ")";
         }
@@ -503,7 +502,7 @@ TEST(Helpers, parseDurationToSeconds)
         const auto actual = parseDurationToSeconds(c.input, c.noUnitMultiplier);
 
         EXPECT_EQ(actual, c.output)
-            << actual << " (" << qUtf8Printable(c.input)
+            << actual << " (" << c.input << ") did not match expected value "
-            << ") did not match expected value " << c.output;
+            << c.output;
     }
 }

tests/src/HighlightController.cpp

@@ -10,9 +10,8 @@
 #include "providers/twitch/TwitchBadge.hpp"  // for Badge
 #include "singletons/Paths.hpp"
 #include "singletons/Settings.hpp"
+#include "Test.hpp"
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
 #include <QDebug>
 #include <QDir>
 #include <QFile>
@@ -216,11 +215,9 @@ protected:
                 input.originalMessage, input.flags);
 
             EXPECT_EQ(isMatch, expected.state)
-                << qUtf8Printable(input.senderName) << ": "
+                << input.senderName << ": " << input.originalMessage;
-                << qUtf8Printable(input.originalMessage);
             EXPECT_EQ(matchResult, expected.result)
-                << qUtf8Printable(input.senderName) << ": "
+                << input.senderName << ": " << input.originalMessage;
-                << qUtf8Printable(input.originalMessage);
         }
     }
 

tests/src/HighlightPhrase.cpp

@@ -1,6 +1,6 @@
 #include "controllers/highlights/HighlightPhrase.hpp"
 
-#include <gtest/gtest.h>
+#include "Test.hpp"
 
 using namespace chatterino;
 

tests/src/Hotkeys.cpp

@@ -1,6 +1,5 @@
 #include "controllers/hotkeys/HotkeyHelpers.hpp"
-
+#include "Test.hpp"
-#include <gtest/gtest.h>
 
 #include <vector>
 

tests/src/InputCompletion.cpp

@@ -12,9 +12,9 @@
 #include "singletons/Emotes.hpp"
 #include "singletons/Paths.hpp"
 #include "singletons/Settings.hpp"
+#include "Test.hpp"
 #include "widgets/splits/InputCompletionPopup.hpp"
 
-#include <gtest/gtest.h>
 #include <QDir>
 #include <QFile>
 #include <QModelIndex>
@@ -224,7 +224,7 @@ void containsRoughly(std::span<EmoteItem> span, std::set<QString> values)
             }
         }
 
-        ASSERT_TRUE(found) << qPrintable(v) << " was not found in the span";
+        ASSERT_TRUE(found) << v << " was not found in the span";
     }
 }
 

tests/src/IrcHelpers.cpp

@@ -1,6 +1,7 @@
 #include "util/IrcHelpers.hpp"
 
-#include <gtest/gtest.h>
+#include "Test.hpp"
+
 #include <QApplication>
 #include <QDebug>
 #include <QtConcurrent>
@@ -55,7 +56,7 @@ TEST(IrcHelpers, ParseTagString)
         const auto actual = parseTagString(input);
 
         EXPECT_EQ(actual, expected)
-            << qUtf8Printable(actual) << " (" << qUtf8Printable(input)
+            << actual << " (" << input << ") did not match expected value "
-            << ") did not match expected value " << qUtf8Printable(expected);
+            << expected;
     }
 }

tests/src/LimitedQueue.cpp

@@ -1,6 +1,6 @@
 #include "messages/LimitedQueue.hpp"
 
-#include <gtest/gtest.h>
+#include "Test.hpp"
 
 #include <vector>
 

tests/src/LinkInfo.cpp

@@ -2,8 +2,7 @@
 
 #include "common/Literals.hpp"
 #include "SignalSpy.hpp"
-
+#include "Test.hpp"
-#include <gtest/gtest.h>
 
 using namespace chatterino;
 using namespace literals;

tests/src/LinkParser.cpp

@@ -1,8 +1,7 @@
 #include "common/LinkParser.hpp"
 
-#include "TestHelpers.hpp"
+#include "Test.hpp"
 
-#include <gtest/gtest.h>
 #include <QString>
 #include <QStringList>
 

tests/src/Literals.cpp

@@ -1,6 +1,6 @@
 #include "common/Literals.hpp"
 
-#include <gtest/gtest.h>
+#include "Test.hpp"
 
 using namespace chatterino::literals;
 

tests/src/MessageLayout.cpp

@@ -10,8 +10,8 @@
 #include "singletons/Settings.hpp"
 #include "singletons/Theme.hpp"
 #include "singletons/WindowManager.hpp"
+#include "Test.hpp"
 
-#include <gtest/gtest.h>
 #include <QDebug>
 #include <QString>
 

tests/src/NetworkCommon.cpp

@@ -1,6 +1,6 @@
 #include "common/network/NetworkCommon.hpp"
 
-#include <gtest/gtest.h>
+#include "Test.hpp"
 
 using namespace chatterino;
 

tests/src/NetworkRequest.cpp

@@ -2,8 +2,8 @@
 
 #include "common/network/NetworkManager.hpp"
 #include "common/network/NetworkResult.hpp"
+#include "Test.hpp"
 
-#include <gtest/gtest.h>
 #include <QCoreApplication>
 
 using namespace chatterino;

tests/src/NetworkResult.cpp

@@ -1,6 +1,6 @@
 #include "common/network/NetworkResult.hpp"
 
-#include <gtest/gtest.h>
+#include "Test.hpp"
 
 using namespace chatterino;
 

tests/src/NotebookTab.cpp

@@ -7,10 +7,9 @@
 #include "singletons/Fonts.hpp"
 #include "singletons/Settings.hpp"
 #include "singletons/Theme.hpp"
+#include "Test.hpp"
 #include "widgets/Notebook.hpp"
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
 #include <QDebug>
 #include <QString>
 

tests/src/QMagicEnum.cpp

@@ -2,8 +2,7 @@
 
 #include "common/FlagsEnum.hpp"
 #include "common/Literals.hpp"
-
+#include "Test.hpp"
-#include <gtest/gtest.h>
 
 using namespace chatterino;
 using namespace literals;

tests/src/RatelimitBucket.cpp

@@ -1,6 +1,7 @@
 #include "util/RatelimitBucket.hpp"
 
-#include <gtest/gtest.h>
+#include "Test.hpp"
+
 #include <QApplication>
 #include <QDebug>
 #include <QtConcurrent>

tests/src/Selection.cpp

@@ -1,6 +1,6 @@
 #include "messages/Selection.hpp"
 
-#include <gtest/gtest.h>
+#include "Test.hpp"
 
 using namespace chatterino;
 

tests/src/SeventvEventAPI.cpp

@@ -3,8 +3,8 @@
 #include "providers/seventv/eventapi/Client.hpp"
 #include "providers/seventv/eventapi/Dispatch.hpp"
 #include "providers/seventv/eventapi/Message.hpp"
+#include "Test.hpp"
 
-#include <gtest/gtest.h>
 #include <QString>
 
 #include <optional>

tests/src/SplitInput.cpp

@@ -12,11 +12,10 @@
 #include "singletons/Settings.hpp"
 #include "singletons/Theme.hpp"
 #include "singletons/WindowManager.hpp"
+#include "Test.hpp"
 #include "widgets/Notebook.hpp"
 #include "widgets/splits/Split.hpp"
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
 #include <QDebug>
 #include <QString>
 
@@ -110,9 +109,8 @@ TEST_P(SplitInputTest, Reply)
     auto reply = MessagePtr(message);
     this->input.setReply(reply);
     QString actual = this->input.getInputText();
-    ASSERT_EQ(expected, actual)
+    ASSERT_EQ(expected, actual) << "Input text after setReply should be '"
-        << "Input text after setReply should be '" << qUtf8Printable(expected)
+                                << expected << "', but got '" << actual << "'";
-        << "', but got '" << qUtf8Printable(actual) << "'";
 }
 
 INSTANTIATE_TEST_SUITE_P(

tests/src/Test.cpp

@@ -0,0 +1,42 @@
+#include "Test.hpp"
+
+#include <QString>
+#include <QStringView>
+
+std::ostream &operator<<(std::ostream &os, QStringView str)
+{
+    os << str.toString().toStdString();
+    return os;
+}
+
+std::ostream &operator<<(std::ostream &os, const QByteArray &bytes)
+{
+    os << std::string_view{bytes.data(), static_cast<size_t>(bytes.size())};
+    return os;
+}
+
+std::ostream &operator<<(std::ostream &os, const QString &str)
+{
+    os << str.toStdString();
+    return os;
+}
+
+// The PrintTo overloads use UniversalPrint to print strings in quotes.
+// Even though this uses testing::internal, this is publically documented in
+// gtest/gtest-printers.h.
+
+void PrintTo(const QByteArray &bytes, std::ostream *os)
+{
+    ::testing::internal::UniversalPrint(bytes.toStdString(), os);
+}
+
+void PrintTo(QStringView str, std::ostream *os)
+{
+    ::testing::internal::UniversalPrint(
+        std::u16string{str.utf16(), static_cast<size_t>(str.size())}, os);
+}
+
+void PrintTo(const QString &str, std::ostream *os)
+{
+    ::testing::internal::UniversalPrint(str.toStdU16String(), os);
+}

tests/src/Test.hpp

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <ostream>
+
+class QString;
+class QStringView;
+class QByteArray;
+
+// This file is included in all TUs in chatterino-test to avoid ODR violations.
+std::ostream &operator<<(std::ostream &os, QStringView str);
+std::ostream &operator<<(std::ostream &os, const QByteArray &bytes);
+std::ostream &operator<<(std::ostream &os, const QString &str);
+
+// NOLINTBEGIN(readability-identifier-naming)
+// PrintTo is used for naming parameterized tests, and is part of gtest
+void PrintTo(const QByteArray &bytes, std::ostream *os);
+void PrintTo(QStringView str, std::ostream *os);
+void PrintTo(const QString &str, std::ostream *os);
+// NOLINTEND(readability-identifier-naming)

tests/src/TestHelpers.hpp

@@ -1,66 +0,0 @@
-#pragma once
-
-#include <QString>
-#include <QStringView>
-
-#include <mutex>
-#include <ostream>
-
-template <typename T>
-class ReceivedMessage
-{
-    mutable std::mutex mutex;
-
-    bool isSet{false};
-    T t;
-
-public:
-    ReceivedMessage() = default;
-
-    explicit operator bool() const
-    {
-        std::unique_lock lock(this->mutex);
-
-        return this->isSet;
-    }
-
-    ReceivedMessage &operator=(const T &newT)
-    {
-        std::unique_lock lock(this->mutex);
-
-        this->isSet = true;
-        this->t = newT;
-
-        return *this;
-    }
-
-    bool operator==(const T &otherT) const
-    {
-        std::unique_lock lock(this->mutex);
-
-        return this->t == otherT;
-    }
-
-    const T *operator->() const
-    {
-        return &this->t;
-    }
-};
-
-inline std::ostream &operator<<(std::ostream &os, const QStringView &str)
-{
-    os << qUtf8Printable(str.toString());
-    return os;
-}
-
-inline std::ostream &operator<<(std::ostream &os, const QByteArray &bytes)
-{
-    os << bytes.toStdString();
-    return os;
-}
-
-inline std::ostream &operator<<(std::ostream &os, const QString &str)
-{
-    os << qUtf8Printable(str);
-    return os;
-}

tests/src/TwitchMessageBuilder.cpp

@@ -15,9 +15,8 @@
 #include "providers/seventv/SeventvBadges.hpp"
 #include "providers/twitch/TwitchBadge.hpp"
 #include "singletons/Emotes.hpp"
-#include "TestHelpers.hpp"
+#include "Test.hpp"
 
-#include <gtest/gtest.h>
 #include <IrcConnection>
 #include <QDebug>
 #include <QString>

tests/src/TwitchPubSubClient.cpp

@@ -4,12 +4,12 @@
 #include "providers/twitch/pubsubmessages/AutoMod.hpp"
 #include "providers/twitch/pubsubmessages/Whisper.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
-#include "TestHelpers.hpp"
+#include "Test.hpp"
 
-#include <gtest/gtest.h>
 #include <QString>
 
 #include <chrono>
+#include <mutex>
 #include <optional>
 
 using namespace chatterino;
@@ -33,6 +33,47 @@ using namespace std::chrono_literals;
 
 #ifdef RUN_PUBSUB_TESTS
 
+template <typename T>
+class ReceivedMessage
+{
+    mutable std::mutex mutex;
+
+    bool isSet{false};
+    T t;
+
+public:
+    ReceivedMessage() = default;
+
+    explicit operator bool() const
+    {
+        std::unique_lock lock(this->mutex);
+
+        return this->isSet;
+    }
+
+    ReceivedMessage &operator=(const T &newT)
+    {
+        std::unique_lock lock(this->mutex);
+
+        this->isSet = true;
+        this->t = newT;
+
+        return *this;
+    }
+
+    bool operator==(const T &otherT) const
+    {
+        std::unique_lock lock(this->mutex);
+
+        return this->t == otherT;
+    }
+
+    const T *operator->() const
+    {
+        return &this->t;
+    }
+};
+
 class FTest : public PubSub
 {
 public:

tests/src/Updates.cpp

@@ -1,8 +1,8 @@
 #include "singletons/Updates.hpp"
 
 #include "common/Version.hpp"
+#include "Test.hpp"
 
-#include <gtest/gtest.h>
 #include <semver/semver.hpp>
 
 using namespace chatterino;

tests/src/UtilTwitch.cpp

@@ -1,6 +1,6 @@
+#include "Test.hpp"
 #include "util/Twitch.hpp"
 
-#include <gtest/gtest.h>
 #include <QApplication>
 #include <QDebug>
 #include <QtConcurrent>
@@ -72,9 +72,8 @@ TEST(UtilTwitch, StripUserName)
         stripUserName(userName);
 
         EXPECT_EQ(userName, expectedUserName)
-            << qUtf8Printable(userName) << " (" << qUtf8Printable(inputUserName)
+            << userName << " (" << inputUserName
-            << ") did not match expected value "
+            << ") did not match expected value " << expectedUserName;
-            << qUtf8Printable(expectedUserName);
     }
 }
 
@@ -153,10 +152,8 @@ TEST(UtilTwitch, StripChannelName)
         stripChannelName(userName);
 
         EXPECT_EQ(userName, expectedChannelName)
-            << qUtf8Printable(userName) << " ("
+            << userName << " (" << inputChannelName
-            << qUtf8Printable(inputChannelName)
+            << ") did not match expected value " << expectedChannelName;
-            << ") did not match expected value "
-            << qUtf8Printable(expectedChannelName);
     }
 }
 
@@ -259,14 +256,12 @@ TEST(UtilTwitch, ParseUserNameOrID)
         auto [actualUserName, actualUserID] = parseUserNameOrID(input);
 
         EXPECT_EQ(actualUserName, expectedUserName)
-            << "name " << qUtf8Printable(actualUserName) << " ("
+            << "name " << actualUserName << " (" << input
-            << qUtf8Printable(input) << ") did not match expected value "
+            << ") did not match expected value " << expectedUserName;
-            << qUtf8Printable(expectedUserName);
 
         EXPECT_EQ(actualUserID, expectedUserID)
-            << "id " << qUtf8Printable(actualUserID) << " ("
+            << "id " << actualUserID << " (" << input
-            << qUtf8Printable(input) << ") did not match expected value "
+            << ") did not match expected value " << expectedUserID;
-            << qUtf8Printable(expectedUserID);
     }
 }
 
@@ -319,7 +314,7 @@ TEST(UtilTwitch, UserLoginRegexp)
         auto actual = regexp.match(inputUserLogin);
 
         EXPECT_EQ(match.hasMatch(), expectedMatch)
-            << qUtf8Printable(inputUserLogin) << " did not match as expected";
+            << inputUserLogin << " did not match as expected";
     }
 }
 
@@ -371,7 +366,7 @@ TEST(UtilTwitch, UserNameRegexp)
         auto actual = regexp.match(inputUserLogin);
 
         EXPECT_EQ(match.hasMatch(), expectedMatch)
-            << qUtf8Printable(inputUserLogin) << " did not match as expected";
+            << inputUserLogin << " did not match as expected";
     }
 }
 
@@ -405,8 +400,7 @@ TEST(UtilTwitch, CleanHelixColor)
         cleanHelixColorName(actualColor);
 
         EXPECT_EQ(actualColor, expectedColor)
-            << qUtf8Printable(inputColor) << " cleaned up to "
+            << inputColor << " cleaned up to " << actualColor << " instead of "
-            << qUtf8Printable(actualColor) << " instead of "
+            << expectedColor;
-            << qUtf8Printable(expectedColor);
     }
 }

tests/src/XDGDesktopFile.cpp

@@ -1,6 +1,7 @@
 #include "util/XDGDesktopFile.hpp"
 
-#include <gtest/gtest.h>
+#include "Test.hpp"
+
 #include <QDebug>
 
 #if defined(Q_OS_UNIX) and !defined(Q_OS_DARWIN)

tests/src/XDGHelper.cpp

@@ -1,8 +1,7 @@
 #include "util/XDGHelper.hpp"
 
-#include "TestHelpers.hpp"
+#include "Test.hpp"
 
-#include <gtest/gtest.h>
 #include <QDebug>
 
 #if defined(Q_OS_UNIX) and !defined(Q_OS_DARWIN)

tests/src/main.cpp

@@ -1,8 +1,8 @@
 #include "common/network/NetworkManager.hpp"
 #include "singletons/Resources.hpp"
 #include "singletons/Settings.hpp"
+#include "Test.hpp"
 
-#include <gtest/gtest.h>
 #include <QApplication>
 #include <QJsonArray>
 #include <QLoggingCategory>