From c9511d642e7ab38ad2a47ba834580cfbda43ab65 Mon Sep 17 00:00:00 2001
From: Timo Turunen <timo.p.turunen@nokia.com>
Date: Mon, 28 Mar 2011 20:01:19 +0300
Subject: QSslCertificate: fix test for blacklisted certs on Windows

Apparently the wildcard matching and the SRCDIR hack don't go well
together.

Reviewed-by: Markus Goetz
Task-number: QTBUG-18338
(cherry picked from commit aeabe790203e7dcb1786e0dad7b4608f1e45b7d5)

Conflicts:

	tests/auto/qsslcertificate/tst_qsslcertificate.cpp
---
 tests/auto/qsslcertificate/tst_qsslcertificate.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
index ccc6af9..a8c5a4d 100644
--- a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
+++ b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
@@ -817,6 +817,15 @@ void tst_QSslCertificate::largeExpirationDate() // QTBUG-12489
     QCOMPARE(cert.expiryDate().toUTC(), QDateTime(QDate(2051, 8, 29), QTime(9, 53, 41), Qt::UTC));
 }
 
+void tst_QSslCertificate::blacklistedCertificates()
+{
+    QList<QSslCertificate> blacklistedCerts = QSslCertificate::fromPath("more-certificates/blacklisted*.pem", QSsl::Pem, QRegExp::Wildcard);
+    QVERIFY2(blacklistedCerts.count() > 0, "Please run this test from the source directory");
+    for (int a = 0; a < blacklistedCerts.count(); a++) {
+        QVERIFY(! blacklistedCerts.at(a).isValid());
+    }
+}
+
 #endif // QT_NO_OPENSSL
 
 QTEST_MAIN(tst_QSslCertificate)
-- 
cgit v0.12