summaryrefslogtreecommitdiffstats
path: root/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
diff options
context:
space:
mode:
authorJan-Arve Sæther <jan-arve.saether@nokia.com>2010-01-28 16:13:16 (GMT)
committerJan-Arve Sæther <jan-arve.saether@nokia.com>2010-01-28 16:13:16 (GMT)
commitb383ff766764f4d0d9644ca06bfb049d62bdcf2f (patch)
tree3d8fbe861d3618bd37b33e25a697a6bfa6614e46 /tests/auto/qsslcertificate/tst_qsslcertificate.cpp
parent0585997b7dbe25ece9f60684171c16206d10d65f (diff)
parent7c2000060bbc152ae32594f3d4dd60bd3351dab0 (diff)
downloadQt-b383ff766764f4d0d9644ca06bfb049d62bdcf2f.zip
Qt-b383ff766764f4d0d9644ca06bfb049d62bdcf2f.tar.gz
Qt-b383ff766764f4d0d9644ca06bfb049d62bdcf2f.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'tests/auto/qsslcertificate/tst_qsslcertificate.cpp')
-rw-r--r--tests/auto/qsslcertificate/tst_qsslcertificate.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
index 44f8522..c76c11f 100644
--- a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
+++ b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
@@ -543,6 +543,9 @@ void tst_QSslCertificate::fromPath_data()
QTest::newRow("\"d.*/c.*.pem\" wildcard der") << QString("d.*/c.*.pem") << int(QRegExp::Wildcard) << false << 0;
QTest::newRow("trailing-whitespace") << QString("more-certificates/trailing-whitespace.pem") << int(QRegExp::FixedString) << true << 1;
+ QTest::newRow("no-ending-newline") << QString("more-certificates/no-ending-newline.pem") << int(QRegExp::FixedString) << true << 1;
+ QTest::newRow("malformed-just-begin") << QString("more-certificates/malformed-just-begin.pem") << int(QRegExp::FixedString) << true << 0;
+ QTest::newRow("malformed-just-begin-no-newline") << QString("more-certificates/malformed-just-begin-no-newline.pem") << int(QRegExp::FixedString) << true << 0;
}
void tst_QSslCertificate::fromPath()