merge development into master

src/test/java/at/ac/uibk/gitsearch/service/AuditEventServiceIT.java

@@ -5,11 +5,14 @@ import static org.assertj.core.api.Assertions.assertThat;
 import at.ac.uibk.gitsearch.GitsearchApp;
 import at.ac.uibk.gitsearch.domain.PersistentAuditEvent;
 import at.ac.uibk.gitsearch.repository.jpa.PersistenceAuditEventRepository;
+
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+
+import org.junit.Assert;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
@@ -24,6 +27,7 @@ import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionCallback;
 import org.springframework.transaction.support.TransactionTemplate;
+
 import tech.jhipster.config.JHipsterProperties;
 
 /**
@@ -55,10 +59,18 @@ public class AuditEventServiceIT {
 
   private static final int MAX_OUTDATEDVALUES = 4500;
 
+  private int currentAuditLogs;
   @BeforeEach
   public void init() {
-    log.info("Preparing {} outdated AuditEvents", MAX_OUTDATEDVALUES);
-    auditEventsOld = new ArrayList<>();
+      currentAuditLogs = persistenceAuditEventRepository.findAll().size();
+      log.info("There where already {}  AuditEvents", currentAuditLogs);
+      final List<PersistentAuditEvent> auditEventDeleteCandidates = persistenceAuditEventRepository
+              .findTop1000ByAuditEventDateBefore(
+                      Instant.now().minus(jHipsterProperties.getAuditEvents().getRetentionPeriod(), ChronoUnit.DAYS));
+      Assert.assertTrue("There are already outdated Elements?", auditEventDeleteCandidates.size() == 0);
+
+      log.info("Preparing {} outdated AuditEvents", MAX_OUTDATEDVALUES);
+      auditEventsOld = new ArrayList<>();
     for (int i = 1; i <= MAX_OUTDATEDVALUES; i++) {
       PersistentAuditEvent auditEventOld = new PersistentAuditEvent();
       auditEventOld.setAuditEventDate(
@@ -111,7 +123,7 @@ public class AuditEventServiceIT {
     auditEventService.removeOldAuditEvents();
     //        persistenceAuditEventRepository.flush();
 
-    assertThat(persistenceAuditEventRepository.findAll().size()).isEqualTo(2);
+    assertThat(persistenceAuditEventRepository.findAll().size()).isEqualTo(currentAuditLogs + 2);
     assertThat(persistenceAuditEventRepository.findByPrincipal("test-user-old")).isEmpty();
     assertThat(persistenceAuditEventRepository.findByPrincipal("test-user-retention")).isNotEmpty();
     assertThat(persistenceAuditEventRepository.findByPrincipal("test-user-new")).isNotEmpty();