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 745cf41b6d2d6516f4c5783912661e67e61ca13a Author: Benoit Tellier <[email protected]> AuthorDate: Tue May 19 16:20:02 2020 +0700 JAMES-3140 Remove uneeded module composition within Memory integration tests --- .../test/java/org/apache/james/DefaultMemoryJamesServerTest.java | 6 ------ .../java/org/apache/james/GuiceJamesServerStartUpCheckTest.java | 4 +--- .../test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java | 2 -- .../test/java/org/apache/james/WebAdminRoutesExtensionTest.java | 2 -- .../apache/james/jmap/memory/MemoryGetMessageListMethodTest.java | 8 +++++++- .../org/apache/james/jmap/memory/MemorySendMDNMethodTest.java | 9 +-------- .../apache/james/jmap/memory/MemorySpamAssassinContractTest.java | 8 +------- .../integration/memory/MemoryUnauthorizedEndpointsTest.java | 3 --- 8 files changed, 10 insertions(+), 32 deletions(-) diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java index 2b9d1bc..b1895f7 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java @@ -22,12 +22,8 @@ package org.apache.james; import static org.assertj.core.api.Assertions.assertThat; import org.apache.commons.configuration2.BaseHierarchicalConfiguration; -import org.apache.james.mailbox.extractor.TextExtractor; -import org.apache.james.mailbox.store.search.PDFTextExtractor; import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.server.core.configuration.ConfigurationProvider; -import org.apache.james.utils.FailingPropertiesProvider; -import org.apache.james.utils.PropertiesProvider; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -36,8 +32,6 @@ class DefaultMemoryJamesServerTest { static JamesServerExtension jamesServerExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) .server(configuration -> MemoryJamesServerMain.createServer(configuration) .overrideWith(new TestJMAPServerModule()) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(binder -> binder.bind(PropertiesProvider.class).to(FailingPropertiesProvider.class)) .overrideWith(binder -> binder.bind(ConfigurationProvider.class).toInstance((s, l) -> new BaseHierarchicalConfiguration()))) .build(); diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java index 431a0ee..28532e0 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java @@ -27,7 +27,6 @@ import java.util.stream.Stream; import org.apache.james.lifecycle.api.StartUpCheck; import org.apache.james.modules.BlobExportImplChoice; -import org.apache.james.modules.TestJMAPServerModule; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -113,8 +112,7 @@ class GuiceJamesServerStartUpCheckTest { private static JamesServerBuilder extensionBuilder() { return new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) - .server(configuration -> MemoryJamesServerMain.createServer(configuration) - .overrideWith(new TestJMAPServerModule())) + .server(MemoryJamesServerMain::createServer) .disableAutoStart(); } diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java index ea3ec9d..ab4b7bd 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java @@ -29,7 +29,6 @@ import java.util.concurrent.CountDownLatch; import javax.annotation.PreDestroy; import javax.inject.Inject; -import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.utils.WebAdminGuiceProbe; import org.apache.james.webadmin.WebAdminConfiguration; import org.apache.james.webadmin.WebAdminServer; @@ -49,7 +48,6 @@ class GuiceLifecycleHeathCheckTest { private static JamesServerBuilder extensionBuilder() { return new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) .server(configuration -> MemoryJamesServerMain.createServer(configuration) - .overrideWith(new TestJMAPServerModule()) .overrideWith(binder -> binder.bind(WebAdminConfiguration.class) .toInstance(WebAdminConfiguration.TEST_CONFIGURATION))); } diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/WebAdminRoutesExtensionTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/WebAdminRoutesExtensionTest.java index 0fd9ae8..bdc634b 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/WebAdminRoutesExtensionTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/WebAdminRoutesExtensionTest.java @@ -23,7 +23,6 @@ import static io.restassured.RestAssured.when; import static org.apache.james.MyRoute.SHABANG; import static org.hamcrest.CoreMatchers.is; -import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.utils.WebAdminGuiceProbe; import org.apache.james.webadmin.RandomPortSupplier; import org.apache.james.webadmin.WebAdminConfiguration; @@ -37,7 +36,6 @@ class WebAdminRoutesExtensionTest { @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) .server(configuration -> MemoryJamesServerMain.createServer(configuration) - .overrideWith(new TestJMAPServerModule()) .overrideWith(binder -> binder.bind(WebAdminConfiguration.class) .toInstance(WebAdminConfiguration.builder() .additionalRoute(MyRoute.class.getCanonicalName()) diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java index ac9d068..f675373 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java @@ -26,6 +26,10 @@ import java.io.IOException; import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.draft.methods.integration.GetMessageListMethodTest; +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.TestJMAPServerModule; import org.junit.Ignore; import org.junit.Rule; @@ -38,7 +42,9 @@ public class MemoryGetMessageListMethodTest extends GetMessageListMethodTest { @Override protected GuiceJamesServer createJmapServer() throws IOException { - return memoryJmap.jmapServer(new TestJMAPServerModule(), TestJMAPServerModule.SearchModule.maximumMessages(LIMIT_TO_3_MESSAGES)); + return memoryJmap.jmapServer(TestJMAPServerModule.SearchModule.maximumMessages(LIMIT_TO_3_MESSAGES), + binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class), + binder -> binder.bind(MessageSearchIndex.class).to(SimpleMessageSearchIndex.class)); } @Override diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java index ecdc794..ea5a840 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java @@ -25,23 +25,16 @@ import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; import org.apache.james.MemoryJamesServerMain; import org.apache.james.jmap.draft.methods.integration.SendMDNMethodTest; -import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.inmemory.InMemoryMessageId; import org.apache.james.mailbox.model.MessageId; -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.TestJMAPServerModule; import org.junit.jupiter.api.extension.RegisterExtension; public class MemorySendMDNMethodTest extends SendMDNMethodTest { - @RegisterExtension JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) .server(configuration -> MemoryJamesServerMain.createServer(configuration) - .overrideWith(new TestJMAPServerModule()) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(binder -> binder.bind(MessageSearchIndex.class).to(SimpleMessageSearchIndex.class))) + .overrideWith(new TestJMAPServerModule())) .build(); @Override diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySpamAssassinContractTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySpamAssassinContractTest.java index f85001d..7298fcf 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySpamAssassinContractTest.java +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySpamAssassinContractTest.java @@ -23,10 +23,6 @@ import org.apache.james.JamesServerExtension; import org.apache.james.MemoryJamesServerMain; import org.apache.james.jmap.draft.methods.integration.SpamAssassinContract; import org.apache.james.jmap.draft.methods.integration.SpamAssassinModuleExtension; -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.TestJMAPServerModule; import org.junit.jupiter.api.extension.RegisterExtension; @@ -35,8 +31,6 @@ class MemorySpamAssassinContractTest implements SpamAssassinContract { static JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) .extension(new SpamAssassinModuleExtension()) .server(configuration -> MemoryJamesServerMain.createServer(configuration) - .overrideWith(new TestJMAPServerModule()) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(binder -> binder.bind(MessageSearchIndex.class).to(SimpleMessageSearchIndex.class))) + .overrideWith(new TestJMAPServerModule())) .build(); } diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUnauthorizedEndpointsTest.java b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUnauthorizedEndpointsTest.java index 1a56037..47a7c57 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUnauthorizedEndpointsTest.java +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUnauthorizedEndpointsTest.java @@ -22,18 +22,15 @@ package org.apache.james.webadmin.integration.memory; import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; import org.apache.james.MemoryJamesServerMain; -import org.apache.james.modules.vault.TestDeleteMessageVaultPreDeletionHookModule; import org.apache.james.webadmin.integration.UnauthorizedEndpointsTest; import org.apache.james.webadmin.integration.UnauthorizedModule; import org.apache.james.webadmin.integration.WebadminIntegrationTestModule; import org.junit.jupiter.api.extension.RegisterExtension; class MemoryUnauthorizedEndpointsTest extends UnauthorizedEndpointsTest { - @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) .server(configuration -> MemoryJamesServerMain.createServer(configuration) - .overrideWith(new TestDeleteMessageVaultPreDeletionHookModule()) .overrideWith(new UnauthorizedModule()) .overrideWith(new WebadminIntegrationTestModule())) .build(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
