fix(test): update CertificateServiceTest and TenantPortalServiceTest for new audit constructor params
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package io.cameleer.saas.certificate;
|
||||
|
||||
import io.cameleer.saas.audit.AuditService;
|
||||
import io.cameleer.saas.tenant.TenantRepository;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
@@ -30,11 +31,14 @@ class CertificateServiceTest {
|
||||
@Mock
|
||||
private TenantRepository tenantRepository;
|
||||
|
||||
@Mock
|
||||
private AuditService auditService;
|
||||
|
||||
private CertificateService service;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
service = new CertificateService(certManager, certRepository, tenantRepository);
|
||||
service = new CertificateService(certManager, certRepository, tenantRepository, auditService);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -94,7 +98,7 @@ class CertificateServiceTest {
|
||||
when(certRepository.findByStatus(CertificateEntity.Status.ACTIVE))
|
||||
.thenReturn(Optional.empty());
|
||||
|
||||
service.activate();
|
||||
service.activate(UUID.randomUUID());
|
||||
|
||||
verify(certManager).activate();
|
||||
assertThat(staged.getStatus()).isEqualTo(CertificateEntity.Status.ACTIVE);
|
||||
@@ -105,6 +109,8 @@ class CertificateServiceTest {
|
||||
void activate_archivesCurrentActive() {
|
||||
var staged = new CertificateEntity();
|
||||
staged.setStatus(CertificateEntity.Status.STAGED);
|
||||
staged.setSubject("CN=new");
|
||||
staged.setFingerprint("AA:BB");
|
||||
|
||||
var active = new CertificateEntity();
|
||||
active.setStatus(CertificateEntity.Status.ACTIVE);
|
||||
@@ -116,7 +122,7 @@ class CertificateServiceTest {
|
||||
when(certRepository.findByStatus(CertificateEntity.Status.ACTIVE))
|
||||
.thenReturn(Optional.of(active));
|
||||
|
||||
service.activate();
|
||||
service.activate(UUID.randomUUID());
|
||||
|
||||
assertThat(active.getStatus()).isEqualTo(CertificateEntity.Status.ARCHIVED);
|
||||
assertThat(active.getArchivedAt()).isNotNull();
|
||||
@@ -127,7 +133,7 @@ class CertificateServiceTest {
|
||||
when(certRepository.findByStatus(CertificateEntity.Status.STAGED))
|
||||
.thenReturn(Optional.empty());
|
||||
|
||||
assertThatThrownBy(() -> service.activate())
|
||||
assertThatThrownBy(() -> service.activate(UUID.randomUUID()))
|
||||
.isInstanceOf(IllegalStateException.class);
|
||||
}
|
||||
|
||||
@@ -148,7 +154,7 @@ class CertificateServiceTest {
|
||||
when(certRepository.findByStatus(CertificateEntity.Status.ACTIVE))
|
||||
.thenReturn(Optional.of(active));
|
||||
|
||||
service.restore();
|
||||
service.restore(UUID.randomUUID());
|
||||
|
||||
verify(certManager).restore();
|
||||
assertThat(archived.getStatus()).isEqualTo(CertificateEntity.Status.ACTIVE);
|
||||
@@ -164,7 +170,7 @@ class CertificateServiceTest {
|
||||
when(certRepository.findByStatus(CertificateEntity.Status.ARCHIVED))
|
||||
.thenReturn(Optional.of(archived));
|
||||
|
||||
assertThatThrownBy(() -> service.restore())
|
||||
assertThatThrownBy(() -> service.restore(UUID.randomUUID()))
|
||||
.isInstanceOf(IllegalStateException.class)
|
||||
.hasMessageContaining("expired");
|
||||
}
|
||||
@@ -175,7 +181,7 @@ class CertificateServiceTest {
|
||||
when(certRepository.findByStatus(CertificateEntity.Status.STAGED))
|
||||
.thenReturn(Optional.of(staged));
|
||||
|
||||
service.discardStaged();
|
||||
service.discardStaged(UUID.randomUUID());
|
||||
|
||||
verify(certManager).discardStaged();
|
||||
verify(certRepository).delete(staged);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package io.cameleer.saas.portal;
|
||||
|
||||
import io.cameleer.saas.account.AccountService;
|
||||
import io.cameleer.saas.audit.AuditService;
|
||||
import io.cameleer.saas.config.TenantContext;
|
||||
import io.cameleer.saas.identity.LogtoManagementClient;
|
||||
import io.cameleer.saas.identity.ServerApiClient;
|
||||
@@ -50,6 +51,9 @@ class TenantPortalServiceTest {
|
||||
@Mock
|
||||
private AccountService accountService;
|
||||
|
||||
@Mock
|
||||
private AuditService auditService;
|
||||
|
||||
private final ProvisioningProperties provisioningProps = new ProvisioningProperties(
|
||||
null, null, null, null, null, "test.example.com", "https", null, null, null, null, null, null, null, null, null);
|
||||
|
||||
@@ -60,7 +64,7 @@ class TenantPortalServiceTest {
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
TenantContext.setTenantId(tenantId);
|
||||
tenantPortalService = new TenantPortalService(tenantService, licenseService, serverApiClient, logtoClient, tenantProvisioner, provisioningProps, null, accountService);
|
||||
tenantPortalService = new TenantPortalService(tenantService, licenseService, serverApiClient, logtoClient, tenantProvisioner, provisioningProps, null, accountService, auditService);
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
|
||||
Reference in New Issue
Block a user