You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2023/06/14 07:24:13 UTC
[james-project] 01/04: [CLEAN CODE] data-ldap test - avoid start twice ldap container
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit c0f54afd004d0d39cfe2386732a136428fc416f4
Author: Tung Tran <vt...@linagora.com>
AuthorDate: Wed Jun 7 10:17:46 2023 +0700
[CLEAN CODE] data-ldap test - avoid start twice ldap container
---
.../java/org/apache/james/user/ldap/DockerLdapSingleton.java | 3 ---
.../java/org/apache/james/user/ldap/LdapHealthCheckTest.java | 10 ++--------
.../user/ldap/ReadOnlyUsersLDAPRepositoryEmptyListTest.java | 5 +----
.../james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java | 10 +++-------
4 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/DockerLdapSingleton.java b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/DockerLdapSingleton.java
index 9de0fa7107..262101484d 100644
--- a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/DockerLdapSingleton.java
+++ b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/DockerLdapSingleton.java
@@ -34,7 +34,4 @@ public class DockerLdapSingleton {
.password(ADMIN_PASSWORD)
.build();
- static {
- ldapContainer.start();
- }
}
diff --git a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/LdapHealthCheckTest.java b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/LdapHealthCheckTest.java
index 61c2d8f3c0..f0204c3c5a 100644
--- a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/LdapHealthCheckTest.java
+++ b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/LdapHealthCheckTest.java
@@ -18,8 +18,6 @@
****************************************************************/
package org.apache.james.user.ldap;
-import static org.apache.james.user.ldap.DockerLdapSingleton.ADMIN_PASSWORD;
-import static org.apache.james.user.ldap.DockerLdapSingleton.DOMAIN;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.core.healthcheck.Result;
@@ -30,13 +28,9 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
class LdapHealthCheckTest {
- static LdapGenericContainer ldapContainer = LdapGenericContainer.builder()
- .domain(DOMAIN)
- .password(ADMIN_PASSWORD)
- .build();
-
- LdapHealthCheck ldapHealthCheck;
+ static LdapGenericContainer ldapContainer = DockerLdapSingleton.ldapContainer;
+ private LdapHealthCheck ldapHealthCheck;
@BeforeAll
static void setUpAll() {
ldapContainer.start();
diff --git a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryEmptyListTest.java b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryEmptyListTest.java
index 0f9e17c35a..90cb77aed6 100644
--- a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryEmptyListTest.java
+++ b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryEmptyListTest.java
@@ -39,10 +39,7 @@ import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableList;
class ReadOnlyUsersLDAPRepositoryEmptyListTest {
- static LdapGenericContainer ldapContainer = LdapGenericContainer.builder()
- .domain(DOMAIN)
- .password(ADMIN_PASSWORD)
- .build();
+ static LdapGenericContainer ldapContainer = DockerLdapSingleton.ldapContainer;
DomainList domainList;
private ReadOnlyUsersLDAPRepository ldapRepository;
diff --git a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java
index 01d791f665..7253854708 100644
--- a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java
+++ b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java
@@ -26,7 +26,6 @@ import static org.apache.james.user.ldap.DockerLdapSingleton.DOMAIN;
import static org.apache.james.user.ldap.DockerLdapSingleton.JAMES_USER;
import static org.apache.james.user.ldap.DockerLdapSingleton.PASSWORD;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.util.Optional;
@@ -63,10 +62,7 @@ class ReadOnlyUsersLDAPRepositoryTest {
static final String BAD_PASSWORD = "badpassword";
public static final String SUPPORTS_VIRTUAL_HOSTING = "supportsVirtualHosting";
- static LdapGenericContainer ldapContainer = LdapGenericContainer.builder()
- .domain(DOMAIN)
- .password(ADMIN_PASSWORD)
- .build();
+ static LdapGenericContainer ldapContainer = DockerLdapSingleton.ldapContainer;
@BeforeAll
static void setUpAll() {
@@ -245,13 +241,13 @@ class ReadOnlyUsersLDAPRepositoryTest {
void testShouldStillWorkAfterRestartingLDAP() throws Exception {
usersRepository.test(JAMES_USER_MAIL, PASSWORD);
- DockerLdapSingleton.ldapContainer.pause();
+ ldapContainer.pause();
try {
usersRepository.test(JAMES_USER_MAIL, PASSWORD);
} catch (Exception e) {
LOGGER.info("This exception is expected as we shut down the LDAP and forced its use", e);
}
- DockerLdapSingleton.ldapContainer.unpause();
+ ldapContainer.unpause();
assertThat(usersRepository.test(JAMES_USER_MAIL, PASSWORD)).isTrue();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org