http://git-wip-us.apache.org/repos/asf/james-project/blob/ac56c422/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java index b5ef729..278430f 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java @@ -52,7 +52,7 @@ import javax.mail.Flags; import org.apache.commons.io.IOUtils; import org.apache.http.client.utils.URIBuilder; -import org.apache.james.JmapJamesServer; +import org.apache.james.GuiceJamesServer; import org.apache.james.jmap.DefaultMailboxes; import org.apache.james.jmap.HttpJmapAuthentication; import org.apache.james.jmap.api.access.AccessToken; @@ -67,6 +67,7 @@ import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.store.event.EventFactory; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.util.ZeroedInputStream; +import org.apache.james.utils.JmapGuiceProbe; import org.hamcrest.Matcher; import org.hamcrest.Matchers; import org.junit.After; @@ -101,14 +102,14 @@ public abstract class SetMessagesMethodTest { private ConditionFactory calmlyAwait; - protected abstract JmapJamesServer createJmapServer(); + protected abstract GuiceJamesServer createJmapServer(); protected abstract MessageId randomMessageId(); protected abstract void await(); private AccessToken accessToken; - private JmapJamesServer jmapServer; + private GuiceJamesServer jmapServer; @Before public void setup() throws Throwable { @@ -118,8 +119,7 @@ public abstract class SetMessagesMethodTest { .setContentType(ContentType.JSON) .setAccept(ContentType.JSON) .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8))) - .setPort(jmapServer.getJmapProbe() - .getJmapPort()) + .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort()) .build(); RestAssured.enableLoggingOfRequestAndResponseIfValidationFails(); @@ -143,7 +143,7 @@ public abstract class SetMessagesMethodTest { return new URIBuilder() .setScheme("http") .setHost("localhost") - .setPort(jmapServer.getJmapProbe() + .setPort(jmapServer.getProbe(JmapGuiceProbe.class) .getJmapPort()) .setCharset(Charsets.UTF_8); } @@ -878,7 +878,7 @@ public abstract class SetMessagesMethodTest { "]"; List<MailboxListener.Event> events = Lists.newArrayList(); - jmapServer.getJmapProbe().addMailboxListener(new MailboxListener() { + jmapServer.getProbe(JmapGuiceProbe.class).addMailboxListener(new MailboxListener() { @Override public ListenerType getType() { return ListenerType.ONCE;
http://git-wip-us.apache.org/repos/asf/james-project/blob/ac56c422/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java index 457b46e..4945f0b 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java @@ -29,7 +29,7 @@ import java.time.ZonedDateTime; import java.util.Optional; import org.apache.http.client.utils.URIBuilder; -import org.apache.james.JmapJamesServer; +import org.apache.james.GuiceJamesServer; import org.apache.james.jmap.HttpJmapAuthentication; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.jmap.api.vacation.AccountId; @@ -56,18 +56,18 @@ public abstract class SetVacationResponseTest { public static final String SUBJECT = "subject"; private JmapGuiceProbe jmapGuiceProbe; - protected abstract JmapJamesServer createJmapServer(); + protected abstract GuiceJamesServer createJmapServer(); protected abstract void await(); private AccessToken accessToken; - private JmapJamesServer jmapServer; + private GuiceJamesServer jmapServer; @Before public void setup() throws Throwable { jmapServer = createJmapServer(); jmapServer.start(); - jmapGuiceProbe = jmapServer.getJmapProbe(); + jmapGuiceProbe = jmapServer.getProbe(JmapGuiceProbe.class); RestAssured.requestSpecification = new RequestSpecBuilder() .setContentType(ContentType.JSON) .setAccept(ContentType.JSON) @@ -87,7 +87,7 @@ public abstract class SetVacationResponseTest { return new URIBuilder() .setScheme("http") .setHost("localhost") - .setPort(jmapServer.getJmapProbe() + .setPort(jmapServer.getProbe(JmapGuiceProbe.class) .getJmapPort()) .setCharset(Charsets.UTF_8); } http://git-wip-us.apache.org/repos/asf/james-project/blob/ac56c422/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java index 9d91811..f1a9e55 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java @@ -45,6 +45,7 @@ import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageId; +import org.apache.james.utils.JmapGuiceProbe; import org.javatuples.Pair; import com.github.fge.lambdas.Throwing; @@ -102,7 +103,7 @@ public class GetMessagesMethodStepdefs { MailboxId mailboxId1 = mainStepdefs.jmapServer.serverProbe().getMailbox(MailboxConstants.USER_NAMESPACE, userStepdefs.lastConnectedUser, mailbox1).getMailboxId(); MailboxId mailboxId2 = mainStepdefs.jmapServer.serverProbe().getMailbox(MailboxConstants.USER_NAMESPACE, userStepdefs.lastConnectedUser, mailbox2).getMailboxId(); - mainStepdefs.jmapServer.getJmapProbe().setInMailboxes(id, userStepdefs.lastConnectedUser, mailboxId1, mailboxId2); + mainStepdefs.jmapServer.getProbe(JmapGuiceProbe.class).setInMailboxes(id, userStepdefs.lastConnectedUser, mailboxId1, mailboxId2); messageIdsByName.put(messageName, id); } http://git-wip-us.apache.org/repos/asf/james-project/blob/ac56c422/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java index e8aae5b..c2286f2 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java @@ -20,8 +20,9 @@ package org.apache.james.jmap.methods.integration.cucumber; import org.apache.http.client.utils.URIBuilder; -import org.apache.james.JmapJamesServer; +import org.apache.james.GuiceJamesServer; import org.apache.james.mailbox.model.MessageId; +import org.apache.james.utils.JmapGuiceProbe; import com.google.common.base.Charsets; @@ -30,7 +31,7 @@ import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped public class MainStepdefs { - public JmapJamesServer jmapServer; + public GuiceJamesServer jmapServer; public Runnable awaitMethod = () -> {}; public MessageId.Factory messageIdFactory; @@ -43,8 +44,7 @@ public class MainStepdefs { return new URIBuilder() .setScheme("http") .setHost("localhost") - .setPort(jmapServer.getJmapProbe() - .getJmapPort()) + .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort()) .setCharset(Charsets.UTF_8); } http://git-wip-us.apache.org/repos/asf/james-project/blob/ac56c422/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml index b843132..dc2af81 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml @@ -154,6 +154,12 @@ <type>test-jar</type> <scope>test</scope> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-guice-jmap</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.james</groupId> <artifactId>james-server-jmap-integration-testing</artifactId> http://git-wip-us.apache.org/repos/asf/james-project/blob/ac56c422/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMailboxesMethodTest.java index 02d3185..32d9ace 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMailboxesMethodTest.java @@ -19,7 +19,7 @@ package org.apache.james.jmap.memory; -import org.apache.james.JmapJamesServer; +import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.methods.integration.GetMailboxesMethodTest; import org.junit.Rule; @@ -30,7 +30,7 @@ public class MemoryGetMailboxesMethodTest extends GetMailboxesMethodTest { public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @Override - protected JmapJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() { return memoryJmap.jmapServer(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/ac56c422/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java index c40fe5c..e1817e2 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java @@ -19,7 +19,7 @@ package org.apache.james.jmap.memory; -import org.apache.james.JmapJamesServer; +import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.methods.integration.GetMessageListMethodTest; import org.junit.Rule; @@ -30,7 +30,7 @@ public class MemoryGetMessageListMethodTest extends GetMessageListMethodTest { public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @Override - protected JmapJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() { return memoryJmap.jmapServer(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/ac56c422/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 70348f4..47af78c 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,7 +19,7 @@ package org.apache.james.jmap.memory; -import org.apache.james.JmapJamesServer; +import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.methods.integration.GetVacationResponseTest; import org.apache.james.util.date.ZonedDateTimeProvider; @@ -31,7 +31,7 @@ public class MemoryGetVacationResponseMethodTest extends GetVacationResponseTest public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @Override - protected JmapJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) { + protected GuiceJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) { return memoryJmap.jmapServer() .overrideWith(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/ac56c422/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 e561a09..fc4b338 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,7 +19,7 @@ package org.apache.james.jmap.memory; -import org.apache.james.JmapJamesServer; +import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.FixedDateZonedDateTimeProvider; import org.apache.james.jmap.JMAPAuthenticationTest; @@ -32,7 +32,7 @@ public class MemoryJmapAuthenticationTest extends JMAPAuthenticationTest { public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @Override - protected JmapJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) { + protected GuiceJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) { return memoryJmap.jmapServer() .overrideWith((binder) -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/ac56c422/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 7306165..0f588f0 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,7 +19,7 @@ package org.apache.james.jmap.memory; -import org.apache.james.JmapJamesServer; +import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.methods.integration.SetMailboxesMethodTest; import org.junit.Ignore; @@ -31,7 +31,7 @@ public class MemorySetMailboxesMethodTest extends SetMailboxesMethodTest { public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @Override - protected JmapJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() { return memoryJmap.jmapServer(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/ac56c422/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 1498749..bb337e8 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 @@ -21,7 +21,7 @@ package org.apache.james.jmap.memory; import java.util.Random; -import org.apache.james.JmapJamesServer; +import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.methods.integration.SetMessagesMethodTest; import org.apache.james.mailbox.inmemory.InMemoryMessageId; @@ -36,7 +36,7 @@ public class MemorySetMessagesMethodTest extends SetMessagesMethodTest { private Random random = new Random(); @Override - protected JmapJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() { return memoryJmap.jmapServer(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/ac56c422/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 bca1a90..9977361 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,7 +19,7 @@ package org.apache.james.jmap.memory; -import org.apache.james.JmapJamesServer; +import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.methods.integration.SetVacationResponseTest; import org.junit.Rule; @@ -30,7 +30,7 @@ public class MemorySetVacationResponseMethodTest extends SetVacationResponseTest public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @Override - protected JmapJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() { return memoryJmap.jmapServer(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/ac56c422/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryUserProvisionningConcurrencyTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryUserProvisionningConcurrencyTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryUserProvisionningConcurrencyTest.java index 056d4e7..01bf796 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryUserProvisionningConcurrencyTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryUserProvisionningConcurrencyTest.java @@ -19,7 +19,7 @@ package org.apache.james.jmap.memory; -import org.apache.james.JmapJamesServer; +import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.UserProvisionningConcurrencyTest; import org.junit.Rule; @@ -29,7 +29,7 @@ public class MemoryUserProvisionningConcurrencyTest extends UserProvisionningCon public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @Override - protected JmapJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() { return memoryJmap.jmapServer(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/ac56c422/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 df5b1f7..703a312 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,7 +19,7 @@ package org.apache.james.jmap.memory; -import org.apache.james.JmapJamesServer; +import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.VacationIntegrationTest; import org.junit.Rule; @@ -30,7 +30,7 @@ public class MemoryVacationIntegrationTest extends VacationIntegrationTest { public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @Override - protected JmapJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() { return memoryJmap.jmapServer(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/ac56c422/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 fc13c55..89d4b87 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 @@ -23,7 +23,7 @@ import javax.inject.Inject; import org.apache.activemq.store.PersistenceAdapter; import org.apache.activemq.store.memory.MemoryPersistenceAdapter; -import org.apache.james.JmapJamesServer; +import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJamesServerMain; import org.apache.james.jmap.methods.integration.cucumber.MainStepdefs; import org.apache.james.jmap.servers.MemoryJmapServerModule; @@ -51,7 +51,7 @@ public class MemoryStepdefs { public void init() throws Exception { temporaryFolder.create(); mainStepdefs.messageIdFactory = new InMemoryMessageId.Factory(); - mainStepdefs.jmapServer = new JmapJamesServer() + mainStepdefs.jmapServer = new GuiceJamesServer() .combineWith(MemoryJamesServerMain.inMemoryServerModule) .overrideWith(new MemoryJmapServerModule(temporaryFolder), (binder) -> binder.bind(MessageId.Factory.class).toInstance(mainStepdefs.messageIdFactory)) http://git-wip-us.apache.org/repos/asf/james-project/blob/ac56c422/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java index 6bc58fa..f6194bc 100644 --- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java @@ -28,7 +28,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; import org.apache.james.CassandraJmapTestRule; -import org.apache.james.JmapJamesServer; +import org.apache.james.GuiceJamesServer; +import org.apache.james.utils.WebAdminGuiceProbe; import org.apache.james.webadmin.routes.DomainRoutes; import org.apache.james.webadmin.routes.UserMailboxesRoutes; import org.apache.james.webadmin.routes.UserRoutes; @@ -54,7 +55,7 @@ public class WebAdminServerIntegrationTest { @Rule public CassandraJmapTestRule cassandraJmapTestRule = CassandraJmapTestRule.defaultTestRule(); - private JmapJamesServer guiceJamesServer; + private GuiceJamesServer guiceJamesServer; @Before public void setUp() throws Exception { @@ -66,7 +67,7 @@ public class WebAdminServerIntegrationTest { .setContentType(ContentType.JSON) .setAccept(ContentType.JSON) .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8))) - .setPort(guiceJamesServer.getWebAdminProbe().getWebAdminPort()) + .setPort(guiceJamesServer.getProbe(WebAdminGuiceProbe.class).getWebAdminPort()) .build(); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
