From d5a8339f65cf9f9102427fde9956056a3d596898 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 29 Mar 2025 12:53:48 -0400 Subject: [PATCH] tst_QLoggingRegistry: don't create a new QLoggingRegistry The class assumes it's a singleton. Change-Id: I81901b5bfd0008f58bf5fffda82da4179589a7cb Reviewed-by: Edward Welbourne --- src/corelib/io/qloggingregistry_p.h | 2 +- .../io/qloggingregistry/tst_qloggingregistry.cpp | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/corelib/io/qloggingregistry_p.h b/src/corelib/io/qloggingregistry_p.h index f4eec4ccfc3..28d64b7cf2c 100644 --- a/src/corelib/io/qloggingregistry_p.h +++ b/src/corelib/io/qloggingregistry_p.h @@ -99,7 +99,7 @@ class QLoggingRegistry { Q_DISABLE_COPY_MOVE(QLoggingRegistry) public: - Q_AUTOTEST_EXPORT QLoggingRegistry(); + QLoggingRegistry(); Q_AUTOTEST_EXPORT void initializeRules(); diff --git a/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp b/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp index b3af31ac27b..94e6bafa408 100644 --- a/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp +++ b/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp @@ -232,12 +232,14 @@ private slots: out << "Digia.*=false\n"; file.close(); - QLoggingRegistry registry; + QLoggingRegistry ®istry = *QLoggingRegistry::instance(); + auto cleanup = qScopeGuard([&] { + file.remove(); + registry.initializeRules(); // reset rules + }); + registry.initializeRules(); QCOMPARE(registry.ruleSets[QLoggingRegistry::ConfigRules].size(), 1); - - // remove file again - QVERIFY(file.remove()); } void QLoggingRegistry_rulePriorities()