Use TESTDATA for QSsl* tests

Apparently this (undocumented) TESTDATA feature creates resource files,
but lets you use wildcards as well, which is very handy.

The reason I didn't know/realize this when adapting the tests to use a
".qrc"-file* was because some of the test-cases were using relative
paths instead of the 'testDataDir' variable.

This commit fixes the remaining uses of relative paths, removes a
usage of QDir::setCurrent, and adapts QSslSocket to use TESTDATA.

* in now-reverted commit e1600c1a73e0594f5fbea8f7341a9552d6ae3fbb

Change-Id: Iee6d88f1e0810eeaadac90e7d44bc6db84bfeabf
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>

1 files changed, 51 insertions, 42 deletions

diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index e547521a74..01a7465564 100644
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -278,7 +278,10 @@ private:
 #endif // QT_NO_SSL
 private:
     static int loopLevel;
+public:
+    static QString testDataDir;
 };
+QString tst_QSslSocket::testDataDir;
 
 #ifndef QT_NO_SSL
 #ifndef QT_NO_OPENSSL
@@ -332,6 +335,11 @@ void tst_QSslSocket::initTestCase_data()
 
 void tst_QSslSocket::initTestCase()
 {
+    testDataDir = QFileInfo(QFINDTESTDATA("certs")).absolutePath();
+    if (testDataDir.isEmpty())
+        testDataDir = QCoreApplication::applicationDirPath();
+    if (!testDataDir.endsWith(QLatin1String("/")))
+        testDataDir += QLatin1String("/");
 #ifndef QT_NO_SSL
     qDebug("Using SSL library %s (%ld)",
            qPrintable(QSslSocket::sslLibraryVersionString()),
@@ -705,7 +713,7 @@ void tst_QSslSocket::connectToHostEncrypted()
 
     QSslSocketPtr socket = newSocket();
     this->socket = socket.data();
-    QVERIFY(socket->addCaCertificates(QLatin1String(SRCDIR "certs/qt-test-server-cacert.pem")));
+    QVERIFY(socket->addCaCertificates(testDataDir + "certs/qt-test-server-cacert.pem"));
 #ifdef QSSLSOCKET_CERTUNTRUSTED_WORKAROUND
     connect(socket.data(), SIGNAL(sslErrors(QList<QSslError>)),
             this, SLOT(untrustedWorkaroundSlot(QList<QSslError>)));
@@ -739,7 +747,7 @@ void tst_QSslSocket::connectToHostEncryptedWithVerificationPeerName()
     QSslSocketPtr socket = newSocket();
     this->socket = socket.data();
 
-    socket->addCaCertificates(QLatin1String(SRCDIR "certs/qt-test-server-cacert.pem"));
+    socket->addCaCertificates(testDataDir + "certs/qt-test-server-cacert.pem");
 #ifdef QSSLSOCKET_CERTUNTRUSTED_WORKAROUND
     connect(socket.data(), SIGNAL(sslErrors(QList<QSslError>)),
             this, SLOT(untrustedWorkaroundSlot(QList<QSslError>)));
@@ -803,10 +811,10 @@ void tst_QSslSocket::localCertificate()
     // values. This test should just run the codepath inside qsslsocket_openssl.cpp
 
     QSslSocketPtr socket = newSocket();
-    QList<QSslCertificate> localCert = QSslCertificate::fromPath(SRCDIR "certs/qt-test-server-cacert.pem");
+    QList<QSslCertificate> localCert = QSslCertificate::fromPath(testDataDir + "certs/qt-test-server-cacert.pem");
     socket->setCaCertificates(localCert);
-    socket->setLocalCertificate(QLatin1String(SRCDIR "certs/fluke.cert"));
-    socket->setPrivateKey(QLatin1String(SRCDIR "certs/fluke.key"));
+    socket->setLocalCertificate(testDataDir + "certs/fluke.cert");
+    socket->setPrivateKey(testDataDir + "certs/fluke.key");
 
     socket->connectToHostEncrypted(QtNetworkSettings::serverName(), 443);
     QFETCH_GLOBAL(bool, setProxy);
@@ -832,7 +840,7 @@ void tst_QSslSocket::peerCertificateChain()
     QSslSocketPtr socket = newSocket();
     this->socket = socket.data();
 
-    QList<QSslCertificate> caCertificates = QSslCertificate::fromPath(QLatin1String(SRCDIR "certs/qt-test-server-cacert.pem"));
+    QList<QSslCertificate> caCertificates = QSslCertificate::fromPath(testDataDir + "certs/qt-test-server-cacert.pem");
     QCOMPARE(caCertificates.count(), 1);
     socket->addCaCertificates(caCertificates);
 #ifdef QSSLSOCKET_CERTUNTRUSTED_WORKAROUND
@@ -895,7 +903,7 @@ void tst_QSslSocket::privateKeyOpaque()
     if (!QSslSocket::supportsSsl())
         return;
 
-    QFile file(SRCDIR "certs/fluke.key");
+    QFile file(testDataDir + "certs/fluke.key");
     QVERIFY(file.open(QIODevice::ReadOnly));
     QSslKey key(file.readAll(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
     QVERIFY(!key.isNull());
@@ -908,9 +916,9 @@ void tst_QSslSocket::privateKeyOpaque()
     // values. This test should just run the codepath inside qsslsocket_openssl.cpp
 
     QSslSocketPtr socket = newSocket();
-    QList<QSslCertificate> localCert = QSslCertificate::fromPath(SRCDIR "certs/qt-test-server-cacert.pem");
+    QList<QSslCertificate> localCert = QSslCertificate::fromPath(testDataDir + "certs/qt-test-server-cacert.pem");
     socket->setCaCertificates(localCert);
-    socket->setLocalCertificate(QLatin1String(SRCDIR "certs/fluke.cert"));
+    socket->setLocalCertificate(testDataDir + "certs/fluke.cert");
     socket->setPrivateKey(QSslKey(reinterpret_cast<Qt::HANDLE>(pkey)));
 
     socket->setPeerVerifyMode(QSslSocket::QueryPeer);
@@ -928,7 +936,7 @@ void tst_QSslSocket::protocol()
 
     QSslSocketPtr socket = newSocket();
     this->socket = socket.data();
-    QList<QSslCertificate> certs = QSslCertificate::fromPath(SRCDIR "certs/qt-test-server-cacert.pem");
+    QList<QSslCertificate> certs = QSslCertificate::fromPath(testDataDir + "certs/qt-test-server-cacert.pem");
 
     socket->setCaCertificates(certs);
 #ifdef QSSLSOCKET_CERTUNTRUSTED_WORKAROUND
@@ -1075,8 +1083,8 @@ class SslServer : public QTcpServer
 {
     Q_OBJECT
 public:
-    SslServer(const QString &keyFile = SRCDIR "certs/fluke.key",
-              const QString &certFile = SRCDIR "certs/fluke.cert",
+    SslServer(const QString &keyFile = tst_QSslSocket::testDataDir + "certs/fluke.key",
+              const QString &certFile = tst_QSslSocket::testDataDir + "certs/fluke.cert",
               const QString &interFile = QString())
         : socket(0),
           config(QSslConfiguration::defaultConfiguration()),
@@ -1428,7 +1436,7 @@ void tst_QSslSocket::setCaCertificates()
 
     QSslSocket socket;
     QCOMPARE(socket.caCertificates(), QSslSocket::defaultCaCertificates());
-    socket.setCaCertificates(QSslCertificate::fromPath(SRCDIR "certs/qt-test-server-cacert.pem"));
+    socket.setCaCertificates(QSslCertificate::fromPath(testDataDir + "certs/qt-test-server-cacert.pem"));
     QCOMPARE(socket.caCertificates().size(), 1);
     socket.setCaCertificates(socket.defaultCaCertificates());
     QCOMPARE(socket.caCertificates(), QSslSocket::defaultCaCertificates());
@@ -1444,7 +1452,7 @@ void tst_QSslSocket::localCertificateChain()
         return;
 
     QSslSocket socket;
-    socket.setLocalCertificate(QLatin1String(SRCDIR "certs/fluke.cert"));
+    socket.setLocalCertificate(testDataDir + "certs/fluke.cert");
 
     QSslConfiguration conf = socket.sslConfiguration();
     QList<QSslCertificate> chain = conf.localCertificateChain();
@@ -1465,9 +1473,9 @@ void tst_QSslSocket::setLocalCertificateChain()
     if (setProxy)
         return;
 
-    SslServer server(QLatin1String(SRCDIR "certs/leaf.key"),
-                     QLatin1String(SRCDIR "certs/leaf.crt"),
-                     QLatin1String(SRCDIR "certs/inter.crt"));
+    SslServer server(testDataDir + "certs/leaf.key",
+                     testDataDir + "certs/leaf.crt",
+                     testDataDir + "certs/inter.crt");
 
     QVERIFY(server.listen());
 
@@ -1536,7 +1544,7 @@ void tst_QSslSocket::setSslConfiguration_data()
     QTest::newRow("empty") << QSslConfiguration() << false;
     QSslConfiguration conf = QSslConfiguration::defaultConfiguration();
     QTest::newRow("default") << conf << false; // does not contain test server cert
-    QList<QSslCertificate> testServerCert = QSslCertificate::fromPath(SRCDIR "certs/qt-test-server-cacert.pem");
+    QList<QSslCertificate> testServerCert = QSslCertificate::fromPath(testDataDir + "certs/qt-test-server-cacert.pem");
     conf.setCaCertificates(testServerCert);
     QTest::newRow("set-root-cert") << conf << true;
     conf.setProtocol(QSsl::SecureProtocols);
@@ -1639,7 +1647,7 @@ void tst_QSslSocket::addDefaultCaCertificate()
     // Reset the global CA chain
     QSslSocket::setDefaultCaCertificates(QSslSocket::systemCaCertificates());
 
-    QList<QSslCertificate> flukeCerts = QSslCertificate::fromPath(SRCDIR "certs/qt-test-server-cacert.pem");
+    QList<QSslCertificate> flukeCerts = QSslCertificate::fromPath(testDataDir + "certs/qt-test-server-cacert.pem");
     QCOMPARE(flukeCerts.size(), 1);
     QList<QSslCertificate> globalCerts = QSslSocket::defaultCaCertificates();
     QVERIFY(!globalCerts.contains(flukeCerts.first()));
@@ -1751,7 +1759,7 @@ void tst_QSslSocket::isMatchingHostname()
 {
     // with normalization:  (the certificate has *.SCHÄUFELE.DE as a CN)
     // openssl req -x509 -nodes -subj "/CN=*.SCHÄUFELE.DE" -newkey rsa:512 -keyout /dev/null -out xn--schufele-2za.crt
-    QList<QSslCertificate> certs = QSslCertificate::fromPath(SRCDIR "certs/xn--schufele-2za.crt");
+    QList<QSslCertificate> certs = QSslCertificate::fromPath(testDataDir + "certs/xn--schufele-2za.crt");
     QVERIFY(!certs.isEmpty());
     QSslCertificate cert = certs.first();
 
@@ -1807,7 +1815,7 @@ protected:
         socket->ignoreSslErrors();
 
         // Only set the certificate
-        QList<QSslCertificate> localCert = QSslCertificate::fromPath(SRCDIR "certs/fluke.cert");
+        QList<QSslCertificate> localCert = QSslCertificate::fromPath(tst_QSslSocket::testDataDir + "certs/fluke.cert");
         QVERIFY(!localCert.isEmpty());
         QVERIFY(!localCert.first().isNull());
         socket->setLocalCertificate(localCert.first());
@@ -2045,13 +2053,14 @@ protected:
         socket = new QSslSocket(this);
         connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot()));
 
-        QFile file(SRCDIR "certs/fluke.key");
+        QFile file(tst_QSslSocket::testDataDir + "certs/fluke.key");
         QVERIFY(file.open(QIODevice::ReadOnly));
         QSslKey key(file.readAll(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
         QVERIFY(!key.isNull());
         socket->setPrivateKey(key);
 
-        QList<QSslCertificate> localCert = QSslCertificate::fromPath(SRCDIR "certs/fluke.cert");
+        QList<QSslCertificate> localCert = QSslCertificate::fromPath(tst_QSslSocket::testDataDir
+                                                                     + "certs/fluke.cert");
         QVERIFY(!localCert.isEmpty());
         QVERIFY(!localCert.first().isNull());
         socket->setLocalCertificate(localCert.first());
@@ -2227,8 +2236,8 @@ protected:
     {
         socket = new QSslSocket(this);
 
-        socket->setPrivateKey(SRCDIR "certs/fluke.key");
-        socket->setLocalCertificate(SRCDIR "certs/fluke.cert");
+        socket->setPrivateKey(tst_QSslSocket::testDataDir + "certs/fluke.key");
+        socket->setLocalCertificate(tst_QSslSocket::testDataDir + "certs/fluke.cert");
         socket->setSocketDescriptor(socketDescriptor);
         socket->startServerEncryption();
     }
@@ -2346,7 +2355,7 @@ void tst_QSslSocket::resetProxy()
     // make sure the connection works, and then set a nonsense proxy, and then
     // make sure it does not work anymore
     QSslSocket socket;
-    socket.addCaCertificates(QLatin1String(SRCDIR "certs/qt-test-server-cacert.pem"));
+    socket.addCaCertificates(testDataDir + "certs/qt-test-server-cacert.pem");
     socket.setProxy(goodProxy);
     socket.connectToHostEncrypted(QtNetworkSettings::serverName(), 443);
     QVERIFY2(socket.waitForConnected(10000), qPrintable(socket.errorString()));
@@ -2365,7 +2374,7 @@ void tst_QSslSocket::resetProxy()
     // set the nonsense proxy and make sure the connection does not work,
     // and then set the right proxy and make sure it works
     QSslSocket socket2;
-    socket2.addCaCertificates(QLatin1String(SRCDIR "certs/qt-test-server-cacert.pem"));
+    socket2.addCaCertificates(testDataDir + "certs/qt-test-server-cacert.pem");
     socket2.setProxy(badProxy);
     socket2.connectToHostEncrypted(QtNetworkSettings::serverName(), 443);
     QVERIFY(! socket2.waitForConnected(10000));
@@ -2384,7 +2393,7 @@ void tst_QSslSocket::ignoreSslErrorsList_data()
     // construct the list of errors that we will get with the SSL handshake and that we will ignore
     QList<QSslError> expectedSslErrors;
     // fromPath gives us a list of certs, but it actually only contains one
-    QList<QSslCertificate> certs = QSslCertificate::fromPath(QLatin1String(SRCDIR "certs/qt-test-server-cacert.pem"));
+    QList<QSslCertificate> certs = QSslCertificate::fromPath(testDataDir + "certs/qt-test-server-cacert.pem");
     QSslError rightError(FLUKE_CERTIFICATE_ERROR, certs.at(0));
     QSslError wrongError(FLUKE_CERTIFICATE_ERROR);
 
@@ -2563,7 +2572,7 @@ void tst_QSslSocket::blacklistedCertificates()
     if (setProxy)
         return;
 
-    SslServer server(SRCDIR "certs/fake-login.live.com.key", SRCDIR "certs/fake-login.live.com.pem");
+    SslServer server(testDataDir + "certs/fake-login.live.com.key", testDataDir + "certs/fake-login.live.com.pem");
     QSslSocket *receiver = new QSslSocket(this);
     connect(receiver, SIGNAL(readyRead()), SLOT(exitLoop()));
 
@@ -2675,7 +2684,7 @@ void tst_QSslSocket::resume_data()
     QTest::newRow("DoNotIgnoreErrors") << false << QList<QSslError>() << false;
     QTest::newRow("ignoreAllErrors") << true << QList<QSslError>() << true;
 
-    QList<QSslCertificate> certs = QSslCertificate::fromPath(QLatin1String(SRCDIR "certs/qt-test-server-cacert.pem"));
+    QList<QSslCertificate> certs = QSslCertificate::fromPath(testDataDir + "certs/qt-test-server-cacert.pem");
     QSslError rightError(FLUKE_CERTIFICATE_ERROR, certs.at(0));
     QSslError wrongError(FLUKE_CERTIFICATE_ERROR);
     errorsList.append(wrongError);
@@ -2745,8 +2754,8 @@ class WebSocket : public QSslSocket
     Q_OBJECT
 public:
     explicit WebSocket(qintptr socketDescriptor,
-                       const QString &keyFile = SRCDIR "certs/fluke.key",
-                       const QString &certFile = SRCDIR "certs/fluke.cert");
+                       const QString &keyFile = tst_QSslSocket::testDataDir + "certs/fluke.key",
+                       const QString &certFile = tst_QSslSocket::testDataDir + "certs/fluke.cert");
 
 protected slots:
     void onReadyReadFirstBytes(void);
@@ -2957,13 +2966,13 @@ void tst_QSslSocket::qtbug18498_peek2()
     QCOMPARE(a[2], 'S');
     QCOMPARE(server->readAll(), QByteArray("TLS\r\n"));
 
-    QFile file(SRCDIR "certs/fluke.key");
+    QFile file(testDataDir + "certs/fluke.key");
     QVERIFY(file.open(QIODevice::ReadOnly));
     QSslKey key(file.readAll(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
     QVERIFY(!key.isNull());
     server->setPrivateKey(key);
 
-    QList<QSslCertificate> localCert = QSslCertificate::fromPath(SRCDIR "certs/fluke.cert");
+    QList<QSslCertificate> localCert = QSslCertificate::fromPath(testDataDir + "certs/fluke.cert");
     QVERIFY(!localCert.isEmpty());
     QVERIFY(!localCert.first().isNull());
     server->setLocalCertificate(localCert.first());
@@ -3163,10 +3172,10 @@ void tst_QSslSocket::verifyClientCertificate_data()
     QTest::newRow("NoCert:VerifyPeer") << QSslSocket::VerifyPeer << noCerts << noKey << false;
 
     // self-signed certificate
-    QList<QSslCertificate> flukeCerts = QSslCertificate::fromPath(SRCDIR "certs/fluke.cert");
+    QList<QSslCertificate> flukeCerts = QSslCertificate::fromPath(testDataDir + "certs/fluke.cert");
     QCOMPARE(flukeCerts.size(), 1);
 
-    QFile flukeFile(SRCDIR "certs/fluke.key");
+    QFile flukeFile(testDataDir + "certs/fluke.key");
     QVERIFY(flukeFile.open(QIODevice::ReadOnly));
     QSslKey flukeKey(flukeFile.readAll(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
     QVERIFY(!flukeKey.isNull());
@@ -3177,10 +3186,10 @@ void tst_QSslSocket::verifyClientCertificate_data()
     QTest::newRow("SelfSignedCert:VerifyPeer") << QSslSocket::VerifyPeer << flukeCerts << flukeKey << false;
 
     // valid certificate, but wrong usage (server certificate)
-    QList<QSslCertificate> serverCerts = QSslCertificate::fromPath(SRCDIR "certs/bogus-server.crt");
+    QList<QSslCertificate> serverCerts = QSslCertificate::fromPath(testDataDir + "certs/bogus-server.crt");
     QCOMPARE(serverCerts.size(), 1);
 
-    QFile serverFile(SRCDIR "certs/bogus-server.key");
+    QFile serverFile(testDataDir + "certs/bogus-server.key");
     QVERIFY(serverFile.open(QIODevice::ReadOnly));
     QSslKey serverKey(serverFile.readAll(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
     QVERIFY(!serverKey.isNull());
@@ -3191,10 +3200,10 @@ void tst_QSslSocket::verifyClientCertificate_data()
     QTest::newRow("ValidServerCert:VerifyPeer") << QSslSocket::VerifyPeer << serverCerts << serverKey << false;
 
     // valid certificate, correct usage (client certificate)
-    QList<QSslCertificate> validCerts = QSslCertificate::fromPath(SRCDIR "certs/bogus-client.crt");
+    QList<QSslCertificate> validCerts = QSslCertificate::fromPath(testDataDir + "certs/bogus-client.crt");
     QCOMPARE(validCerts.size(), 1);
 
-    QFile validFile(SRCDIR "certs/bogus-client.key");
+    QFile validFile(testDataDir + "certs/bogus-client.key");
     QVERIFY(validFile.open(QIODevice::ReadOnly));
     QSslKey validKey(validFile.readAll(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
     QVERIFY(!validKey.isNull());
@@ -3205,7 +3214,7 @@ void tst_QSslSocket::verifyClientCertificate_data()
     QTest::newRow("ValidClientCert:VerifyPeer") << QSslSocket::VerifyPeer << validCerts << validKey << true;
 
     // valid certificate, correct usage (client certificate), with chain
-    validCerts += QSslCertificate::fromPath(SRCDIR "certs/bogus-ca.crt");
+    validCerts += QSslCertificate::fromPath(testDataDir + "certs/bogus-ca.crt");
     QCOMPARE(validCerts.size(), 2);
 
     QTest::newRow("ValidClientCert:AutoVerifyPeer") << QSslSocket::AutoVerifyPeer << validCerts << validKey << true;
@@ -3238,7 +3247,7 @@ void tst_QSslSocket::verifyClientCertificate()
 
     QFETCH(QSslSocket::PeerVerifyMode, peerVerifyMode);
     SslServer server;
-    server.addCaCertificates = QLatin1String(SRCDIR "certs/bogus-ca.crt");
+    server.addCaCertificates = testDataDir + "certs/bogus-ca.crt";
     server.ignoreSslErrors = false;
     server.peerVerifyMode = peerVerifyMode;
     QVERIFY(server.listen());