From 5f7b48fd0fcc47267ad8ca5d96636fb4cf1c21dd Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Tue, 20 Jul 2021 10:15:42 +0200 Subject: [PATCH] Fix QString test compilation without QRegularExpression The QString itself can be compiled without QRegularExpression, but the tests do not check if they are supported or not. This patch fixes the issue by introducing the proper #ifdef guards. Task-number: QTBUG-91736 Change-Id: I797691f78a34d4f78a86af99c78bf06e26e846d1 Reviewed-by: Thiago Macieira (cherry picked from commit 59df5dacd55b607ec1b59864cfcc8ab86d38d537) Reviewed-by: Alex Blasche --- .../auto/corelib/text/qstring/tst_qstring.cpp | 117 +++++++++++++++++- 1 file changed, 113 insertions(+), 4 deletions(-) diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp index a0cd2dd79dd..4f9fa1ad0e9 100644 --- a/tests/auto/corelib/text/qstring/tst_qstring.cpp +++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp @@ -41,7 +41,9 @@ #include #include #include +#if QT_CONFIG(regularexpression) #include +#endif #include #include #include @@ -295,8 +297,10 @@ class tst_QString : public QObject { Q_OBJECT +#if QT_CONFIG(regularexpression) template void split_regexp(const QString &string, const QString &pattern, QStringList result); +#endif template void split(const QString &string, const QString &separator, QStringList result); @@ -367,15 +371,19 @@ private slots: void replace_string_data(); void replace_string(); void replace_string_extra(); +#if QT_CONFIG(regularexpression) void replace_regexp_data(); void replace_regexp(); void replace_regexp_extra(); +#endif void remove_uint_uint_data(); void remove_uint_uint(); void remove_string_data(); void remove_string(); +#if QT_CONFIG(regularexpression) void remove_regexp_data(); void remove_regexp(); +#endif void remove_extra(); void swap(); @@ -476,10 +484,12 @@ private slots: void count(); void lastIndexOf_data(); void lastIndexOf(); - void lastIndexOfInvalidRegex(); void indexOf_data(); void indexOf(); +#if QT_CONFIG(regularexpression) void indexOfInvalidRegex(); + void lastIndexOfInvalidRegex(); +#endif void indexOf2_data(); void indexOf2(); void indexOf3_data(); @@ -541,8 +551,10 @@ private slots: void reverseIterators(); void split_data(); void split(); +#if QT_CONFIG(regularexpression) void split_regularexpression_data(); void split_regularexpression(); +#endif void fromUtf16_data(); void fromUtf16(); void fromUtf16_char16_data() { fromUtf16_data(); } @@ -661,10 +673,12 @@ void tst_QString::remove_string_data() replace_string_data(); } +#if QT_CONFIG(regularexpression) void tst_QString::remove_regexp_data() { replace_regexp_data(); } +#endif void tst_QString::indexOf3_data() { @@ -851,6 +865,7 @@ void tst_QString::replace_string_data() QTest::newRow( "rep17" ) << QString("fooxybarxybazxyblub") << QString("xy") << QString("z") << QString("foozbarzbazzblub") << true; } +#if QT_CONFIG(regularexpression) void tst_QString::replace_regexp_data() { QTest::addColumn("string" ); @@ -892,6 +907,7 @@ void tst_QString::replace_regexp_data() << QString("\\0\\01\\011") << QString("\\0\\01\\011"); QTest::newRow("invalid") << QString("") << QString("invalid regex\\") << QString("") << QString(""); } +#endif void tst_QString::utf8_data() { @@ -1448,6 +1464,7 @@ void tst_QString::indexOf() QCOMPARE( haystack.indexOf(needle.toLatin1().data(), startpos, cs), resultpos ); } +#if QT_CONFIG(regularexpression) { QRegularExpression::PatternOptions options = QRegularExpression::NoPatternOption; if (!bcs) @@ -1468,6 +1485,7 @@ void tst_QString::indexOf() QVERIFY(match.captured().toLower() == needle.toLower()); } } +#endif if (cs == Qt::CaseSensitive) { QCOMPARE( haystack.indexOf(needle, startpos), resultpos ); @@ -1575,6 +1593,7 @@ void tst_QString::indexOf2() } } +#if QT_CONFIG(regularexpression) void tst_QString::indexOfInvalidRegex() { QTest::ignoreMessage(QtWarningMsg, "QString::indexOf: invalid QRegularExpression object"); @@ -1588,6 +1607,7 @@ void tst_QString::indexOfInvalidRegex() QCOMPARE(QString("invalid regex\\").indexOf(QRegularExpression("invalid regex\\"), -1, &match), -1); QVERIFY(!match.hasMatch()); } +#endif void tst_QString::lastIndexOf_data() { @@ -1648,6 +1668,7 @@ void tst_QString::lastIndexOf() QCOMPARE(haystack.lastIndexOf(needle.toLatin1(), from, cs), expected); QCOMPARE(haystack.lastIndexOf(needle.toLatin1().data(), from, cs), expected); +#if QT_CONFIG(regularexpression) if (from >= -1 && from < haystack.size() && needle.size() > 0) { // unfortunately, QString and QRegularExpression don't have the same out of bound semantics // I think QString is wrong -- See file log for contact information. @@ -1671,6 +1692,7 @@ void tst_QString::lastIndexOf() } } } +#endif if (cs == Qt::CaseSensitive) { QCOMPARE(haystack.lastIndexOf(needle, from), expected); @@ -1690,6 +1712,7 @@ void tst_QString::lastIndexOf() } } +#if QT_CONFIG(regularexpression) void tst_QString::lastIndexOfInvalidRegex() { QTest::ignoreMessage(QtWarningMsg, "QString::lastIndexOf: invalid QRegularExpression object"); @@ -1703,6 +1726,7 @@ void tst_QString::lastIndexOfInvalidRegex() QCOMPARE(QString("invalid regex\\").lastIndexOf(QRegularExpression("invalid regex\\"), -1, &match), -1); QVERIFY(!match.hasMatch()); } +#endif void tst_QString::count() { @@ -1717,16 +1741,46 @@ void tst_QString::count() QCOMPARE(a.count("FG",Qt::CaseInsensitive),3); QCOMPARE(a.count( QString(), Qt::CaseInsensitive), 16); QCOMPARE(a.count( "", Qt::CaseInsensitive), 16); +#if QT_CONFIG(regularexpression) QCOMPARE(a.count(QRegularExpression("")), 16); QCOMPARE(a.count(QRegularExpression("[FG][HI]")), 1); QCOMPARE(a.count(QRegularExpression("[G][HE]")), 2); QTest::ignoreMessage(QtWarningMsg, "QString::count: invalid QRegularExpression object"); QCOMPARE(a.count(QRegularExpression("invalid regex\\")), 0); +#endif CREATE_VIEW(QLatin1String("FG")); QCOMPARE(a.count(view),2); QCOMPARE(a.count(view,Qt::CaseInsensitive),3); QCOMPARE(a.count( QStringView(), Qt::CaseInsensitive), 16); + + QString nullStr; + QCOMPARE(nullStr.count(), 0); + QCOMPARE(nullStr.count('A'), 0); + QCOMPARE(nullStr.count("AB"), 0); + QCOMPARE(nullStr.count(view), 0); + QCOMPARE(nullStr.count(QString()), 1); + QCOMPARE(nullStr.count(""), 1); +#if QT_CONFIG(regularexpression) + QCOMPARE(nullStr.count(QRegularExpression("")), 1); + QCOMPARE(nullStr.count(QRegularExpression("[FG][HI]")), 0); + QTest::ignoreMessage(QtWarningMsg, "QString::count: invalid QRegularExpression object"); + QCOMPARE(nullStr.count(QRegularExpression("invalid regex\\")), 0); +#endif + + QString emptyStr(""); + QCOMPARE(emptyStr.count(), 0); + QCOMPARE(emptyStr.count('A'), 0); + QCOMPARE(emptyStr.count("AB"), 0); + QCOMPARE(emptyStr.count(view), 0); + QCOMPARE(emptyStr.count(QString()), 1); + QCOMPARE(emptyStr.count(""), 1); +#if QT_CONFIG(regularexpression) + QCOMPARE(emptyStr.count(QRegularExpression("")), 1); + QCOMPARE(emptyStr.count(QRegularExpression("[FG][HI]")), 0); + QTest::ignoreMessage(QtWarningMsg, "QString::count: invalid QRegularExpression object"); + QCOMPARE(emptyStr.count(QRegularExpression("invalid regex\\")), 0); +#endif } void tst_QString::contains() @@ -1744,6 +1798,7 @@ void tst_QString::contains() QVERIFY(a.contains(QLatin1String("fg"),Qt::CaseInsensitive)); QVERIFY(a.contains( QString(), Qt::CaseInsensitive)); QVERIFY(a.contains( "", Qt::CaseInsensitive)); +#if QT_CONFIG(regularexpression) QVERIFY(a.contains(QRegularExpression("[FG][HI]"))); QVERIFY(a.contains(QRegularExpression("[G][HE]"))); @@ -1796,13 +1851,44 @@ void tst_QString::contains() QVERIFY(!a.contains(QRegularExpression("ZZZ"), 0)); } + QTest::ignoreMessage(QtWarningMsg, "QString::contains: invalid QRegularExpression object"); + QVERIFY(!a.contains(QRegularExpression("invalid regex\\"))); +#endif + CREATE_VIEW(QLatin1String("FG")); QVERIFY(a.contains(view)); QVERIFY(a.contains(view, Qt::CaseInsensitive)); QVERIFY(a.contains( QStringView(), Qt::CaseInsensitive)); - QTest::ignoreMessage(QtWarningMsg, "QString::contains: invalid QRegularExpression object"); - QVERIFY(!a.contains(QRegularExpression("invalid regex\\"))); + QString nullStr; + QVERIFY(!nullStr.contains('A')); + QVERIFY(!nullStr.contains("AB")); + QVERIFY(!nullStr.contains(view)); +#if QT_CONFIG(regularexpression) + QVERIFY(!nullStr.contains(QRegularExpression("[FG][HI]"))); + QRegularExpressionMatch nullMatch; + QVERIFY(nullStr.contains(QRegularExpression(""), &nullMatch)); + QVERIFY(nullMatch.hasMatch()); + QCOMPARE(nullMatch.captured(), ""); + QCOMPARE(nullMatch.capturedStart(), 0); + QCOMPARE(nullMatch.capturedEnd(), 0); +#endif + QVERIFY(!nullStr.isDetached()); + + QString emptyStr(""); + QVERIFY(!emptyStr.contains('A')); + QVERIFY(!emptyStr.contains("AB")); + QVERIFY(!emptyStr.contains(view)); +#if QT_CONFIG(regularexpression) + QVERIFY(!emptyStr.contains(QRegularExpression("[FG][HI]"))); + QRegularExpressionMatch emptyMatch; + QVERIFY(emptyStr.contains(QRegularExpression(""), &emptyMatch)); + QVERIFY(emptyMatch.hasMatch()); + QCOMPARE(emptyMatch.captured(), ""); + QCOMPARE(emptyMatch.capturedStart(), 0); + QCOMPARE(emptyMatch.capturedEnd(), 0); +#endif + QVERIFY(!emptyStr.isDetached()); } @@ -2977,6 +3063,7 @@ void tst_QString::replace_string_extra() } } +#if QT_CONFIG(regularexpression) void tst_QString::replace_regexp() { QFETCH( QString, string ); @@ -3019,6 +3106,7 @@ void tst_QString::replace_regexp_extra() QCOMPARE( s, smallReplacement ); } } +#endif void tst_QString::remove_uint_uint() { @@ -3073,6 +3161,7 @@ void tst_QString::remove_string() } } +#if QT_CONFIG(regularexpression) void tst_QString::remove_regexp() { QFETCH( QString, string ); @@ -3087,6 +3176,7 @@ void tst_QString::remove_regexp() QCOMPARE( 0, 0 ); // shut Qt Test } } +#endif void tst_QString::remove_extra() { @@ -5148,13 +5238,18 @@ void tst_QString::section() QFETCH( QString, sectionString ); QFETCH( bool, regexp ); if (regexp) { +#if QT_CONFIG(regularexpression) QCOMPARE( wholeString.section( QRegularExpression(sep), start, end, QString::SectionFlag(flags) ), sectionString ); +#else + QSKIP("QRegularExpression not supported"); +#endif } else { if (sep.size() == 1) QCOMPARE( wholeString.section( sep[0], start, end, QString::SectionFlag(flags) ), sectionString ); QCOMPARE( wholeString.section( sep, start, end, QString::SectionFlag(flags) ), sectionString ); +#if QT_CONFIG(regularexpression) QCOMPARE( wholeString.section( QRegularExpression(QRegularExpression::escape(sep)), start, end, QString::SectionFlag(flags) ), sectionString ); - +#endif } } @@ -5724,7 +5819,9 @@ template<> struct StringSplitWrapper QStringList split(const QString &sep, Qt::SplitBehavior behavior = Qt::KeepEmptyParts, Qt::CaseSensitivity cs = Qt::CaseSensitive) const { return string.split(sep, behavior, cs); } QStringList split(QChar sep, Qt::SplitBehavior behavior = Qt::KeepEmptyParts, Qt::CaseSensitivity cs = Qt::CaseSensitive) const { return string.split(sep, behavior, cs); } +#if QT_CONFIG(regularexpression) QStringList split(const QRegularExpression &sep, Qt::SplitBehavior behavior = Qt::KeepEmptyParts) const { return string.split(sep, behavior); } +#endif }; template<> struct StringSplitWrapper @@ -5734,8 +5831,10 @@ template<> struct StringSplitWrapper { return QStringView{string}.split(sep, behavior, cs); } QList split(QChar sep, Qt::SplitBehavior behavior = Qt::KeepEmptyParts, Qt::CaseSensitivity cs = Qt::CaseSensitive) const { return QStringView{string}.split(sep, behavior, cs); } +#if QT_CONFIG(regularexpression) QList split(const QRegularExpression &sep, Qt::SplitBehavior behavior = Qt::KeepEmptyParts) const { return QStringView{string}.split(sep, behavior); } +#endif }; static bool operator==(const QList &result, const QStringList &expected) @@ -5751,15 +5850,19 @@ static bool operator==(const QList &result, const QStringList &expe template void tst_QString::split(const QString &string, const QString &sep, QStringList result) { +#if QT_CONFIG(regularexpression) QRegularExpression re(QRegularExpression::escape(sep)); +#endif List list; StringSplitWrapper str = {string}; list = str.split(sep); QVERIFY(list == result); +#if QT_CONFIG(regularexpression) list = str.split(re); QVERIFY(list == result); +#endif if (sep.size() == 1) { list = str.split(sep.at(0)); QVERIFY(list == result); @@ -5769,8 +5872,10 @@ QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED list = str.split(sep, Qt::KeepEmptyParts); QVERIFY(list == result); +#if QT_CONFIG(regularexpression) list = str.split(re, Qt::KeepEmptyParts); QVERIFY(list == result); +#endif if (sep.size() == 1) { list = str.split(sep.at(0), Qt::KeepEmptyParts); QVERIFY(list == result); @@ -5779,8 +5884,10 @@ QT_WARNING_DISABLE_DEPRECATED result.removeAll(""); list = str.split(sep, Qt::SkipEmptyParts); QVERIFY(list == result); +#if QT_CONFIG(regularexpression) list = str.split(re, Qt::SkipEmptyParts); QVERIFY(list == result); +#endif if (sep.size() == 1) { list = str.split(sep.at(0), Qt::SkipEmptyParts); QVERIFY(list == result); @@ -5797,6 +5904,7 @@ void tst_QString::split() split>(str, sep, result); } +#if QT_CONFIG(regularexpression) void tst_QString::split_regularexpression_data() { QTest::addColumn("string"); @@ -5839,6 +5947,7 @@ void tst_QString::split_regularexpression() split_regexp(string, pattern, result); split_regexp, QRegularExpression>(string, pattern, result); } +#endif void tst_QString::fromUtf16_data() {