JAMES-2553 Rewrite DefaultMemoryJamesServerTest test in JUNIT 5
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d79c499e Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d79c499e Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d79c499e Branch: refs/heads/master Commit: d79c499e4236f025b673a51cb2cb91f9d0da9e35 Parents: dbb4833 Author: Benoit Tellier <[email protected]> Authored: Mon Oct 1 09:51:08 2018 +0700 Committer: Benoit Tellier <[email protected]> Committed: Thu Oct 4 17:48:43 2018 +0700 ---------------------------------------------------------------------- .../james/DefaultMemoryJamesServerTest.java | 48 ++++++++------------ 1 file changed, 19 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/d79c499e/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java ---------------------------------------------------------------------- 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 9f82501..fdd2196 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 @@ -21,41 +21,31 @@ package org.apache.james; import static org.assertj.core.api.Assertions.assertThat; -import java.io.IOException; - import org.apache.commons.configuration.HierarchicalConfiguration; +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.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; - -public class DefaultMemoryJamesServerTest { - - @Rule - public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); - - private GuiceJamesServer guiceJamesServer; - - @Before - public void setUp() throws IOException { - guiceJamesServer = memoryJmap.jmapServer() +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +class DefaultMemoryJamesServerTest { + private static final int LIMIT_TO_10_MESSAGES = 10; + + @RegisterExtension + static JamesServerExtension jamesServerExtension = new JamesServerExtensionBuilder() + .server(configuration -> GuiceJamesServer.forConfiguration(configuration) + .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .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 -> new HierarchicalConfiguration())); - } - - @After - public void clean() { - guiceJamesServer.stop(); - } + .overrideWith(binder -> binder.bind(ConfigurationProvider.class).toInstance(s -> new HierarchicalConfiguration()))) + .build(); @Test - public void memoryJamesServerShouldStartWithNoConfigurationFile() throws Exception { - guiceJamesServer.start(); - - assertThat(guiceJamesServer.isStarted()).isTrue(); + void memoryJamesServerShouldStartWithNoConfigurationFile(GuiceJamesServer server) { + assertThat(server.isStarted()).isTrue(); } - } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
