The_Great_Archive/xca
1
0
Fork 0
mirror of https://github.com/chris2511/xca.git synced 2026-09-12 19:51:05 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix renewal test

Browse Source
This commit is contained in:
Christian Hohnstaedt 2024-03-31 19:21:36 +02:00
parent f3ed7ef09e
commit 12e761eec4
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/main.h
View File

@ -13,6 +13,9 @@
#include "PwDialogMock.h"
#include <QTest>
#include <QtGlobal>
class test_main: public QObject
{
Q_OBJECT
@ -45,8 +48,11 @@ class test_main: public QObject
ret = dest;
}
}
if (ret)
if (ret) {
if (!QTest::qWaitForWindowActive(ret))
return nullptr;
return ret;
}
QThread::msleep(50);
}
qWarning() << "Widget not found:" << name;

17
test/renewal.cpp
View File

@ -45,10 +45,12 @@ void renew()
CertExtend *dlg = test_main::findWindow<CertExtend>("CertExtend");
if (!dlg)
return;
dlg->validNumber->setText("1");
dlg->validRange->setCurrentIndex(1);
dlg->applyTime->click();
not_after = dlg->notAfter->getDate();
dlg->replace->setCheckState(Qt::Unchecked);
dlg->revoke->setCheckState(Qt::Unchecked);
dlg->notAfter->setDate(not_after);
dlg->buttonBox->button(QDialogButtonBox::Ok)->click();
dlg->buttonBox->button(QDialogButtonBox::Ok)->click();
}
@ -62,7 +64,6 @@ void renew_del_keep_serial()
dlg->noWellDefinedExpDate->setCheckState(Qt::Checked);
dlg->keepSerial->setCheckState(Qt::Checked);
dlg->buttonBox->button(QDialogButtonBox::Ok)->click();
dlg->buttonBox->button(QDialogButtonBox::Ok)->click();
}
QList<pki_x509*> getcerts(const QString &name)
@ -90,11 +91,14 @@ void test_main::revoke()
dbstatus();
QThread *job;
QList<pki_x509*> l;
db_x509 *certs = Database.model<db_x509>();
pki_x509 *cert;
a1int serial;
// Revoke and renew
pki_x509 *cert = dynamic_cast<pki_x509*>(certs->getByName("Inter CA 1"));
a1int serial = cert->getSerial();
cert = dynamic_cast<pki_x509*>(certs->getByName("Inter CA 1"));
serial = cert->getSerial();
job = QThread::create(revoke_and_renew);
job->start();
certs->certRenewal({ certs->index(cert) });
@ -102,7 +106,7 @@ void test_main::revoke()
delete job;
dbstatus();
QList<pki_x509*> l = getcerts("Inter CA 1");
l = getcerts("Inter CA 1");
QCOMPARE(1, l.size());
bool found = false;
@ -114,7 +118,6 @@ void test_main::revoke()
QVERIFY2(found, "Revoked serial not found");
// renew
not_after = not_after.addDays(30);
job = QThread::create(renew);
job->start();
certs->certRenewal({ certs->index(certs->getByName("Inter CA 1")) });