JAMES-2070 Make LDAP integration tests pass and remove unneeded code

apache · Jun 30, 2017 · eca1bbf · eca1bbf
1 parent cec7d29
commit eca1bbf
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 43 deletions.
diff --git a/backends-common/elasticsearch/pom.xml b/backends-common/elasticsearch/pom.xml
@@ -178,7 +178,8 @@
                 <dependency>
                     <groupId>org.testcontainers</groupId>
                     <artifactId>testcontainers</artifactId>
-                    <version>1.1.7</version>
+                    <version>1.3.1</version>
+                    <scope>test</scope>
                 </dependency>
             </dependencies>
             <build>

diff --git a/mailbox/elasticsearch/pom.xml b/mailbox/elasticsearch/pom.xml
@@ -279,6 +279,11 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-api</artifactId>
                 </dependency>
+                <dependency>
+                    <groupId>org.testcontainers</groupId>
+                    <artifactId>testcontainers</artifactId>
+                    <scope>test</scope>
+                </dependency>
                 <dependency>
                     <groupId>ch.qos.logback</groupId>
                     <artifactId>logback-classic</artifactId>

diff --git a/mailbox/pom.xml b/mailbox/pom.xml
@@ -633,6 +633,11 @@
                 <artifactId>assertj-guava</artifactId>
                 <version>1.3.1</version>
             </dependency>
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers</artifactId>
+                <version>1.3.1</version>
+            </dependency>
        </dependencies>
     </dependencyManagement>
 

diff --git a/mailbox/tika/pom.xml b/mailbox/tika/pom.xml
@@ -209,7 +209,9 @@
                 <dependency>
                     <groupId>org.testcontainers</groupId>
                     <artifactId>testcontainers</artifactId>
-                    <version>1.1.7</version>
+                    <scope>test</scope>
+                    <version>1.3.1</version>
+                    <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>junit</groupId>

diff --git a/mpt/pom.xml b/mpt/pom.xml
@@ -496,7 +496,7 @@
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>testcontainers</artifactId>
-                <version>1.1.7</version>
+                <version>1.3.1</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/...r/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java b/...r/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java
@@ -25,18 +25,17 @@
 import org.apache.james.util.streams.SwarmGenericContainer;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
-import org.testcontainers.shaded.com.github.dockerjava.api.model.ExposedPort;
-import org.testcontainers.shaded.com.github.dockerjava.api.model.Ports;
-import org.testcontainers.shaded.com.github.dockerjava.api.model.Ports.Binding;
 
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.Ports;
 import com.google.inject.Module;
 
 
 public class DockerCassandraRule implements GuiceModuleTestRule {
 
     private static final int CASSANDRA_PORT = 9042;
 
-    private static boolean isBindingToEveryThing(Binding binding) {
+    private static boolean isBindingToEveryThing(Ports.Binding binding) {
         String bindingIp = binding.getHostIp();
         return bindingIp == null || bindingIp.equals("0.0.0.0");
     }

diff --git a/...ntainer/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java b/...ntainer/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java
@@ -19,15 +19,11 @@
 
 package org.apache.james;
 
-import java.util.Arrays;
-
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.james.modules.mailbox.ElasticSearchConfiguration;
 import org.apache.james.util.streams.SwarmGenericContainer;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
-import org.testcontainers.shaded.com.github.dockerjava.api.model.ExposedPort;
-import org.testcontainers.shaded.com.github.dockerjava.api.model.Ports.Binding;
 
 import com.google.inject.Module;
 
@@ -37,11 +33,6 @@ public class DockerElasticSearchRule implements GuiceModuleTestRule {
     private static final int ELASTIC_SEARCH_PORT = 9300;
     public static final int ELASTIC_SEARCH_HTTP_PORT = 9200;
 
-    private static boolean isBindingToEveryThing(Binding binding) {
-        String bindingIp = binding.getHostIp();
-        return bindingIp == null || bindingIp.equals("0.0.0.0");
-    }
-
     public PropertiesConfiguration getElasticSearchConfigurationForDocker() {
         PropertiesConfiguration configuration = new PropertiesConfiguration();
 
@@ -82,21 +73,6 @@ public String getIp() {
         return elasticSearchContainer.getIp();
     }
 
-    public int getBindingPort() {
-        Binding[] bindings =  elasticSearchContainer
-                .getContainerInfo()
-                .getNetworkSettings()
-                .getPorts()
-                .getBindings()
-                .get(ExposedPort.tcp(ELASTIC_SEARCH_PORT));
-
-        return Integer.valueOf(
-                Arrays.stream(bindings)
-                    .filter(DockerElasticSearchRule::isBindingToEveryThing)
-                    .map(binding -> binding.getHostPortSpec())
-                    .findFirst().get());
-    }
-
     public SwarmGenericContainer getElasticSearchContainer() {
         return elasticSearchContainer;
     }

diff --git a/...ntainer/util-java8/src/test/java/org/apache/james/util/streams/SwarmGenericContainer.java b/...ntainer/util-java8/src/test/java/org/apache/james/util/streams/SwarmGenericContainer.java
@@ -31,8 +31,8 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.WaitStrategy;
 import org.testcontainers.images.builder.ImageFromDockerfile;
-import org.testcontainers.shaded.com.github.dockerjava.api.command.InspectContainerResponse;
 
+import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.google.common.base.Strings;
 
 public class SwarmGenericContainer implements TestRule {
@@ -105,14 +105,6 @@ public void stop() {
         container.stop();
     }
 
-    public String getContainerIpAddress() {
-        return container.getContainerIpAddress();
-    }
-
-    public Integer getMappedPort(int originalPort) {
-        return container.getMappedPort(originalPort);
-    }
-
     @SuppressWarnings("deprecation")
     public String getIp() {
         return getContainerInfo().getNetworkSettings().getIpAddress();
@@ -121,6 +113,7 @@ public String getIp() {
     public InspectContainerResponse getContainerInfo() {
         return container.getContainerInfo();
     }
+
     @Override
     public Statement apply(Statement statement, Description description) {
         return container.apply(statement, description);

diff --git a/...ap-integration-testing/src/test/java/org/apache/james/user/ldap/LdapGenericContainer.java b/...ap-integration-testing/src/test/java/org/apache/james/user/ldap/LdapGenericContainer.java
@@ -85,8 +85,8 @@ public void stop() {
 
     public String getLdapHost() {
         return "ldap://" +
-                container.getContainerIpAddress() +
+                container.getIp() +
                 ":" +
-                container.getMappedPort(LdapGenericContainer.DEFAULT_LDAP_PORT);
+                LdapGenericContainer.DEFAULT_LDAP_PORT;
     }
 }
diff --git a/server/pom.xml b/server/pom.xml
@@ -182,7 +182,7 @@
         <assertj-1.version>1.7.1</assertj-1.version>
         <assertj-1-guava.version>1.3.1</assertj-1-guava.version>
         <assertj-3.version>3.3.0</assertj-3.version>
-        <testcontainers-version>1.1.7</testcontainers-version>
+        <testcontainers-version>1.3.1</testcontainers-version>
         <guavate.version>1.0.0</guavate.version>
         <metrics.version>3.2.1</metrics.version>
         <joda.version>2.9.4</joda.version>

diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
@@ -265,6 +265,11 @@
                     <type>test-jar</type>
                     <scope>test</scope>
                 </dependency>
+                <dependency>
+                    <groupId>org.testcontainers</groupId>
+                    <artifactId>testcontainers</artifactId>
+                    <scope>test</scope>
+                </dependency>
             </dependencies>
             <build>
                 <plugins>

diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
@@ -233,6 +233,11 @@
                     <groupId>org.hamcrest</groupId>
                     <artifactId>java-hamcrest</artifactId>
                 </dependency>
+                <dependency>
+                    <groupId>org.testcontainers</groupId>
+                    <artifactId>testcontainers</artifactId>
+                    <scope>test</scope>
+                </dependency>
                 <dependency>
                     <groupId>ch.qos.logback</groupId>
                     <artifactId>logback-classic</artifactId>