From 63b2c5433722b924b805ef9e4c64e5c601063813 Mon Sep 17 00:00:00 2001
From: RIHTARSIC Joze <joze.rihtarsic@ext.ec.europa.eu>
Date: Thu, 22 Jun 2023 14:24:11 +0200
Subject: [PATCH] update unit tests
---
.../eu/europa/ec/edelivery/smp/data/dao/TestUtilsDao.java | 6 ++++++
.../ec/edelivery/smp/services/CredentialServiceTest.java | 6 +++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/TestUtilsDao.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/TestUtilsDao.java
index bc470283d..b43bff337 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/TestUtilsDao.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/TestUtilsDao.java
@@ -595,6 +595,12 @@ public class TestUtilsDao {
return memEManager.merge(entity);
}
+
+ public void clear() {
+ memEManager.clear();
+ }
+
+
public DBDomain getD1() {
return d1;
}
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/CredentialServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/CredentialServiceTest.java
index 653502d56..bded8f8bf 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/CredentialServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/CredentialServiceTest.java
@@ -14,6 +14,7 @@ import org.springframework.security.core.Authentication;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
+import java.io.IOException;
import java.time.OffsetDateTime;
import static org.junit.Assert.*;
@@ -27,9 +28,10 @@ public class CredentialServiceTest extends AbstractServiceIntegrationTest {
CredentialService testInstance;
@Before
- public void beforeMethods() {
+ public void beforeMethods() throws IOException {
testUtilsDao.clearData();
testUtilsDao.createUsers();
+ resetKeystore();
configurationDao.refreshProperties();
}
@@ -100,6 +102,7 @@ public class CredentialServiceTest extends AbstractServiceIntegrationTest {
credential.setLastFailedLoginAttempt(OffsetDateTime.now());
credential.setSequentialLoginFailureCount(100);
testUtilsDao.merge(credential);
+ testUtilsDao.clear();
// given
String username = TestConstants.USERNAME_1;
@@ -115,6 +118,7 @@ public class CredentialServiceTest extends AbstractServiceIntegrationTest {
credential.setLastFailedLoginAttempt(OffsetDateTime.now().minusDays(100));
credential.setSequentialLoginFailureCount(100);
testUtilsDao.merge(credential);
+ testUtilsDao.clear();
// given
String username = TestConstants.USERNAME_1;
--
GitLab