summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-02-25 15:16:17 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-13 13:26:26 +0100
commit2350c7e35c7b21ab86e54e43d1e1bfddb1746922 (patch)
tree5a3c9ea48ad5b7e73538af418c3b525fcbc71bed /tests/auto
parentb3871dc8049819ae3e095555f451457567eb4ee3 (diff)
Make parsing of categories in logging rules more strict
Do not accept rules with wildcards in the middle. Change-Id: If6fa71629c46bc4127aa8bd475643bc0e8a9f57c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp b/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
index 56545bb909..5796b2f221 100644
--- a/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
+++ b/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
@@ -152,6 +152,14 @@ private slots:
<< QString("*qt.*.debug") << QString("qt.io") << QtDebugMsg << Match;
QTest::newRow("_star_.qt._star_.warning-qt.io")
<< QString("*.qt.*.warning") << QString("qt.io") << QtDebugMsg << NoMatch;
+ QTest::newRow("**")
+ << QString("**") << QString("qt.core.io") << QtDebugMsg << Match;
+
+ // * outside of start/end
+ QTest::newRow("qt.*.io")
+ << QString("qt.*.io") << QString("qt.core.io") << QtDebugMsg << Invalid;
+ QTest::newRow("***")
+ << QString("***") << QString("qt.core.io") << QtDebugMsg << Invalid;
}
void QLoggingRule_parse()