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

Remove redundant class from QStringMatcher test. 

The removed class was evidently attempting to promote protected members
of its base class to public, but the way this was done doesn't work and
doing so wasn't actually necessary for the test.

Change-Id: I15e0c31891da08cacee1054e15596a79a058b466
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
bb10
Jason McDonald 2012-01-06 15:44:02 +10:00 committed by Qt by Nokia
parent e6b9382ae2
commit db0361e9b1
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/auto/corelib/tools/qstringmatcher/tst_qstringmatcher.cpp
View File

@ -56,15 +56,9 @@ private slots:
void assignOperator();
};
// Subclass that exposes the protected functions.
class SubQStringMatcher : public QStringMatcher
{
public:
};
void tst_QStringMatcher::qstringmatcher()
{
SubQStringMatcher matcher;
QStringMatcher matcher;
QCOMPARE(matcher.caseSensitivity(), Qt::CaseSensitive);
QCOMPARE(matcher.indexIn("foo", 1), 1);
QCOMPARE(matcher.pattern(), QString());
@ -73,7 +67,7 @@ void tst_QStringMatcher::qstringmatcher()
// public Qt::CaseSensitivity caseSensitivity() const
void tst_QStringMatcher::caseSensitivity()
{
SubQStringMatcher matcher;
QStringMatcher matcher;
matcher.setCaseSensitivity(Qt::CaseSensitive);
QCOMPARE(matcher.caseSensitivity(), Qt::CaseSensitive);
@ -106,7 +100,7 @@ void tst_QStringMatcher::indexIn()
QFETCH(int, from);
QFETCH(int, indexIn);
SubQStringMatcher matcher;
QStringMatcher matcher;
matcher.setPattern(needle);
QCOMPARE(matcher.indexIn(haystack, from), indexIn);
@ -133,7 +127,7 @@ void tst_QStringMatcher::setCaseSensitivity()
QFETCH(int, indexIn);
QFETCH(int, cs);
SubQStringMatcher matcher;
QStringMatcher matcher;
matcher.setPattern(needle);
matcher.setCaseSensitivity(static_cast<Qt::CaseSensitivity> (cs));