summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2020-03-05 15:52:29 +0100
committerMarc Mutz <marc.mutz@kdab.com>2021-06-16 13:22:18 +0200
commit9648ffff7efbb3582506184191411197c9099c69 (patch)
tree2bf3389c6e5639269746847331d8f237bb4b96af /tests
parent6ce44c53c7aa802b817b72d49de88e4da0181488 (diff)
QLoggingSettingsParser: port setContent() to QStringView
Amends 16f927a4f1ffeff399351b625d73ac3cd7bccd51. At the time the original change was written, QStringTokenizer had not been integrated, yet. Change-Id: I83c31d816199bc48c4baea855d13cbf9eda9aaa2 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp b/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
index d13be425bf..d46dc4b98c 100644
--- a/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
+++ b/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
@@ -182,24 +182,24 @@ private slots:
// default category, and optional ...
//
QLoggingSettingsParser parser;
- parser.setContent("[Rules]\n"
- "default=false\n"
- "default=true");
+ parser.setContent(u"[Rules]\n"
+ "default=false\n"
+ "default=true");
QCOMPARE(parser.rules().size(), 2);
- parser.setContent("[Rules]\n"
- "default=false");
+ parser.setContent(u"[Rules]\n"
+ "default=false");
QCOMPARE(parser.rules().size(), 1);
// QSettings escapes * to %2A when writing.
- parser.setContent("[Rules]\n"
- "module.%2A=false");
+ parser.setContent(u"[Rules]\n"
+ "module.%2A=false");
QCOMPARE(parser.rules().size(), 1);
QCOMPARE(parser.rules().first().category, QString("module."));
QCOMPARE(parser.rules().first().flags, QLoggingRule::LeftFilter);
- parser.setContent("[OtherSection]\n"
- "default=false");
+ parser.setContent(u"[OtherSection]\n"
+ "default=false");
QCOMPARE(parser.rules().size(), 0);
}
@@ -290,7 +290,7 @@ private slots:
// set Config rule
QLoggingSettingsParser parser;
- parser.setContent("[Rules]\nDigia.*=false");
+ parser.setContent(u"[Rules]\nDigia.*=false");
registry->ruleSets[QLoggingRegistry::ConfigRules] = parser.rules();
registry->updateRules();
@@ -302,7 +302,7 @@ private slots:
QVERIFY(cat.isWarningEnabled());
// set Env rule, should overwrite Config one
- parser.setContent("Digia.*=false");
+ parser.setContent(u"Digia.*=false");
registry->ruleSets[QLoggingRegistry::EnvironmentRules] = parser.rules();
registry->updateRules();
@@ -316,10 +316,10 @@ private slots:
QTest::ignoreMessage(QtWarningMsg, "Ignoring malformed logging rule: '***=false'");
QTest::ignoreMessage(QtWarningMsg, "Ignoring malformed logging rule: '*=0'");
QTest::ignoreMessage(QtWarningMsg, "Ignoring malformed logging rule: '*=TRUE'");
- parser.setContent("[Rules]\n"
- "***=false\n"
- "*=0\n"
- "*=TRUE\n");
+ parser.setContent(u"[Rules]\n"
+ "***=false\n"
+ "*=0\n"
+ "*=TRUE\n");
QVERIFY(parser.rules().isEmpty());
}
};