summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-09-01 08:40:40 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-09-01 08:40:40 (GMT)
commitaa71e8492b02be079312d39033a54209fb80f9aa (patch)
tree5970c069625617d21b262b214fdb1ccabe296d2b /tests
parent1051e9d0dc5cbad27b89756839f3619cae2d44fe (diff)
parent67d5b1b800df55c61241c7fa33feeeea41a31513 (diff)
downloadQt-aa71e8492b02be079312d39033a54209fb80f9aa.zip
Qt-aa71e8492b02be079312d39033a54209fb80f9aa.tar.gz
Qt-aa71e8492b02be079312d39033a54209fb80f9aa.tar.bz2
Merge branch '4.6' of git:qt/qt into 4.6
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qsslcertificate/tst_qsslcertificate.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
index add48c4..4dfb6b9 100644
--- a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
+++ b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
@@ -267,6 +267,8 @@ void tst_QSslCertificate::compareCertificates(
QCOMPARE(cert1.alternateSubjectNames(), cert2.alternateSubjectNames());
QCOMPARE(cert1.effectiveDate(), cert2.effectiveDate());
QCOMPARE(cert1.expiryDate(), cert2.expiryDate());
+ QCOMPARE(cert1.version(), cert2.version());
+ QCOMPARE(cert1.serialNumber(), cert2.serialNumber());
// ### add more functions here ...
}
@@ -677,7 +679,9 @@ void tst_QSslCertificate::certInfo()
QCOMPARE(cert.subjectInfo("C"), QString("NO"));
QCOMPARE(cert.subjectInfo("ST"), QString());
- QCOMPARE(cert.version(), QByteArray());
+ QCOMPARE(cert.version(), QByteArray::number(1));
+ QCOMPARE(cert.serialNumber(), QByteArray::number(17));
+
QCOMPARE(cert.toPem().constData(), (const char*)pem);
QCOMPARE(cert.toDer(), QByteArray::fromHex(der));