comparison ui/tests/nsstest.cpp @ 483:a055847decbc

merged.
author Raimund Renkert <rrenkert@intevation.de>
date Thu, 24 Apr 2014 12:45:11 +0200
parents 48161978c84c
children dcb014e7d32f
comparison
equal deleted inserted replaced
482:0f4331ed4e83 483:a055847decbc
168 { 168 {
169 /* Remove one certificate */ 169 /* Remove one certificate */
170 QVERIFY(instList.size() > 2); 170 QVERIFY(instList.size() > 2);
171 strv_append (&to_remove, to_install[1], qstrlen(to_install[1])); 171 strv_append (&to_remove, to_install[1], qstrlen(to_install[1]));
172 172
173 QList<QByteArray> beforeFF = get_nss_certs(&ffNSSDir);
174 QVERIFY(strv_length(to_remove) == 1);
173 QVERIFY(write_stores_nss(NULL, to_remove) == 0); 175 QVERIFY(write_stores_nss(NULL, to_remove) == 0);
174 176
175 QList<QByteArray> installedCertsFF = get_nss_certs(&ffNSSDir); 177 QList<QByteArray> installedCertsFF = get_nss_certs(&ffNSSDir);
176 QList<QByteArray> installedCertsTB = get_nss_certs(&tbNSSDir); 178 QList<QByteArray> installedCertsTB = get_nss_certs(&tbNSSDir);
179 QVERIFY(beforeFF.size() > 0);
180 QVERIFY(beforeFF.size() - 1 == installedCertsFF.size());
177 181
178 QVERIFY(installedCertsFF == installedCertsTB); 182 QVERIFY(installedCertsFF == installedCertsTB);
179 183
180 QByteArray bai = QByteArray::fromBase64(to_install[1]); 184 QByteArray bai = QByteArray::fromBase64(to_install[1]);
181 QVERIFY(!installedCertsTB.contains(bai)); 185 QVERIFY(!installedCertsTB.contains(bai));

http://wald.intevation.org/projects/trustbridge/