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 e260bbaada93ab7116856f6316021864dfecdc58 Author: Benoit Tellier <[email protected]> AuthorDate: Mon Jul 27 09:58:00 2020 +0700 JAMES-3350 Remove unused await() calls --- .../james/jmap/cassandra/CassandraGetVacationResponseTest.java | 5 ----- .../james/jmap/cassandra/CassandraSetMailboxesMethodTest.java | 7 ------- .../jmap/cassandra/CassandraSetMessagesMethodReRoutingTest.java | 5 ----- .../james/jmap/cassandra/CassandraSetVacationResponseTest.java | 7 ------- .../james/jmap/cassandra/CassandraVacationIntegrationTest.java | 7 ------- .../jmap/cassandra/CassandraVacationRelayIntegrationTest.java | 5 ----- .../test/java/org/apache/james/jmap/VacationIntegrationTest.java | 3 --- .../java/org/apache/james/jmap/VacationRelayIntegrationTest.java | 3 --- .../jmap/draft/methods/integration/GetVacationResponseTest.java | 2 -- .../jmap/draft/methods/integration/SetMailboxesMethodTest.java | 2 -- .../draft/methods/integration/SetMessagesMethodReRoutingTest.java | 2 -- .../jmap/draft/methods/integration/SetVacationResponseTest.java | 2 -- .../james/jmap/memory/MemoryGetVacationResponseMethodTest.java | 5 ----- .../org/apache/james/jmap/memory/MemorySetMailboxesMethodTest.java | 5 ----- .../james/jmap/memory/MemorySetMessagesMethodReRoutingTest.java | 5 ----- .../james/jmap/memory/MemorySetVacationResponseMethodTest.java | 5 ----- .../apache/james/jmap/memory/MemoryVacationIntegrationTest.java | 6 ------ .../james/jmap/memory/MemoryVacationRelayIntegrationTest.java | 5 ----- .../james/jmap/rabbitmq/RabbitMQAwsS3GetVacationResponseTest.java | 6 ------ .../james/jmap/rabbitmq/RabbitMQAwsS3SetMailboxesMethodTest.java | 7 ------- .../jmap/rabbitmq/RabbitMQAwsS3SetMessagesMethodReRoutingTest.java | 6 ------ .../james/jmap/rabbitmq/RabbitMQAwsS3SetVacationResponseTest.java | 6 ------ .../james/jmap/rabbitmq/RabbitMQAwsS3VacationIntegrationTest.java | 6 ------ .../jmap/rabbitmq/RabbitMQAwsS3VacationRelayIntegrationTest.java | 6 ------ 24 files changed, 118 deletions(-) diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java index 647f288..571b66f 100644 --- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java +++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java @@ -41,9 +41,4 @@ public class CassandraGetVacationResponseTest extends GetVacationResponseTest { return rule.jmapServer(cassandra.getModule()) .overrideWith(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider)); } - - @Override - protected void await() { - rule.await(); - } } diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java index 30eb185..9ee2bfa 100644 --- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java @@ -28,7 +28,6 @@ import org.apache.james.jmap.draft.methods.integration.SetMailboxesMethodTest; import org.junit.Rule; public class CassandraSetMailboxesMethodTest extends SetMailboxesMethodTest { - @Rule public DockerCassandraRule cassandra = new DockerCassandraRule(); @@ -39,10 +38,4 @@ public class CassandraSetMailboxesMethodTest extends SetMailboxesMethodTest { protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule()); } - - @Override - protected void await() { - rule.await(); - } - } diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodReRoutingTest.java b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodReRoutingTest.java index 52c001f..0077083 100644 --- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodReRoutingTest.java +++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodReRoutingTest.java @@ -39,9 +39,4 @@ public class CassandraSetMessagesMethodReRoutingTest extends SetMessagesMethodRe protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule()); } - - @Override - protected void await() { - rule.await(); - } } diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java index cbb3c36..8e953f7 100644 --- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java +++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java @@ -28,7 +28,6 @@ import org.apache.james.jmap.draft.methods.integration.SetVacationResponseTest; import org.junit.Rule; public class CassandraSetVacationResponseTest extends SetVacationResponseTest { - @Rule public DockerCassandraRule cassandra = new DockerCassandraRule(); @@ -39,10 +38,4 @@ public class CassandraSetVacationResponseTest extends SetVacationResponseTest { protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule()); } - - @Override - protected void await() { - rule.await(); - } - } diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java index e1ac498..3a53e69 100644 --- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java +++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java @@ -28,7 +28,6 @@ import org.apache.james.jmap.VacationIntegrationTest; import org.junit.Rule; public class CassandraVacationIntegrationTest extends VacationIntegrationTest { - @Rule public DockerCassandraRule cassandra = new DockerCassandraRule(); @@ -39,10 +38,4 @@ public class CassandraVacationIntegrationTest extends VacationIntegrationTest { protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule()); } - - @Override - protected void await() { - rule.await(); - } - } diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationRelayIntegrationTest.java b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationRelayIntegrationTest.java index dd00efa..988eb71 100644 --- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationRelayIntegrationTest.java +++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationRelayIntegrationTest.java @@ -47,11 +47,6 @@ public class CassandraVacationRelayIntegrationTest extends VacationRelayIntegrat } @Override - protected void await() { - rule.await(); - } - - @Override protected InMemoryDNSService getInMemoryDns() { return inMemoryDNSService; } diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java index 3f2e3a1..ff7c010 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java @@ -73,8 +73,6 @@ public abstract class VacationIntegrationTest { protected abstract GuiceJamesServer createJmapServer() throws IOException; - protected abstract void await(); - @Before public void setUp() throws Exception { guiceJamesServer = createJmapServer(); @@ -90,7 +88,6 @@ public abstract class VacationIntegrationTest { mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USER_2.asString(), DefaultMailboxes.SENT); mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USER_1.asString(), DefaultMailboxes.INBOX); mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USER_2.asString(), DefaultMailboxes.INBOX); - await(); jmapGuiceProbe = guiceJamesServer.getProbe(JmapGuiceProbe.class); RestAssured.requestSpecification = jmapRequestSpecBuilder diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java index 4402cb0..38d7344 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java @@ -61,8 +61,6 @@ public abstract class VacationRelayIntegrationTest { private GuiceJamesServer guiceJamesServer; private JmapGuiceProbe jmapGuiceProbe; - protected abstract void await(); - protected abstract GuiceJamesServer getJmapServer() throws IOException; protected abstract InMemoryDNSService getInMemoryDns(); @@ -81,7 +79,6 @@ public abstract class VacationRelayIntegrationTest { MailboxProbe mailboxProbe = guiceJamesServer.getProbe(MailboxProbeImpl.class); mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USER_WITH_DOMAIN, DefaultMailboxes.SENT); mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USER_WITH_DOMAIN, DefaultMailboxes.INBOX); - await(); jmapGuiceProbe = guiceJamesServer.getProbe(JmapGuiceProbe.class); } diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetVacationResponseTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetVacationResponseTest.java index ed0c530..3139ef0 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetVacationResponseTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetVacationResponseTest.java @@ -62,8 +62,6 @@ public abstract class GetVacationResponseTest { protected abstract GuiceJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) throws IOException; - protected abstract void await(); - private AccessToken accessToken; private GuiceJamesServer jmapServer; private FixedDateZonedDateTimeProvider fixedDateZonedDateTimeProvider; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java index 86a9586..a2c824c 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java @@ -87,8 +87,6 @@ public abstract class SetMailboxesMethodTest { protected abstract GuiceJamesServer createJmapServer() throws IOException; - protected abstract void await(); - private AccessToken accessToken; private Username username; private GuiceJamesServer jmapServer; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodReRoutingTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodReRoutingTest.java index fca8b50..f98d2d4 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodReRoutingTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodReRoutingTest.java @@ -72,8 +72,6 @@ public abstract class SetMessagesMethodReRoutingTest { protected abstract GuiceJamesServer createJmapServer() throws IOException; - protected abstract void await(); - private GuiceJamesServer jmapServer; private MailboxProbe mailboxProbe; private DataProbe dataProbe; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetVacationResponseTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetVacationResponseTest.java index 03bba0f..bf69793 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetVacationResponseTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetVacationResponseTest.java @@ -60,8 +60,6 @@ public abstract class SetVacationResponseTest { protected abstract GuiceJamesServer createJmapServer() throws IOException; - protected abstract void await(); - private AccessToken accessToken; private GuiceJamesServer jmapServer; diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetVacationResponseMethodTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetVacationResponseMethodTest.java index 5f8b1dc..2b7b5a3 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetVacationResponseMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetVacationResponseMethodTest.java @@ -28,7 +28,6 @@ import org.apache.james.util.date.ZonedDateTimeProvider; import org.junit.Rule; public class MemoryGetVacationResponseMethodTest extends GetVacationResponseTest { - @Rule public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @@ -37,8 +36,4 @@ public class MemoryGetVacationResponseMethodTest extends GetVacationResponseTest return memoryJmap.jmapServer() .overrideWith(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider)); } - - @Override - protected void await() { - } } diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMailboxesMethodTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMailboxesMethodTest.java index aec07de..319fa3e 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMailboxesMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMailboxesMethodTest.java @@ -27,7 +27,6 @@ import org.apache.james.jmap.draft.methods.integration.SetMailboxesMethodTest; import org.junit.Rule; public class MemorySetMailboxesMethodTest extends SetMailboxesMethodTest { - @Rule public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @@ -35,8 +34,4 @@ public class MemorySetMailboxesMethodTest extends SetMailboxesMethodTest { protected GuiceJamesServer createJmapServer() throws IOException { return memoryJmap.jmapServer(); } - - @Override - protected void await() { - } } diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodReRoutingTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodReRoutingTest.java index b694c0d..0e258a3 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodReRoutingTest.java +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodReRoutingTest.java @@ -27,7 +27,6 @@ import org.apache.james.jmap.draft.methods.integration.SetMessagesMethodReRoutin import org.junit.Rule; public class MemorySetMessagesMethodReRoutingTest extends SetMessagesMethodReRoutingTest { - @Rule public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @@ -35,8 +34,4 @@ public class MemorySetMessagesMethodReRoutingTest extends SetMessagesMethodReRou protected GuiceJamesServer createJmapServer() throws IOException { return memoryJmap.jmapServer(); } - - @Override - protected void await() { - } } diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetVacationResponseMethodTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetVacationResponseMethodTest.java index 7c546e7..9e2d22c 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetVacationResponseMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetVacationResponseMethodTest.java @@ -27,7 +27,6 @@ import org.apache.james.jmap.draft.methods.integration.SetVacationResponseTest; import org.junit.Rule; public class MemorySetVacationResponseMethodTest extends SetVacationResponseTest { - @Rule public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @@ -35,8 +34,4 @@ public class MemorySetVacationResponseMethodTest extends SetVacationResponseTest protected GuiceJamesServer createJmapServer() throws IOException { return memoryJmap.jmapServer(); } - - @Override - protected void await() { - } } diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationIntegrationTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationIntegrationTest.java index 33146de..c9aa8ff 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationIntegrationTest.java +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationIntegrationTest.java @@ -27,7 +27,6 @@ import org.apache.james.jmap.VacationIntegrationTest; import org.junit.Rule; public class MemoryVacationIntegrationTest extends VacationIntegrationTest { - @Rule public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @@ -35,9 +34,4 @@ public class MemoryVacationIntegrationTest extends VacationIntegrationTest { protected GuiceJamesServer createJmapServer() throws IOException { return memoryJmap.jmapServer(); } - - @Override - protected void await() { - - } } diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationRelayIntegrationTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationRelayIntegrationTest.java index 1f57192..b49581d 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationRelayIntegrationTest.java +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationRelayIntegrationTest.java @@ -36,11 +36,6 @@ public class MemoryVacationRelayIntegrationTest extends VacationRelayIntegration private final InMemoryDNSService inMemoryDNSService = new InMemoryDNSService(); @Override - protected void await() { - - } - - @Override protected GuiceJamesServer getJmapServer() throws IOException { return memoryJmap.jmapServer((binder) -> binder.bind(DNSService.class).toInstance(inMemoryDNSService)); } diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetVacationResponseTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetVacationResponseTest.java index 4381ca9..58a83b5 100644 --- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetVacationResponseTest.java +++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetVacationResponseTest.java @@ -29,7 +29,6 @@ import org.apache.james.util.date.ZonedDateTimeProvider; import org.junit.Rule; public class RabbitMQAwsS3GetVacationResponseTest extends GetVacationResponseTest { - @Rule public DockerCassandraRule cassandra = new DockerCassandraRule(); @@ -41,10 +40,5 @@ public class RabbitMQAwsS3GetVacationResponseTest extends GetVacationResponseTes return rule.jmapServer(cassandra.getModule()) .overrideWith(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider)); } - - @Override - protected void await() { - rule.await(); - } } diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMailboxesMethodTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMailboxesMethodTest.java index 7f331df..7450656 100644 --- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMailboxesMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMailboxesMethodTest.java @@ -28,7 +28,6 @@ import org.apache.james.jmap.draft.methods.integration.SetMailboxesMethodTest; import org.junit.Rule; public class RabbitMQAwsS3SetMailboxesMethodTest extends SetMailboxesMethodTest { - @Rule public DockerCassandraRule cassandra = new DockerCassandraRule(); @@ -39,11 +38,5 @@ public class RabbitMQAwsS3SetMailboxesMethodTest extends SetMailboxesMethodTest protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule()); } - - @Override - protected void await() { - rule.await(); - } - } diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMessagesMethodReRoutingTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMessagesMethodReRoutingTest.java index 9644fb9..708753d 100644 --- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMessagesMethodReRoutingTest.java +++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMessagesMethodReRoutingTest.java @@ -28,7 +28,6 @@ import org.apache.james.jmap.draft.methods.integration.SetMessagesMethodReRoutin import org.junit.Rule; public class RabbitMQAwsS3SetMessagesMethodReRoutingTest extends SetMessagesMethodReRoutingTest { - @Rule public DockerCassandraRule cassandra = new DockerCassandraRule(); @@ -39,10 +38,5 @@ public class RabbitMQAwsS3SetMessagesMethodReRoutingTest extends SetMessagesMeth protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule()); } - - @Override - protected void await() { - rule.await(); - } } diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetVacationResponseTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetVacationResponseTest.java index 7c98a39..e9ff4d6 100644 --- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetVacationResponseTest.java +++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetVacationResponseTest.java @@ -39,11 +39,5 @@ public class RabbitMQAwsS3SetVacationResponseTest extends SetVacationResponseTes protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule()); } - - @Override - protected void await() { - rule.await(); - } - } diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3VacationIntegrationTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3VacationIntegrationTest.java index 93e9ab3..3297eda 100644 --- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3VacationIntegrationTest.java +++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3VacationIntegrationTest.java @@ -39,11 +39,5 @@ public class RabbitMQAwsS3VacationIntegrationTest extends VacationIntegrationTes protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule()); } - - @Override - protected void await() { - rule.await(); - } - } diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3VacationRelayIntegrationTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3VacationRelayIntegrationTest.java index 301a5b3..5f9f6aa 100644 --- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3VacationRelayIntegrationTest.java +++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3VacationRelayIntegrationTest.java @@ -30,7 +30,6 @@ import org.apache.james.jmap.VacationRelayIntegrationTest; import org.junit.Rule; public class RabbitMQAwsS3VacationRelayIntegrationTest extends VacationRelayIntegrationTest { - private final InMemoryDNSService inMemoryDNSService = new InMemoryDNSService(); @Rule @@ -47,11 +46,6 @@ public class RabbitMQAwsS3VacationRelayIntegrationTest extends VacationRelayInte } @Override - protected void await() { - rule.await(); - } - - @Override protected InMemoryDNSService getInMemoryDns() { return inMemoryDNSService; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
