summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2012-02-14 13:10:02 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-16 02:00:46 +0100
commit6dfb1de099158bb640f830647d09499934209b53 (patch)
treead018714341ebc8116b88207771b4f35f30872ed /tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
parent9864241309203aeeda3c247fed8da8ab0ca2d041 (diff)
Eliminate duplicate data row names in network autotests
Change-Id: Icbfc24309a182f37268232fc3c299d35d6d6a0ea Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp')
-rw-r--r--tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
index f59f0bb5a9..657b91152f 100644
--- a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
+++ b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
@@ -295,10 +295,11 @@ void tst_QSslKey::toEncryptedPemOrDer_data()
<< "aAzZ`1234567890-=~!@#$%^&*()_+[]{}\\|;:'\",.<>/?"; // ### add more (?)
foreach (KeyInfo keyInfo, keyInfoList) {
foreach (QString password, passwords) {
- QString testName = QString("%1-%2-%3-%4").arg(keyInfo.fileInfo.fileName())
+ QString testName = QString("%1-%2-%3-%4-%5").arg(keyInfo.fileInfo.fileName())
.arg(keyInfo.algorithm == QSsl::Rsa ? "RSA" : "DSA")
.arg(keyInfo.type == QSsl::PrivateKey ? "PrivateKey" : "PublicKey")
- .arg(keyInfo.format == QSsl::Pem ? "PEM" : "DER");
+ .arg(keyInfo.format == QSsl::Pem ? "PEM" : "DER")
+ .arg(password);
QTest::newRow(testName.toLatin1())
<< keyInfo.fileInfo.absoluteFilePath() << keyInfo.algorithm << keyInfo.type
<< keyInfo.format << password;