GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt,tests: Port test to QRegularExpression.

Browse Source 
* lang/qt/tests/t-trustsignatures.cpp: Use QRegularExpression instead of
QRegExp.
--

This allows building with Qt 6 without Core5Compat.
This commit is contained in:
Ingo Klöcker 2022-10-11 10:23:36 +02:00
parent 4938c24a46
commit b2fb26baea
No known key found for this signature in database
GPG Key ID: F5A5D1692277A1E9
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lang/qt/tests/t-trustsignatures.cpp
View File

@ -41,6 +41,7 @@
#include "protocol.h" #include "protocol.h"
#include "signkeyjob.h" #include "signkeyjob.h"
#include <QRegularExpression>
#include <QSignalSpy> #include <QSignalSpy>
#include <QTemporaryDir> #include <QTemporaryDir>
#include <QTest> #include <QTest>
@ -113,9 +114,9 @@ private Q_SLOTS:
QVERIFY(trustSignature.trustScope()); QVERIFY(trustSignature.trustScope());
const auto trustScope = QString::fromUtf8(trustSignature.trustScope()); const auto trustScope = QString::fromUtf8(trustSignature.trustScope());
QVERIFY(!trustScope.isEmpty()); QVERIFY(!trustScope.isEmpty());
const QRegExp regex{trustScope}; const QRegularExpression regex{trustScope};
QVERIFY(regex.isValid()); QVERIFY(regex.isValid());
QVERIFY(regex.indexIn(QStringLiteral("Foo <foo@example.org>")) != -1); QVERIFY(regex.match(QStringLiteral("Foo <foo@example.org>")).hasMatch());
} }
// Create second trust signature // Create second trust signature
@ -158,9 +159,9 @@ private Q_SLOTS:
QVERIFY(trustSignature.trustScope()); QVERIFY(trustSignature.trustScope());
const auto trustScope = QString::fromUtf8(trustSignature.trustScope()); const auto trustScope = QString::fromUtf8(trustSignature.trustScope());
QVERIFY(!trustScope.isEmpty()); QVERIFY(!trustScope.isEmpty());
const QRegExp regex{trustScope}; const QRegularExpression regex{trustScope};
QVERIFY(regex.isValid()); QVERIFY(regex.isValid());
QVERIFY(regex.indexIn(QStringLiteral("Foo <foo@example.net>")) != -1); QVERIFY(regex.match(QStringLiteral("Foo <foo@example.net>")).hasMatch());
} }
} }
@ -224,9 +225,9 @@ private Q_SLOTS:
QVERIFY(trustSignature.trustScope()); QVERIFY(trustSignature.trustScope());
const auto trustScope = QString::fromUtf8(trustSignature.trustScope()); const auto trustScope = QString::fromUtf8(trustSignature.trustScope());
QVERIFY(!trustScope.isEmpty()); QVERIFY(!trustScope.isEmpty());
const QRegExp regex{trustScope}; const QRegularExpression regex{trustScope};
QVERIFY(regex.isValid()); QVERIFY(regex.isValid());
QVERIFY(regex.indexIn(QStringLiteral("Foo <foo@example.org>")) != -1); QVERIFY(regex.match(QStringLiteral("Foo <foo@example.org>")).hasMatch());
} }
// Create second trust signature // Create second trust signature
@ -269,9 +270,9 @@ private Q_SLOTS:
QVERIFY(trustSignature.trustScope()); QVERIFY(trustSignature.trustScope());
const auto trustScope = QString::fromUtf8(trustSignature.trustScope()); const auto trustScope = QString::fromUtf8(trustSignature.trustScope());
QVERIFY(!trustScope.isEmpty()); QVERIFY(!trustScope.isEmpty());
const QRegExp regex{trustScope}; const QRegularExpression regex{trustScope};
QVERIFY(regex.isValid()); QVERIFY(regex.isValid());
QVERIFY(regex.indexIn(QStringLiteral("Foo <foo@example.net>")) != -1); QVERIFY(regex.match(QStringLiteral("Foo <foo@example.net>")).hasMatch());
} }
} }
@ -336,9 +337,9 @@ private Q_SLOTS:
QVERIFY(trustSignature.trustScope()); QVERIFY(trustSignature.trustScope());
const auto trustScope = QString::fromUtf8(trustSignature.trustScope()); const auto trustScope = QString::fromUtf8(trustSignature.trustScope());
QVERIFY(!trustScope.isEmpty()); QVERIFY(!trustScope.isEmpty());
const QRegExp regex{trustScope}; const QRegularExpression regex{trustScope};
QVERIFY(regex.isValid()); QVERIFY(regex.isValid());
QVERIFY(regex.indexIn(QStringLiteral("Foo <foo@example.org>")) != -1); QVERIFY(regex.match(QStringLiteral("Foo <foo@example.org>")).hasMatch());
} }
// Create second trust signature // Create second trust signature
@ -381,9 +382,9 @@ private Q_SLOTS:
QVERIFY(trustSignature.trustScope()); QVERIFY(trustSignature.trustScope());
const auto trustScope = QString::fromUtf8(trustSignature.trustScope()); const auto trustScope = QString::fromUtf8(trustSignature.trustScope());
QVERIFY(!trustScope.isEmpty()); QVERIFY(!trustScope.isEmpty());
const QRegExp regex{trustScope}; const QRegularExpression regex{trustScope};
QVERIFY(regex.isValid()); QVERIFY(regex.isValid());
QVERIFY(regex.indexIn(QStringLiteral("Foo <foo@example.net>")) != -1); QVERIFY(regex.match(QStringLiteral("Foo <foo@example.net>")).hasMatch());
} }
} }
@ -447,9 +448,9 @@ private Q_SLOTS:
QVERIFY(trustSignature.trustScope()); QVERIFY(trustSignature.trustScope());
const auto trustScope = QString::fromUtf8(trustSignature.trustScope()); const auto trustScope = QString::fromUtf8(trustSignature.trustScope());
QVERIFY(!trustScope.isEmpty()); QVERIFY(!trustScope.isEmpty());
const QRegExp regex{trustScope}; const QRegularExpression regex{trustScope};
QVERIFY(regex.isValid()); QVERIFY(regex.isValid());
QVERIFY(regex.indexIn(QStringLiteral("Foo <foo@example.org>")) != -1); QVERIFY(regex.match(QStringLiteral("Foo <foo@example.org>")).hasMatch());
} }
// Create second trust signature // Create second trust signature
@ -493,9 +494,9 @@ private Q_SLOTS:
QVERIFY(trustSignature.trustScope()); QVERIFY(trustSignature.trustScope());
const auto trustScope = QString::fromUtf8(trustSignature.trustScope()); const auto trustScope = QString::fromUtf8(trustSignature.trustScope());
QVERIFY(!trustScope.isEmpty()); QVERIFY(!trustScope.isEmpty());
const QRegExp regex{trustScope}; const QRegularExpression regex{trustScope};
QVERIFY(regex.isValid()); QVERIFY(regex.isValid());
QVERIFY(regex.indexIn(QStringLiteral("Foo <foo@example.net>")) != -1); QVERIFY(regex.match(QStringLiteral("Foo <foo@example.net>")).hasMatch());
} }
} }