chore: remove LogSilencers from tests

Change-Id: I413f05fa409294978b470afd393eb6fa02867fba
KDAB · Jun 7, 2024 · 2cde028 · 2cde028
1 parent 2350058
commit 2cde028
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 72 deletions.
diff --git a/docs/contributing/unit-tests.md b/docs/contributing/unit-tests.md
@@ -11,16 +11,6 @@ Tests written using the QtTest module.
 There are some utility classes you can use:
 
 - `Test::testDataPath()`: returns the test data folder path
-- `Test::LogSilencers`: silence logs during the tests
-```cpp
-// Silence multiple logs
-auto ls = Test::LogSilencers {"cpp_client", "cpp_server", "cpp_messages"};
-
-// Silence the default log
-Test::LogSilencers ls;
-```
-
-
 - `Test::FileTester`: create an original file based on the original one, and compare the result with an expected one
 
 ```cpp

diff --git a/tests/common/test_utils.h b/tests/common/test_utils.h
@@ -131,50 +131,7 @@ class LogCounter
     std::shared_ptr<spdlog::sinks::callback_sink_mt> m_sink;
 };
 
-class LogSilencer
-{
-public:
-    inline static std::string Default = "";
-
-    LogSilencer(const std::string &name = Default)
-    {
-        if (name.empty())
-            m_logger = spdlog::default_logger();
-        else
-            m_logger = spdlog::get(name);
-        if (m_logger) {
-            m_level = m_logger->level();
-            m_logger->set_level(spdlog::level::off);
-        }
-    }
-    ~LogSilencer()
-    {
-        if (m_logger) {
-            m_logger->set_level(m_level);
-        }
-    }
-
-    LogSilencer(LogSilencer &&) noexcept = default;
-    LogSilencer &operator=(LogSilencer &&) noexcept = default;
-
-private:
-    spdlog::level::level_enum m_level = spdlog::level::off;
-    std::shared_ptr<spdlog::logger> m_logger;
-};
-
-class LogSilencers
-{
-public:
-    LogSilencers(std::initializer_list<std::string> names)
-    {
-        m_logs.reserve(names.size());
-        for (const auto &name : names)
-            m_logs.emplace_back(name);
-    }
-
-private:
-    std::vector<LogSilencer> m_logs;
-};
+// *****************************************************************************
 
 constexpr inline bool noClangd()
 {

diff --git a/tests/tst_client.cpp b/tests/tst_client.cpp
@@ -27,7 +27,6 @@ private slots:
         CHECK_CLANGD;
 
         Lsp::Client client("cpp", "clangd", {"--log=verbose", "--pretty"});
-        auto logs = Test::LogSilencers {"cpp_client", "cpp_server", "cpp_messages"};
 
         QVERIFY(client.initialize(Test::testDataPath()));
         QCOMPARE(client.state(), Lsp::Client::Initialized);
@@ -40,7 +39,6 @@ private slots:
         CHECK_CLANGD;
 
         Lsp::Client client("cpp", "clangd", {"--log=verbose", "--pretty"});
-        auto logs = Test::LogSilencers {"cpp_client", "cpp_server", "cpp_messages"};
 
         client.initialize(Test::testDataPath() + "/tst_client");
 
@@ -63,7 +61,6 @@ private slots:
         CHECK_CLANGD;
 
         Lsp::Client client("cpp", "clangd", {"--log=verbose", "--pretty"});
-        auto logs = Test::LogSilencers {"cpp_client", "cpp_server", "cpp_messages"};
 
         client.initialize(Test::testDataPath() + "/tst_client");
 

diff --git a/tests/tst_clientbackend.cpp b/tests/tst_clientbackend.cpp
@@ -29,7 +29,6 @@ private slots:
         CHECK_CLANGD;
 
         Lsp::ClientBackend client("cpp", "clangd", {});
-        // auto logs = Test::LogSilencers {"cpp_server", "cpp_messages"};
 
         QSignalSpy errorOccured(&client, &Lsp::ClientBackend::errorOccured);
         QSignalSpy finished(&client, &Lsp::ClientBackend::finished);
@@ -59,7 +58,6 @@ private slots:
         CHECK_CLANGD;
 
         Lsp::ClientBackend client("cpp", "clangd", {});
-        auto logs = Test::LogSilencers {"cpp_server", "cpp_messages"};
 
         QSignalSpy errorOccured(&client, &Lsp::ClientBackend::errorOccured);
         QSignalSpy finished(&client, &Lsp::ClientBackend::finished);

diff --git a/tests/tst_rcparser.cpp b/tests/tst_rcparser.cpp
@@ -25,7 +25,6 @@ class TestRcParser : public QObject
 private slots:
     void testDialog()
     {
-        Test::LogSilencer ls;
         RcFile rcFile = parse(Test::testDataPath() + "/rcfiles/dialog/dialog.rc");
 
         QCOMPARE(rcFile.isValid, true);
@@ -60,7 +59,6 @@ private slots:
 
     void testAccelerator()
     {
-        Test::LogSilencer ls;
         RcFile rcFile = parse(Test::testDataPath() + "/rcfiles/accelerators/Accelerators.rc");
 
         QCOMPARE(rcFile.isValid, true);
@@ -80,7 +78,6 @@ private slots:
 
     void testLuaDebugger()
     {
-        Test::LogSilencer ls;
         RcFile rcFile = parse(Test::testDataPath() + "/rcfiles/luaDebugger/LuaDebugger.rc");
 
         QCOMPARE(rcFile.isValid, true);
@@ -135,21 +132,18 @@ private slots:
 
     void test2048Game()
     {
-        Test::LogSilencer ls;
         RcFile rcFile = parse(Test::testDataPath() + "/rcfiles/2048Game/2048Game.rc");
         QCOMPARE(rcFile.isValid, true);
     }
 
     void testCryEdit()
     {
-        Test::LogSilencer ls;
         RcFile rcFile = parse(Test::testDataPath() + "/rcfiles/cryEdit/CryEdit.rc");
         QCOMPARE(rcFile.isValid, true);
     }
 
     void testRibbon()
     {
-        Test::LogSilencer ls;
         RcFile rcFile = parse(Test::testDataPath() + "/rcfiles/ribbonexample/RibbonExample.rc");
         QCOMPARE(rcFile.isValid, true);
 

diff --git a/tests/tst_rcwriter.cpp b/tests/tst_rcwriter.cpp
@@ -28,7 +28,6 @@ private slots:
 
     void testQrc()
     {
-        Test::LogSilencer ls;
         RcFile rcFile = parse(Test::testDataPath() + "/rcfiles/2048Game/2048Game.rc");
         auto data = rcFile.data.value("LANG_ENGLISH;SUBLANG_ENGLISH_US");
 
@@ -65,7 +64,6 @@ private slots:
 
     void testConvertDialog()
     {
-        Test::LogSilencer ls;
         RcFile rcFile = parse(Test::testDataPath() + "/rcfiles/2048Game/2048Game.rc");
         auto usData = rcFile.data.value("LANG_ENGLISH;SUBLANG_ENGLISH_US");
         auto result = convertDialog(usData, usData.dialogs.first(), RcCore::Widget::AllFlags);
@@ -90,7 +88,6 @@ private slots:
 
     void testWriteDialog()
     {
-        Test::LogSilencer ls;
         RcFile rcFile = parse(Test::testDataPath() + "/rcfiles/cryEdit/CryEdit.rc");
         auto data = rcFile.data.value("LANG_ENGLISH;SUBLANG_ENGLISH_US");
 
@@ -125,7 +122,6 @@ private slots:
 
     void testConvertAction()
     {
-        Test::LogSilencer ls;
         RcFile rcFile = parse(Test::testDataPath() + "/rcfiles/2048Game/2048Game.rc");
         auto data = rcFile.data.value("LANG_ENGLISH;SUBLANG_ENGLISH_US");
 

diff --git a/tests/tst_settings.cpp b/tests/tst_settings.cpp
@@ -40,7 +40,6 @@ private slots:
 
     void load()
     {
-        Test::LogSilencer ls;
         SettingsFixture settings;
 
         // Default values
@@ -62,7 +61,6 @@ private slots:
 
     void getValue()
     {
-        Test::LogSilencer ls;
         SettingsFixture settings;
 
         settings.loadProjectSettings(Test::testDataPath() + "/tst_settings");
@@ -87,7 +85,6 @@ private slots:
     void setValue()
     {
         Test::FileTester file(Test::testDataPath() + "/tst_settings/setValue/knut.json");
-        Test::LogSilencer ls;
         SettingsFixture settings;
         QSignalSpy settingsSaved(&settings, &Core::Settings::settingsSaved);