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 9b2a3292ea2a688865efcd4513fab53d8d59df39 Author: Tran Tien Duc <[email protected]> AuthorDate: Tue May 7 18:41:32 2019 +0700 JAMES-2717 Replace EmbeddedElasticSearchRule by the docker one --- .../org/apache/james/CassandraJmapTestRule.java | 9 ++-- .../apache/james/EmbeddedElasticSearchRule.java | 61 ---------------------- .../james/CassandraRabbitMQAwsS3JmapTestRule.java | 10 ++-- .../james/CassandraRabbitMQSwiftJmapTestRule.java | 9 ++-- 4 files changed, 18 insertions(+), 71 deletions(-) diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java index b0a3ef5..ac072e2 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java @@ -25,7 +25,7 @@ import java.io.IOException; import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.store.search.PDFTextExtractor; -import org.apache.james.modules.TestESMetricReporterModule; +import org.apache.james.modules.TestDockerESMetricReporterModule; import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.server.core.configuration.Configuration; import org.apache.james.webadmin.WebAdminConfiguration; @@ -42,17 +42,20 @@ public class CassandraJmapTestRule implements TestRule { private final TemporaryFolder temporaryFolder; public static CassandraJmapTestRule defaultTestRule() { - return new CassandraJmapTestRule(new EmbeddedElasticSearchRule()); + return new CassandraJmapTestRule(); } private final GuiceModuleTestRule guiceModuleTestRule; + private final DockerElasticSearchRule dockerElasticSearchRule; public CassandraJmapTestRule(GuiceModuleTestRule... guiceModuleTestRule) { TempFilesystemTestRule tempFilesystemTestRule = new TempFilesystemTestRule(); + this.dockerElasticSearchRule = new DockerElasticSearchRule(); this.temporaryFolder = tempFilesystemTestRule.getTemporaryFolder(); this.guiceModuleTestRule = AggregateGuiceModuleTestRule .of(guiceModuleTestRule) + .aggregate(dockerElasticSearchRule) .aggregate(tempFilesystemTestRule); } @@ -66,7 +69,7 @@ public class CassandraJmapTestRule implements TestRule { .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) - .overrideWith(new TestESMetricReporterModule()) + .overrideWith(new TestDockerESMetricReporterModule(dockerElasticSearchRule.getDockerEs().getHttpHost())) .overrideWith(guiceModuleTestRule.getModule()) .overrideWith((binder -> binder.bind(CleanupTasksPerformer.class).asEagerSingleton())) .overrideWith(binder -> binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION)) diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/EmbeddedElasticSearchRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/EmbeddedElasticSearchRule.java deleted file mode 100644 index b4c524f..0000000 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/EmbeddedElasticSearchRule.java +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - -package org.apache.james; - -import org.apache.james.backends.es.EmbeddedElasticSearch; -import org.apache.james.modules.TestEmbeddedElasticSearchModule; -import org.elasticsearch.node.Node; -import org.junit.rules.RuleChain; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -import com.google.inject.Module; - - -public class EmbeddedElasticSearchRule implements GuiceModuleTestRule { - - private final TemporaryFolder temporaryFolder = new TemporaryFolder(); - private final EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder); - - private final RuleChain chain = RuleChain - .outerRule(temporaryFolder) - .around(embeddedElasticSearch); - - @Override - public Statement apply(Statement base, Description description) { - return chain.apply(base, description); - } - - @Override - public void await() { - embeddedElasticSearch.awaitForElasticSearch(); - } - - - @Override - public Module getModule() { - return new TestEmbeddedElasticSearchModule(embeddedElasticSearch); - } - - public Node getNode() { - return embeddedElasticSearch.getNode(); - } -} diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java index 85dd81b..e6c295b 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java +++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java @@ -24,8 +24,7 @@ import java.io.IOException; import org.apache.james.backend.rabbitmq.DockerRabbitMQSingleton; import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.store.search.PDFTextExtractor; -import org.apache.james.modules.TestAwsS3BlobStoreModule; -import org.apache.james.modules.TestESMetricReporterModule; +import org.apache.james.modules.TestDockerESMetricReporterModule; import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.modules.TestRabbitMQModule; import org.apache.james.modules.blobstore.BlobStoreChoosingConfiguration; @@ -45,17 +44,20 @@ public class CassandraRabbitMQAwsS3JmapTestRule implements TestRule { private final TemporaryFolder temporaryFolder; public static CassandraRabbitMQAwsS3JmapTestRule defaultTestRule() { - return new CassandraRabbitMQAwsS3JmapTestRule(new EmbeddedElasticSearchRule(), new DockerAwsS3TestRule()); + return new CassandraRabbitMQAwsS3JmapTestRule(new DockerAwsS3TestRule()); } private final GuiceModuleTestRule guiceModuleTestRule; + private final DockerElasticSearchRule dockerElasticSearchRule; public CassandraRabbitMQAwsS3JmapTestRule(GuiceModuleTestRule... guiceModuleTestRule) { TempFilesystemTestRule tempFilesystemTestRule = new TempFilesystemTestRule(); + this.dockerElasticSearchRule = new DockerElasticSearchRule(); this.temporaryFolder = tempFilesystemTestRule.getTemporaryFolder(); this.guiceModuleTestRule = AggregateGuiceModuleTestRule .of(guiceModuleTestRule) + .aggregate(dockerElasticSearchRule) .aggregate(tempFilesystemTestRule); } @@ -72,7 +74,7 @@ public class CassandraRabbitMQAwsS3JmapTestRule implements TestRule { .overrideWith(binder -> binder.bind(BlobStoreChoosingConfiguration.class) .toInstance(BlobStoreChoosingConfiguration.objectStorage())) .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) - .overrideWith(new TestESMetricReporterModule()) + .overrideWith(new TestDockerESMetricReporterModule(dockerElasticSearchRule.getDockerEs().getHttpHost())) .overrideWith(guiceModuleTestRule.getModule()) .overrideWith((binder -> binder.bind(CleanupTasksPerformer.class).asEagerSingleton())) .overrideWith(additionals); diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQSwiftJmapTestRule.java b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQSwiftJmapTestRule.java index 8c7d7a1..f9e7918 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQSwiftJmapTestRule.java +++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQSwiftJmapTestRule.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.apache.james.backend.rabbitmq.DockerRabbitMQSingleton; import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.store.search.PDFTextExtractor; -import org.apache.james.modules.TestESMetricReporterModule; +import org.apache.james.modules.TestDockerESMetricReporterModule; import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.modules.TestRabbitMQModule; import org.apache.james.modules.TestSwiftBlobStoreModule; @@ -43,17 +43,20 @@ public class CassandraRabbitMQSwiftJmapTestRule implements TestRule { private final TemporaryFolder temporaryFolder; public static CassandraRabbitMQSwiftJmapTestRule defaultTestRule() { - return new CassandraRabbitMQSwiftJmapTestRule(new EmbeddedElasticSearchRule()); + return new CassandraRabbitMQSwiftJmapTestRule(); } private final GuiceModuleTestRule guiceModuleTestRule; + private final DockerElasticSearchRule dockerElasticSearchRule; public CassandraRabbitMQSwiftJmapTestRule(GuiceModuleTestRule... guiceModuleTestRule) { TempFilesystemTestRule tempFilesystemTestRule = new TempFilesystemTestRule(); + this.dockerElasticSearchRule = new DockerElasticSearchRule(); this.temporaryFolder = tempFilesystemTestRule.getTemporaryFolder(); this.guiceModuleTestRule = AggregateGuiceModuleTestRule .of(guiceModuleTestRule) + .aggregate(dockerElasticSearchRule) .aggregate(tempFilesystemTestRule); } @@ -69,7 +72,7 @@ public class CassandraRabbitMQSwiftJmapTestRule implements TestRule { .overrideWith(new TestRabbitMQModule(DockerRabbitMQSingleton.SINGLETON)) .overrideWith(new TestSwiftBlobStoreModule()) .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) - .overrideWith(new TestESMetricReporterModule()) + .overrideWith(new TestDockerESMetricReporterModule(dockerElasticSearchRule.getDockerEs().getHttpHost())) .overrideWith(guiceModuleTestRule.getModule()) .overrideWith((binder -> binder.bind(CleanupTasksPerformer.class).asEagerSingleton())) .overrideWith(additionals); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
