diff options
Diffstat (limited to 'lang/qt/tests/t-trustsignatures.cpp')
| -rw-r--r-- | lang/qt/tests/t-trustsignatures.cpp | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/lang/qt/tests/t-trustsignatures.cpp b/lang/qt/tests/t-trustsignatures.cpp index 6f7ad82..b4baea4 100644 --- a/lang/qt/tests/t-trustsignatures.cpp +++ b/lang/qt/tests/t-trustsignatures.cpp @@ -41,6 +41,7 @@ #include "protocol.h" #include "signkeyjob.h" +#include <QRegularExpression> #include <QSignalSpy> #include <QTemporaryDir> #include <QTest> @@ -82,7 +83,7 @@ private Q_SLOTS: QVERIFY(job); hookUpPassphraseProvider(job.get()); - // Setup the job + // Set up the job job->setExportable(true); job->setSigningKey(seckey); job->setTrustSignature(TrustSignatureTrust::Complete, 1, QStringLiteral("example.org")); @@ -113,9 +114,9 @@ private Q_SLOTS: QVERIFY(trustSignature.trustScope()); const auto trustScope = QString::fromUtf8(trustSignature.trustScope()); QVERIFY(!trustScope.isEmpty()); - const QRegExp regex{trustScope}; + const QRegularExpression regex{trustScope}; 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 @@ -125,7 +126,7 @@ private Q_SLOTS: QVERIFY(job); hookUpPassphraseProvider(job.get()); - // Setup the job + // Set up the job job->setExportable(true); job->setSigningKey(seckey); job->setDupeOk(true); @@ -158,9 +159,9 @@ private Q_SLOTS: QVERIFY(trustSignature.trustScope()); const auto trustScope = QString::fromUtf8(trustSignature.trustScope()); QVERIFY(!trustScope.isEmpty()); - const QRegExp regex{trustScope}; + const QRegularExpression regex{trustScope}; QVERIFY(regex.isValid()); - QVERIFY(regex.indexIn(QStringLiteral("Foo <foo@example.net>")) != -1); + QVERIFY(regex.match(QStringLiteral("Foo <foo@example.net>")).hasMatch()); } } @@ -193,7 +194,7 @@ private Q_SLOTS: QVERIFY(job); hookUpPassphraseProvider(job); - // Setup the job + // Set up the job job->setExportable(true); job->setSigningKey(seckey); job->setTrustSignature(TrustSignatureTrust::Complete, 1, QStringLiteral("example.org")); @@ -224,9 +225,9 @@ private Q_SLOTS: QVERIFY(trustSignature.trustScope()); const auto trustScope = QString::fromUtf8(trustSignature.trustScope()); QVERIFY(!trustScope.isEmpty()); - const QRegExp regex{trustScope}; + const QRegularExpression regex{trustScope}; 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 @@ -236,7 +237,7 @@ private Q_SLOTS: QVERIFY(job); hookUpPassphraseProvider(job); - // Setup the job + // Set up the job job->setExportable(true); job->setSigningKey(seckey); job->setDupeOk(true); @@ -269,9 +270,9 @@ private Q_SLOTS: QVERIFY(trustSignature.trustScope()); const auto trustScope = QString::fromUtf8(trustSignature.trustScope()); QVERIFY(!trustScope.isEmpty()); - const QRegExp regex{trustScope}; + const QRegularExpression regex{trustScope}; QVERIFY(regex.isValid()); - QVERIFY(regex.indexIn(QStringLiteral("Foo <foo@example.net>")) != -1); + QVERIFY(regex.match(QStringLiteral("Foo <foo@example.net>")).hasMatch()); } } @@ -304,7 +305,7 @@ private Q_SLOTS: QVERIFY(job); hookUpPassphraseProvider(job); - // Setup the job + // Set up the job job->setExportable(true); job->setSigningKey(seckey); job->setUserIDsToSign({0}); @@ -336,9 +337,9 @@ private Q_SLOTS: QVERIFY(trustSignature.trustScope()); const auto trustScope = QString::fromUtf8(trustSignature.trustScope()); QVERIFY(!trustScope.isEmpty()); - const QRegExp regex{trustScope}; + const QRegularExpression regex{trustScope}; 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 @@ -348,7 +349,7 @@ private Q_SLOTS: QVERIFY(job); hookUpPassphraseProvider(job); - // Setup the job + // Set up the job job->setExportable(true); job->setSigningKey(seckey); job->setDupeOk(true); @@ -381,9 +382,9 @@ private Q_SLOTS: QVERIFY(trustSignature.trustScope()); const auto trustScope = QString::fromUtf8(trustSignature.trustScope()); QVERIFY(!trustScope.isEmpty()); - const QRegExp regex{trustScope}; + const QRegularExpression regex{trustScope}; QVERIFY(regex.isValid()); - QVERIFY(regex.indexIn(QStringLiteral("Foo <foo@example.net>")) != -1); + QVERIFY(regex.match(QStringLiteral("Foo <foo@example.net>")).hasMatch()); } } @@ -416,7 +417,7 @@ private Q_SLOTS: QVERIFY(job); hookUpPassphraseProvider(job); - // Setup the job + // Set up the job job->setExportable(true); job->setSigningKey(seckey); job->setTrustSignature(TrustSignatureTrust::Complete, 1, QStringLiteral("example.org")); @@ -447,9 +448,9 @@ private Q_SLOTS: QVERIFY(trustSignature.trustScope()); const auto trustScope = QString::fromUtf8(trustSignature.trustScope()); QVERIFY(!trustScope.isEmpty()); - const QRegExp regex{trustScope}; + const QRegularExpression regex{trustScope}; 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 @@ -459,7 +460,7 @@ private Q_SLOTS: QVERIFY(job); hookUpPassphraseProvider(job); - // Setup the job + // Set up the job job->setExportable(true); job->setSigningKey(seckey); job->setUserIDsToSign({0}); @@ -493,9 +494,9 @@ private Q_SLOTS: QVERIFY(trustSignature.trustScope()); const auto trustScope = QString::fromUtf8(trustSignature.trustScope()); QVERIFY(!trustScope.isEmpty()); - const QRegExp regex{trustScope}; + const QRegularExpression regex{trustScope}; QVERIFY(regex.isValid()); - QVERIFY(regex.indexIn(QStringLiteral("Foo <foo@example.net>")) != -1); + QVERIFY(regex.match(QStringLiteral("Foo <foo@example.net>")).hasMatch()); } } |