JAMES-2553 Rewrite JamesCapabilitiesServerTest 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/8a678c37 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8a678c37 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8a678c37 Branch: refs/heads/master Commit: 8a678c37e42aa9086f049581b2cbb5c726f27c20 Parents: dedcf9d Author: Benoit Tellier <[email protected]> Authored: Mon Oct 1 09:47:17 2018 +0700 Committer: Benoit Tellier <[email protected]> Committed: Thu Oct 4 17:48:42 2018 +0700 ---------------------------------------------------------------------- .../james/JamesCapabilitiesServerTest.java | 57 ++++++-------------- 1 file changed, 16 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/8a678c37/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java index 12db521..49612f7 100644 --- a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java +++ b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java @@ -21,48 +21,14 @@ package org.apache.james; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.io.IOException; import java.util.EnumSet; import org.apache.james.mailbox.MailboxManager; -import org.apache.james.server.core.configuration.Configuration; -import org.junit.After; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.RuleChain; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -import com.google.inject.Module; - -public class JamesCapabilitiesServerTest { - - private GuiceJamesServer server; - private TemporaryFolder temporaryFolder = new TemporaryFolder(); - - @Rule - public RuleChain chain = RuleChain.outerRule(temporaryFolder); - - @After - public void teardown() { - server.stop(); - } - - private GuiceJamesServer createJPAJamesServer(final MailboxManager mailboxManager) throws IOException { - Module mockMailboxManager = (binder) -> binder.bind(MailboxManager.class).toInstance(mailboxManager); - Configuration configuration = Configuration.builder() - .workingDirectory(temporaryFolder.newFolder()) - .configurationFromClasspath() - .build(); - - return GuiceJamesServer.forConfiguration(configuration) - .combineWith(JPAJamesServerMain.JPA_SERVER_MODULE) - .overrideWith( - new TestJPAConfigurationModule(), - mockMailboxManager); - } - - @Test - public void startShouldSucceedWhenRequiredCapabilities() throws Exception { +class JamesCapabilitiesServerTest { + private static MailboxManager mailboxManager() { MailboxManager mailboxManager = mock(MailboxManager.class); when(mailboxManager.getSupportedMailboxCapabilities()) .thenReturn(EnumSet.noneOf(MailboxManager.MailboxCapabilities.class)); @@ -70,10 +36,19 @@ public class JamesCapabilitiesServerTest { .thenReturn(EnumSet.noneOf(MailboxManager.MessageCapabilities.class)); when(mailboxManager.getSupportedSearchCapabilities()) .thenReturn(EnumSet.noneOf(MailboxManager.SearchCapabilities.class)); + return mailboxManager; + } - server = createJPAJamesServer(mailboxManager); + @RegisterExtension + static JamesServerExtension jamesServerExtension = new JamesServerExtensionBuilder() + .server(configuration -> GuiceJamesServer.forConfiguration(configuration) + .combineWith(JPAJamesServerMain.JPA_SERVER_MODULE, JPAJamesServerMain.PROTOCOLS) + .overrideWith(new TestJPAConfigurationModule()) + .overrideWith(binder -> binder.bind(MailboxManager.class).toInstance(mailboxManager()))) + .build(); + + @Test + void startShouldSucceedWhenRequiredCapabilities(GuiceJamesServer server) { - server.start(); } - } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
