update unit tests

smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/TestUtilsDao.java

@@ -216,7 +216,9 @@ public class TestUtilsDao {
         DBCredential c1 = TestDBUtils.createDBCredentialForUser(user1, null, null, null);
         c1.setValue(BCrypt.hashpw(USERNAME_1_PASSWORD, BCrypt.gensalt()));
         user1.getUserCredentials().add(c1);
+
         user2 = createDBUserByCertificate(USER_CERT_2);
+
         user3 = createDBUserByUsername(USERNAME_3);
         DBCredential c3 = TestDBUtils.createDBCredentialForUserAccessToken(user3, null, null, null);
         c3.setValue(BCrypt.hashpw(USERNAME_3_AT_PASSWORD, BCrypt.gensalt()));

smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/AbstractServiceIntegrationTest.java

@@ -59,7 +59,7 @@ public abstract class AbstractServiceIntegrationTest extends AbstractBaseDao {
 
 
     protected Path resourceDirectory = Paths.get("src", "test", "resources", "keystores");
-    protected Path targetDirectory = Paths.get("target", "keystores");
+    protected Path targetDirectory = Paths.get("target", "smp");
 
     @Autowired
     protected ResourceDao serviceGroupDao;
@@ -245,4 +245,5 @@ public abstract class AbstractServiceIntegrationTest extends AbstractBaseDao {
         FileUtils.deleteDirectory(targetDirectory.toFile());
         FileUtils.copyDirectory(resourceDirectory.toFile(), targetDirectory.toFile());
     }
+
 }

smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/CredentialServiceTest.java

@@ -102,7 +102,6 @@ public class CredentialServiceTest extends AbstractServiceIntegrationTest {
         credential.setLastFailedLoginAttempt(OffsetDateTime.now());
         credential.setSequentialLoginFailureCount(100);
         testUtilsDao.merge(credential);
-        testUtilsDao.clear();
 
         // given
         String username = TestConstants.USERNAME_1;
@@ -118,7 +117,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;

smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/TestDBUtils.java

@@ -262,7 +262,6 @@ public class TestDBUtils {
 
     public static DBUser createDBUserByUsername(String userName) {
         DBUser dbuser = new DBUser();
-
         dbuser.setUsername(userName);
         dbuser.setEmailAddress(userName + "@test.eu");
         dbuser.setActive(true);