1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QLoggingRegistry: don't create a new QLoggingRegistry

Browse Source 
The class assumes it's a singleton.

Change-Id: I81901b5bfd0008f58bf5fffda82da4179589a7cb
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Thiago Macieira 2025-03-29 12:53:48 -04:00
parent 219e9fe7a2
commit d5a8339f65
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/io/qloggingregistry_p.h
View File

@ -99,7 +99,7 @@ class QLoggingRegistry
{ {
Q_DISABLE_COPY_MOVE(QLoggingRegistry) Q_DISABLE_COPY_MOVE(QLoggingRegistry)
public: public:
Q_AUTOTEST_EXPORT QLoggingRegistry(); QLoggingRegistry();
Q_AUTOTEST_EXPORT void initializeRules(); Q_AUTOTEST_EXPORT void initializeRules();

10
tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
View File

@ -232,12 +232,14 @@ private slots:
out << "Digia.*=false\n"; out << "Digia.*=false\n";
file.close(); file.close();
QLoggingRegistry registry; QLoggingRegistry &registry = *QLoggingRegistry::instance();
auto cleanup = qScopeGuard([&] {
file.remove();
registry.initializeRules(); // reset rules
});
registry.initializeRules(); registry.initializeRules();
QCOMPARE(registry.ruleSets[QLoggingRegistry::ConfigRules].size(), 1); QCOMPARE(registry.ruleSets[QLoggingRegistry::ConfigRules].size(), 1);
// remove file again
QVERIFY(file.remove());
} }
void QLoggingRegistry_rulePriorities() void QLoggingRegistry_rulePriorities()