summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2017-11-14 16:00:16 +0100
committerMårten Nordheim <marten.nordheim@qt.io>2017-11-30 08:30:42 +0000
commite1600c1a73e0594f5fbea8f7341a9552d6ae3fbb (patch)
tree4ea083e1d18503ec1e67a6cd714c9034a7270fdb /tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
parenta09fc184acd0874ea9876cdb2c4b123b226d8587 (diff)
Adapt the QSsl* tests to use the resource system
This lets the tests run on devices which previously did not have access to the files used (WinRT, mobile devices). Change-Id: Ibdd85862eee6ab1a7d4da87ca321ee9bc9880bfa Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp')
-rw-r--r--tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp16
1 files changed, 5 insertions, 11 deletions
diff --git a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
index 0112af4ed7..3c88cddf9a 100644
--- a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
+++ b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
@@ -97,17 +97,11 @@ private slots:
#endif
#endif
-private:
- QString testDataDir;
};
void tst_QSslKey::initTestCase()
{
- testDataDir = QFileInfo(QFINDTESTDATA("rsa-without-passphrase.pem")).absolutePath();
- if (testDataDir.isEmpty())
- testDataDir = QCoreApplication::applicationDirPath();
-
- QDir dir(testDataDir + "/keys");
+ QDir dir(":/keys");
QFileInfoList fileInfoList = dir.entryInfoList(QDir::Files | QDir::Readable);
QRegExp rx(QLatin1String("^(rsa|dsa|ec)-(pub|pri)-(\\d+)-?\\w*\\.(pem|der)$"));
foreach (QFileInfo fileInfo, fileInfoList) {
@@ -392,9 +386,9 @@ void tst_QSslKey::passphraseChecks_data()
{
QTest::addColumn<QString>("fileName");
- QTest::newRow("DES") << QString(testDataDir + "/rsa-with-passphrase-des.pem");
- QTest::newRow("3DES") << QString(testDataDir + "/rsa-with-passphrase-3des.pem");
- QTest::newRow("RC2") << QString(testDataDir + "/rsa-with-passphrase-rc2.pem");
+ QTest::newRow("DES") << QString(":/rsa-with-passphrase-des.pem");
+ QTest::newRow("3DES") << QString(":/rsa-with-passphrase-3des.pem");
+ QTest::newRow("RC2") << QString(":/rsa-with-passphrase-rc2.pem");
}
void tst_QSslKey::passphraseChecks()
@@ -440,7 +434,7 @@ void tst_QSslKey::passphraseChecks()
void tst_QSslKey::noPassphraseChecks()
{
// be sure and check a key without passphrase too
- QString fileName(testDataDir + "/rsa-without-passphrase.pem");
+ QString fileName(":/rsa-without-passphrase.pem");
QFile keyFile(fileName);
{
if (!keyFile.isOpen())