1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port autotest away from QRegExp

Browse Source 
Change-Id: I630fb93eca3f087f20d44a76058f7d6fe988ba5f
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Lars Knoll 2020-03-30 13:39:42 +02:00
parent 7f267360f2
commit 21a9b67cdb
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
View File

@ -112,17 +112,18 @@ void tst_QSslKey::initTestCase()
QDir dir(testDataDir + "keys"); QDir dir(testDataDir + "keys");
const QFileInfoList fileInfoList = dir.entryInfoList(QDir::Files | QDir::Readable); const QFileInfoList fileInfoList = dir.entryInfoList(QDir::Files | QDir::Readable);
QRegExp rx(QLatin1String("^(rsa|dsa|dh|ec)-(pub|pri)-(\\d+)-?[\\w-]*\\.(pem|der)$")); QRegularExpression rx(QLatin1String("^(rsa|dsa|dh|ec)-(pub|pri)-(\\d+)-?[\\w-]*\\.(pem|der)$"));
for (const QFileInfo &fileInfo : fileInfoList) { for (const QFileInfo &fileInfo : fileInfoList) {
if (rx.indexIn(fileInfo.fileName()) >= 0) { auto match = rx.match(fileInfo.fileName());
if (match.hasMatch()) {
keyInfoList << KeyInfo( keyInfoList << KeyInfo(
fileInfo, fileInfo,
rx.cap(1) == QLatin1String("rsa") ? QSsl::Rsa : match.captured(1) == QLatin1String("rsa") ? QSsl::Rsa :
rx.cap(1) == QLatin1String("dsa") ? QSsl::Dsa : match.captured(1) == QLatin1String("dsa") ? QSsl::Dsa :
rx.cap(1) == QLatin1String("dh") ? QSsl::Dh : QSsl::Ec, match.captured(1) == QLatin1String("dh") ? QSsl::Dh : QSsl::Ec,
rx.cap(2) == QLatin1String("pub") ? QSsl::PublicKey : QSsl::PrivateKey, match.captured(2) == QLatin1String("pub") ? QSsl::PublicKey : QSsl::PrivateKey,
rx.cap(3).toInt(), match.captured(3).toInt(),
rx.cap(4) == QLatin1String("pem") ? QSsl::Pem : QSsl::Der); match.captured(4) == QLatin1String("pem") ? QSsl::Pem : QSsl::Der);
} }
} }
} }