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 6cf8e7db036f482590ec2ce407086ed630392319 Author: Benoit Tellier <[email protected]> AuthorDate: Mon Jul 27 10:07:23 2020 +0700 JAMES-3350 Drop CassandraRabbitMQSwiftJmapTestRule Use AWS version instead --- .../james/CassandraRabbitMQSwiftJmapTestRule.java | 99 ---------------------- .../jmap/rabbitmq/RabbitMQSwiftFilterTest.java | 49 ----------- 2 files changed, 148 deletions(-) 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 deleted file mode 100644 index c359987..0000000 --- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQSwiftJmapTestRule.java +++ /dev/null @@ -1,99 +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 java.io.IOException; - -import org.apache.james.backends.rabbitmq.DockerRabbitMQSingleton; -import org.apache.james.modules.TestDockerESMetricReporterModule; -import org.apache.james.modules.TestJMAPServerModule; -import org.apache.james.modules.TestRabbitMQModule; -import org.apache.james.modules.blobstore.BlobStoreConfiguration; -import org.apache.james.modules.objectstorage.swift.DockerSwiftTestRule; -import org.junit.rules.TemporaryFolder; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -import com.google.inject.Module; - -public class CassandraRabbitMQSwiftJmapTestRule implements TestRule { - - public static final int TWO_SECONDS = 2000; - private final TemporaryFolder temporaryFolder; - - public static CassandraRabbitMQSwiftJmapTestRule defaultTestRule() { - 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); - } - - public GuiceJamesServer jmapServer(Module... additionals) throws IOException { - CassandraRabbitMQJamesConfiguration configuration = CassandraRabbitMQJamesConfiguration.builder() - .workingDirectory(temporaryFolder.newFolder()) - .configurationFromClasspath() - .blobStore(BlobStoreConfiguration.builder() - .objectStorage() - .disableCache() - .deduplication()) - .searchConfiguration(SearchConfiguration.elasticSearch()) - .build(); - - return CassandraRabbitMQJamesServerMain.createServer(configuration) - .overrideWith(new TestRabbitMQModule(DockerRabbitMQSingleton.SINGLETON)) - .overrideWith(new DockerSwiftTestRule().getModule()) - .overrideWith(new TestJMAPServerModule()) - .overrideWith(new TestDockerESMetricReporterModule(dockerElasticSearchRule.getDockerEs().getHttpHost())) - .overrideWith(guiceModuleTestRule.getModule()) - .overrideWith((binder -> binder.bind(CleanupTasksPerformer.class).asEagerSingleton())) - .overrideWith(additionals); - } - - @Override - public Statement apply(Statement base, Description description) { - return guiceModuleTestRule.apply(base, description); - } - - public void await() { - awaitProcessingStart(); - guiceModuleTestRule.await(); - } - - private void awaitProcessingStart() { - // As the RabbitMQEventBus is asynchronous we have otherwise no guaranties that the processing to be awaiting for did start - try { - Thread.sleep(TWO_SECONDS); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } - } -} diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQSwiftFilterTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQSwiftFilterTest.java deleted file mode 100644 index 4386e03..0000000 --- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQSwiftFilterTest.java +++ /dev/null @@ -1,49 +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.jmap.rabbitmq; - -import java.io.IOException; - -import org.apache.james.CassandraRabbitMQSwiftJmapTestRule; -import org.apache.james.DockerCassandraRule; -import org.apache.james.GuiceJamesServer; -import org.apache.james.jmap.draft.methods.integration.FilterTest; -import org.apache.james.mailbox.cassandra.ids.CassandraId; -import org.apache.james.mailbox.model.MailboxId; -import org.junit.Rule; - -public class RabbitMQSwiftFilterTest extends FilterTest { - - @Rule - public DockerCassandraRule cassandra = new DockerCassandraRule(); - - @Rule - public CassandraRabbitMQSwiftJmapTestRule rule = CassandraRabbitMQSwiftJmapTestRule.defaultTestRule(); - - @Override - protected GuiceJamesServer createJmapServer() throws IOException { - return rule.jmapServer(cassandra.getModule()); - } - - @Override - protected MailboxId randomMailboxId() { - return CassandraId.timeBased(); - } -} \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
