whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QRegularExpression: strenghten tests of matching at an offset 

Instead of simply doing a match against a string S at offset O > 0
(and checking the result), test that the results never change when matching
against the substring starting at (O - i) at offset i, 0 <= i <= O.

Change-Id: Ib7fd648ca0a36b93d145267ebfb792c46ca4e4f5
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
bb10
Giuseppe D'Angelo 2014-09-02 09:10:20 +02:00
parent 648587fbdc
commit 8530aaf1c8
1 changed files with 58 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp
View File

@ -610,6 +610,7 @@ void tst_QRegularExpression::normalMatch_data()
QTest::addColumn<Match>("match");
Match m;
int offset = 0;
m.clear();
m.isValid = true; m.hasMatch = true;
@ -661,20 +662,28 @@ void tst_QRegularExpression::normalMatch_data()
m.clear();
m.isValid = true; m.hasMatch = true;
m.captured << "c123def" << "c12" << "3" << "def";
QTest::newRow("match06") << QRegularExpression("(\\w*)(\\d+)(\\w*)")
<< "abc123def"
<< 2
<< QRegularExpression::MatchOptions(QRegularExpression::NoMatchOption)
<< m;
offset = 2;
for (int i = 0; i <= offset; ++i) {
QTest::newRow(QStringLiteral("match06-offset%1").arg(i).toUtf8().constData())
<< QRegularExpression("(\\w*)(\\d+)(\\w*)")
<< QStringLiteral("abc123def").mid(offset - i)
<< i
<< QRegularExpression::MatchOptions(QRegularExpression::NoMatchOption)
<< m;
}
m.clear();
m.isValid = true; m.hasMatch = true;
m.captured << QString("");
QTest::newRow("match07") << QRegularExpression("\\w*")
<< "abc123def"
<< 9
<< QRegularExpression::MatchOptions(QRegularExpression::NoMatchOption)
<< m;
offset = 9;
for (int i = 0; i <= offset; ++i) {
QTest::newRow(QStringLiteral("match07-offset%1").arg(i).toUtf8().constData())
<< QRegularExpression("\\w*")
<< QStringLiteral("abc123def").mid(offset - i)
<< i
<< QRegularExpression::MatchOptions(QRegularExpression::NoMatchOption)
<< m;
}
m.clear();
m.isValid = true; m.hasMatch = true;
@ -732,19 +741,27 @@ void tst_QRegularExpression::normalMatch_data()
m.clear();
m.isValid = true;
QTest::newRow("nomatch02") << QRegularExpression("(\\w+) (\\w+)")
<< "a string"
<< 1
<< QRegularExpression::MatchOptions(QRegularExpression::NoMatchOption)
<< m;
offset = 1;
for (int i = 0; i <= offset; ++i) {
QTest::newRow(QStringLiteral("nomatch02-offset%1").arg(i).toUtf8().constData())
<< QRegularExpression("(\\w+) (\\w+)")
<< QStringLiteral("a string").mid(offset - i)
<< i
<< QRegularExpression::MatchOptions(QRegularExpression::NoMatchOption)
<< m;
}
m.clear();
m.isValid = true;
QTest::newRow("nomatch03") << QRegularExpression("\\w+")
<< "abc123def"
<< 9
<< QRegularExpression::MatchOptions(QRegularExpression::NoMatchOption)
<< m;
offset = 9;
for (int i = 0; i <= offset; ++i) {
QTest::newRow(QStringLiteral("nomatch03-offset%1").arg(i).toUtf8().constData())
<< QRegularExpression("\\w+")
<< QStringLiteral("abc123def").mid(offset - i)
<< i
<< QRegularExpression::MatchOptions(QRegularExpression::NoMatchOption)
<< m;
}
// ***
@ -832,6 +849,7 @@ void tst_QRegularExpression::partialMatch_data()
QTest::addColumn<Match>("match");
Match m;
int offset = 0;
m.clear();
m.isValid = true; m.hasPartialMatch = true;
@ -906,12 +924,16 @@ void tst_QRegularExpression::partialMatch_data()
m.clear();
m.isValid = true; m.hasPartialMatch = true;
m.captured << "def";
QTest::newRow("softmatch08") << QRegularExpression("abc\\w+X|defY")
<< "abcdef"
<< 1
<< QRegularExpression::PartialPreferCompleteMatch
<< QRegularExpression::MatchOptions(QRegularExpression::NoMatchOption)
<< m;
offset = 1;
for (int i = 0; i <= offset; ++i) {
QTest::newRow(QStringLiteral("softmatch08-offset%1").arg(i).toUtf8().constData())
<< QRegularExpression("abc\\w+X|defY")
<< QStringLiteral("abcdef").mid(offset - i)
<< i
<< QRegularExpression::PartialPreferCompleteMatch
<< QRegularExpression::MatchOptions(QRegularExpression::NoMatchOption)
<< m;
}
// ***
@ -988,12 +1010,16 @@ void tst_QRegularExpression::partialMatch_data()
m.clear();
m.isValid = true; m.hasPartialMatch = true;
m.captured << "def";
QTest::newRow("hardmatch08") << QRegularExpression("abc\\w+X|defY")
<< "abcdef"
<< 1
<< QRegularExpression::PartialPreferFirstMatch
<< QRegularExpression::MatchOptions(QRegularExpression::NoMatchOption)
<< m;
offset = 1;
for (int i = 0; i <= offset; ++i) {
QTest::newRow(QStringLiteral("hardmatch08-offset%1").arg(i).toUtf8().constData())
<< QRegularExpression("abc\\w+X|defY")
<< QStringLiteral("abcdef").mid(offset - i)
<< i
<< QRegularExpression::PartialPreferFirstMatch
<< QRegularExpression::MatchOptions(QRegularExpression::NoMatchOption)
<< m;
}
m.clear();
m.isValid = true; m.hasPartialMatch = true;