AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: add missing QRegularExpression specific QDataStream tests

Browse Source 
This patch adds the missing tests for the QRegularExpression class to
the QDataStream tests. Only QRegExp was tested until now.

Task-number: QTBUG-72587
Change-Id: I68ad1500ecbb041bbc6fbdff04b99171530cc0fd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Samuel Gaist 2019-06-10 08:27:12 +02:00
parent 20c6242c52
commit cc843c36ea
1 changed files with 74 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
View File

@ -113,6 +113,11 @@ private slots:
void stream_QRegExp_data();
void stream_QRegExp();
#if QT_CONFIG(regularexpression)
void stream_QRegularExpression_data();
void stream_QRegularExpression();
#endif
void stream_Map_data();
void stream_Map();
@ -221,6 +226,9 @@ private:
void writeQSize(QDataStream *s);
void writeQString(QDataStream* dev);
void writeQRegExp(QDataStream* dev);
#if QT_CONFIG(regularexpression)
void writeQRegularExpression(QDataStream *dev);
#endif
void writeMap(QDataStream* dev);
void writeHash(QDataStream* dev);
void writeqint64(QDataStream *s);
@ -250,6 +258,9 @@ private:
void readQSize(QDataStream *s);
void readQString(QDataStream *s);
void readQRegExp(QDataStream *s);
#if QT_CONFIG(regularexpression)
void readQRegularExpression(QDataStream *s);
#endif
void readMap(QDataStream *s);
void readHash(QDataStream *s);
void readqint64(QDataStream *s);
@ -561,6 +572,69 @@ void tst_QDataStream::readQRegExp(QDataStream *s)
// ************************************
#if QT_CONFIG(regularexpression)
static QRegularExpression QRegularExpressionData(int index)
{
switch (index) {
case 0: return QRegularExpression();
case 1: return QRegularExpression("");
case 2: return QRegularExpression("A", QRegularExpression::CaseInsensitiveOption);
case 3: return QRegularExpression(QRegularExpression::wildcardToRegularExpression("ABCDE FGHI"));
case 4: return QRegularExpression(QRegularExpression::anchoredPattern("This is a long string"), QRegularExpression::CaseInsensitiveOption);
case 5: return QRegularExpression("And again a string with a \nCRLF", QRegularExpression::CaseInsensitiveOption);
case 6: return QRegularExpression("abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRESTUVWXYZ 1234567890 ~`!@#$%^&*()_-+={[}]|\\:;\"'<,>.?/", QRegularExpression::InvertedGreedinessOption);
}
return QRegularExpression("foo");
}
#define MAX_QREGULAREXPRESSION_DATA 7
void tst_QDataStream::stream_QRegularExpression_data()
{
stream_data(MAX_QREGULAREXPRESSION_DATA);
}
void tst_QDataStream::stream_QRegularExpression()
{
STREAM_IMPL(QRegularExpression);
}
void tst_QDataStream::writeQRegularExpression(QDataStream* s)
{
QRegularExpression test(QRegularExpressionData(dataIndex(QTest::currentDataTag())));
*s << test;
*s << QString("Her er det noe tekst");
*s << test;
*s << QString("nonempty");
*s << test;
*s << QVariant(test);
}
void tst_QDataStream::readQRegularExpression(QDataStream *s)
{
QRegularExpression R;
QString S;
QVariant V;
QRegularExpression test(QRegularExpressionData(dataIndex(QTest::currentDataTag())));
*s >> R;
QCOMPARE(R, test);
*s >> S;
QCOMPARE(S, QString("Her er det noe tekst"));
*s >> R;
QCOMPARE(R, test);
*s >> S;
QCOMPARE(S, QString("nonempty"));
*s >> R;
QCOMPARE(R, test);
*s >> V;
QCOMPARE(V.type(), QVariant::RegularExpression);
QCOMPARE(V.toRegularExpression(), test);
}
#endif //QT_CONFIG(regularexpression)
// ************************************
typedef QMap<int, QString> Map;
static Map MapData(int index)