http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetVacationResponseMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetVacationResponseMethodTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetVacationResponseMethodTest.java index 47af78c..361ac44 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetVacationResponseMethodTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetVacationResponseMethodTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.memory; +import java.io.IOException; + import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.methods.integration.GetVacationResponseTest; @@ -31,7 +33,7 @@ public class MemoryGetVacationResponseMethodTest extends GetVacationResponseTest public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @Override - protected GuiceJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) { + protected GuiceJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) throws IOException { return memoryJmap.jmapServer() .overrideWith(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider)); }
http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapAuthenticationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapAuthenticationTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapAuthenticationTest.java index fc4b338..0b58375 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapAuthenticationTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapAuthenticationTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.memory; +import java.io.IOException; + import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.FixedDateZonedDateTimeProvider; @@ -32,7 +34,7 @@ public class MemoryJmapAuthenticationTest extends JMAPAuthenticationTest { public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @Override - protected GuiceJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) { + protected GuiceJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) throws IOException { return memoryJmap.jmapServer() .overrideWith((binder) -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapExtension.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapExtension.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapExtension.java index 17ace26..380221f 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapExtension.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapExtension.java @@ -18,6 +18,8 @@ ****************************************************************/ package org.apache.james.jmap.memory; +import java.io.IOException; + import org.apache.activemq.store.PersistenceAdapter; import org.apache.activemq.store.memory.MemoryPersistenceAdapter; import org.apache.james.GuiceJamesServer; @@ -28,8 +30,8 @@ import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.store.search.MessageSearchIndex; import org.apache.james.mailbox.store.search.PDFTextExtractor; import org.apache.james.mailbox.store.search.SimpleMessageSearchIndex; -import org.apache.james.modules.TestFilesystemModule; import org.apache.james.modules.TestJMAPServerModule; +import org.apache.james.server.core.configuration.Configuration; import org.apache.james.util.scanner.SpamAssassinExtension; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeEachCallback; @@ -47,18 +49,23 @@ public class MemoryJmapExtension implements BeforeEachCallback, AfterEachCallbac private final SpamAssassinExtension spamAssassinExtension; private final JamesWithSpamAssassin james; - public MemoryJmapExtension() { + public MemoryJmapExtension() throws IOException { this.temporaryFolder = new TemporaryFolder(); this.spamAssassinExtension = new SpamAssassinExtension(); this.james = james(); } - private JamesWithSpamAssassin james() { + private JamesWithSpamAssassin james() throws IOException { + temporaryFolder.create(); + Configuration configuration = Configuration.builder() + .workingDirectory(temporaryFolder.newFolder()) + .configurationFromClasspath() + .build(); + return new JamesWithSpamAssassin( - new GuiceJamesServer() + new GuiceJamesServer(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new TestFilesystemModule(temporaryFolder), - new TestJMAPServerModule(LIMIT_TO_20_MESSAGES)) + .overrideWith(new TestJMAPServerModule(LIMIT_TO_20_MESSAGES)) .overrideWith(binder -> binder.bind(PersistenceAdapter.class).to(MemoryPersistenceAdapter.class)) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(binder -> binder.bind(MessageSearchIndex.class).to(SimpleMessageSearchIndex.class)) http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryProvisioningTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryProvisioningTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryProvisioningTest.java index c29a43c..2db8ff1 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryProvisioningTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryProvisioningTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.memory; +import java.io.IOException; + import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.ProvisioningTest; @@ -29,7 +31,7 @@ public class MemoryProvisioningTest extends ProvisioningTest { public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @Override - protected GuiceJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() throws IOException { return memoryJmap.jmapServer(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java index 05ed81f..cd40285 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java @@ -19,6 +19,7 @@ package org.apache.james.jmap.memory; +import java.io.IOException; import java.util.Random; import org.apache.james.GuiceJamesServer; @@ -36,7 +37,7 @@ public class MemorySendMDNMethodTest extends SendMDNMethodTest { private Random random = new Random(); @Override - protected GuiceJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() throws IOException { return memoryJmap.jmapServer(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMailboxesMethodTest.java index 0f588f0..0e1744e 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMailboxesMethodTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.memory; +import java.io.IOException; + import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.methods.integration.SetMailboxesMethodTest; @@ -31,7 +33,7 @@ public class MemorySetMailboxesMethodTest extends SetMailboxesMethodTest { public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @Override - protected GuiceJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() throws IOException { return memoryJmap.jmapServer(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodTest.java index 3255246..15c5bde 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodTest.java @@ -19,6 +19,7 @@ package org.apache.james.jmap.memory; +import java.io.IOException; import java.util.Random; import org.apache.james.GuiceJamesServer; @@ -36,7 +37,7 @@ public class MemorySetMessagesMethodTest extends SetMessagesMethodTest { private Random random = new Random(); @Override - protected GuiceJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() throws IOException { return memoryJmap.jmapServer(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetVacationResponseMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetVacationResponseMethodTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetVacationResponseMethodTest.java index 9977361..6db74fd 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetVacationResponseMethodTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetVacationResponseMethodTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.memory; +import java.io.IOException; + import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.methods.integration.SetVacationResponseTest; @@ -30,7 +32,7 @@ public class MemorySetVacationResponseMethodTest extends SetVacationResponseTest public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @Override - protected GuiceJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() throws IOException { return memoryJmap.jmapServer(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationIntegrationTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationIntegrationTest.java index 703a312..a804662 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationIntegrationTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.memory; +import java.io.IOException; + import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.VacationIntegrationTest; @@ -30,7 +32,7 @@ public class MemoryVacationIntegrationTest extends VacationIntegrationTest { public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @Override - protected GuiceJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() throws IOException { return memoryJmap.jmapServer(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationRelayIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationRelayIntegrationTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationRelayIntegrationTest.java index 9095c4d..fc62c2e 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationRelayIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationRelayIntegrationTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.memory; +import java.io.IOException; + import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.dnsservice.api.DNSService; @@ -37,7 +39,7 @@ public class MemoryVacationRelayIntegrationTest extends VacationRelayIntegration protected void await() {} @Override - protected GuiceJamesServer getJmapServer() { + protected GuiceJamesServer getJmapServer() throws IOException { return memoryJmap.jmapServer((binder) -> binder.bind(DNSService.class).toInstance(inMemoryDNSService)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java index 2fcbabe..6e9ef3c 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java @@ -27,9 +27,10 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJamesServerMain; import org.apache.james.jmap.methods.integration.cucumber.ImapStepdefs; import org.apache.james.jmap.methods.integration.cucumber.MainStepdefs; -import org.apache.james.jmap.servers.MemoryJmapServerModule; import org.apache.james.mailbox.inmemory.InMemoryMessageId; import org.apache.james.mailbox.model.MessageId; +import org.apache.james.modules.TestJMAPServerModule; +import org.apache.james.server.core.configuration.Configuration; import org.junit.rules.TemporaryFolder; import cucumber.api.java.After; @@ -39,6 +40,7 @@ import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped public class MemoryStepdefs { + private static final long LIMIT_TO_3_MESSAGES = 3; private final MainStepdefs mainStepdefs; private final ImapStepdefs imapStepdefs; private final TemporaryFolder temporaryFolder; @@ -53,10 +55,15 @@ public class MemoryStepdefs { @Before public void init() throws Exception { temporaryFolder.create(); + Configuration configuration = Configuration.builder() + .workingDirectory(temporaryFolder.newFolder()) + .configurationFromClasspath() + .build(); + mainStepdefs.messageIdFactory = new InMemoryMessageId.Factory(); - mainStepdefs.jmapServer = new GuiceJamesServer() + mainStepdefs.jmapServer = new GuiceJamesServer(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new MemoryJmapServerModule(temporaryFolder), + .overrideWith(new TestJMAPServerModule(LIMIT_TO_3_MESSAGES), (binder) -> binder.bind(MessageId.Factory.class).toInstance(mainStepdefs.messageIdFactory)) .overrideWith((binder) -> binder.bind(PersistenceAdapter.class).to(MemoryPersistenceAdapter.class)); mainStepdefs.init(); http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/servers/MemoryJmapServerModule.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/servers/MemoryJmapServerModule.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/servers/MemoryJmapServerModule.java deleted file mode 100644 index 0b9a51b..0000000 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/servers/MemoryJmapServerModule.java +++ /dev/null @@ -1,43 +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.servers; - -import org.apache.james.modules.TestFilesystemModule; -import org.apache.james.modules.TestJMAPServerModule; -import org.junit.rules.TemporaryFolder; - -import com.google.inject.AbstractModule; - -public class MemoryJmapServerModule extends AbstractModule { - - private static final int LIMIT_TO_3_MESSAGES = 3; - private TemporaryFolder temporaryFolder; - - public MemoryJmapServerModule(TemporaryFolder temporaryFolder) { - this.temporaryFolder = temporaryFolder; - } - - @Override - protected void configure() { - install(new TestFilesystemModule(temporaryFolder)); - install(new TestJMAPServerModule(LIMIT_TO_3_MESSAGES)); - } - -} --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
