diff options
author | Mårten Nordheim <marten.nordheim@qt.io> | 2017-11-14 16:00:16 +0100 |
---|---|---|
committer | Mårten Nordheim <marten.nordheim@qt.io> | 2017-11-30 08:30:42 +0000 |
commit | e1600c1a73e0594f5fbea8f7341a9552d6ae3fbb (patch) | |
tree | 4ea083e1d18503ec1e67a6cd714c9034a7270fdb /tests/auto/network/ssl/qsslkey | |
parent | a09fc184acd0874ea9876cdb2c4b123b226d8587 (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')
-rw-r--r-- | tests/auto/network/ssl/qsslkey/qsslkey.pro | 3 | ||||
-rw-r--r-- | tests/auto/network/ssl/qsslkey/qsslkey.qrc | 65 | ||||
-rw-r--r-- | tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp | 16 |
3 files changed, 73 insertions, 11 deletions
diff --git a/tests/auto/network/ssl/qsslkey/qsslkey.pro b/tests/auto/network/ssl/qsslkey/qsslkey.pro index 8c3877631a..760369df39 100644 --- a/tests/auto/network/ssl/qsslkey/qsslkey.pro +++ b/tests/auto/network/ssl/qsslkey/qsslkey.pro @@ -9,4 +9,7 @@ qtConfig(private_tests) { TARGET = tst_qsslkey +RESOURCES += \ + qsslkey.qrc + TESTDATA += keys/* rsa-without-passphrase.pem rsa-with-passphrase.pem diff --git a/tests/auto/network/ssl/qsslkey/qsslkey.qrc b/tests/auto/network/ssl/qsslkey/qsslkey.qrc new file mode 100644 index 0000000000..4b994ac7af --- /dev/null +++ b/tests/auto/network/ssl/qsslkey/qsslkey.qrc @@ -0,0 +1,65 @@ +<RCC> + <qresource prefix="/"> + <file>rsa-without-passphrase.pem</file> + <file>rsa-with-passphrase-3des.pem</file> + <file>rsa-with-passphrase-des.pem</file> + <file>rsa-with-passphrase-rc2.pem</file> + <file>keys/dsa-pri-1024.der</file> + <file>keys/dsa-pri-1024.pem</file> + <file>keys/dsa-pri-512.der</file> + <file>keys/dsa-pri-512.pem</file> + <file>keys/dsa-pri-576.der</file> + <file>keys/dsa-pri-576.pem</file> + <file>keys/dsa-pri-960.der</file> + <file>keys/dsa-pri-960.pem</file> + <file>keys/dsa-pub-1024.der</file> + <file>keys/dsa-pub-1024.pem</file> + <file>keys/dsa-pub-512.der</file> + <file>keys/dsa-pub-512.pem</file> + <file>keys/dsa-pub-576.der</file> + <file>keys/dsa-pub-576.pem</file> + <file>keys/dsa-pub-960.der</file> + <file>keys/dsa-pub-960.pem</file> + <file>keys/ec-pri-224-secp224r1.der</file> + <file>keys/ec-pri-224-secp224r1.pem</file> + <file>keys/ec-pri-256-prime256v1.der</file> + <file>keys/ec-pri-256-prime256v1.pem</file> + <file>keys/ec-pri-384-secp384r1.der</file> + <file>keys/ec-pri-384-secp384r1.pem</file> + <file>keys/ec-pub-224-secp224r1.der</file> + <file>keys/ec-pub-224-secp224r1.pem</file> + <file>keys/ec-pub-256-prime256v1.der</file> + <file>keys/ec-pub-256-prime256v1.pem</file> + <file>keys/ec-pub-384-secp384r1.der</file> + <file>keys/ec-pub-384-secp384r1.pem</file> + <file>keys/genkeys.sh</file> + <file>keys/rsa-pri-1023.der</file> + <file>keys/rsa-pri-1023.pem</file> + <file>keys/rsa-pri-1024.der</file> + <file>keys/rsa-pri-1024.pem</file> + <file>keys/rsa-pri-2048.der</file> + <file>keys/rsa-pri-2048.pem</file> + <file>keys/rsa-pri-40.der</file> + <file>keys/rsa-pri-40.pem</file> + <file>keys/rsa-pri-511.der</file> + <file>keys/rsa-pri-511.pem</file> + <file>keys/rsa-pri-512.der</file> + <file>keys/rsa-pri-512.pem</file> + <file>keys/rsa-pri-999.der</file> + <file>keys/rsa-pri-999.pem</file> + <file>keys/rsa-pub-1023.der</file> + <file>keys/rsa-pub-1023.pem</file> + <file>keys/rsa-pub-1024.der</file> + <file>keys/rsa-pub-1024.pem</file> + <file>keys/rsa-pub-2048.der</file> + <file>keys/rsa-pub-2048.pem</file> + <file>keys/rsa-pub-40.der</file> + <file>keys/rsa-pub-40.pem</file> + <file>keys/rsa-pub-511.der</file> + <file>keys/rsa-pub-511.pem</file> + <file>keys/rsa-pub-512.der</file> + <file>keys/rsa-pub-512.pem</file> + <file>keys/rsa-pub-999.der</file> + <file>keys/rsa-pub-999.pem</file> + </qresource> +</RCC> 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()) |