You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ad...@apache.org on 2016/11/22 08:24:22 UTC
[1/2] james-project git commit: JAMES-1864 remove MemoryJamesServer
and CassandraJamesServer as they are pure duplication
Repository: james-project
Updated Branches:
refs/heads/master b5daadd1d -> 2a3076909
JAMES-1864 remove MemoryJamesServer and CassandraJamesServer as they are pure duplication
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/644ecaa1
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/644ecaa1
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/644ecaa1
Branch: refs/heads/master
Commit: 644ecaa11624b811f321a8d6ec932dd5b8e126b7
Parents: b5daadd
Author: Matthieu Baechler <ma...@linagora.com>
Authored: Fri Nov 18 17:45:35 2016 +0100
Committer: Matthieu Baechler <ma...@linagora.com>
Committed: Mon Nov 21 21:04:31 2016 +0100
----------------------------------------------------------------------
.../org/apache/james/CassandraJamesServer.java | 58 --------------------
.../apache/james/CassandraJamesServerTest.java | 6 +-
.../java/org/apache/james/JmapJamesServer.java | 38 ++++++++++++-
.../james/AbstractJmapJamesServerTest.java | 6 +-
.../org/apache/james/MemoryJamesServer.java | 56 -------------------
.../org/apache/james/MemoryJamesServerMain.java | 2 +-
.../org/apache/james/MemoryJamesServerTest.java | 6 +-
.../james/mailets/TemporaryJamesServer.java | 6 +-
.../CassandraGetMailboxesMethodTest.java | 8 +--
.../CassandraGetMessageListMethodTest.java | 8 +--
.../CassandraGetVacationResponseTest.java | 8 +--
.../CassandraJmapAuthenticationTest.java | 8 +--
.../CassandraSetMailboxesMethodTest.java | 8 +--
.../CassandraSetMessagesMethodTest.java | 8 +--
.../CassandraSetVacationResponseTest.java | 8 +--
.../CassandraVacationIntegrationTest.java | 8 +--
.../cassandra/cucumber/CassandraStepdefs.java | 4 +-
.../james/jmap/JMAPAuthenticationTest.java | 10 ++--
.../james/jmap/VacationIntegrationTest.java | 10 ++--
.../integration/GetMailboxesMethodTest.java | 10 ++--
.../integration/GetMessageListMethodTest.java | 10 ++--
.../integration/GetVacationResponseTest.java | 10 ++--
.../integration/SetMailboxesMethodTest.java | 10 ++--
.../integration/SetMessagesMethodTest.java | 13 ++---
.../integration/SetVacationResponseTest.java | 13 ++---
.../memory/MemoryGetMailboxesMethodTest.java | 8 +--
.../memory/MemoryGetMessageListMethodTest.java | 8 +--
.../MemoryGetVacationResponseMethodTest.java | 8 +--
.../memory/MemoryJmapAuthenticationTest.java | 8 +--
.../memory/MemorySetMailboxesMethodTest.java | 8 +--
.../memory/MemorySetMessagesMethodTest.java | 8 +--
.../MemorySetVacationResponseMethodTest.java | 8 +--
.../memory/MemoryVacationIntegrationTest.java | 8 +--
.../jmap/memory/cucumber/MemoryStepdefs.java | 4 +-
.../WebAdminServerIntegrationTest.java | 9 +--
35 files changed, 159 insertions(+), 250 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java
deleted file mode 100644
index 4ca7c76..0000000
--- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java
+++ /dev/null
@@ -1,58 +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;
-
-import java.util.Arrays;
-
-import org.apache.james.utils.JmapGuiceProbe;
-import org.apache.james.utils.WebAdminGuiceProbe;
-
-import com.google.common.collect.Iterables;
-import com.google.inject.Module;
-import com.google.inject.util.Modules;
-
-public class CassandraJamesServer extends GuiceJamesServerImpl implements JmapJamesServer {
-
- public CassandraJamesServer() {
- super();
- }
-
- public CassandraJamesServer(Module module) {
- super(module);
- }
-
- public CassandraJamesServer combineWith(Module... modules) {
- return new CassandraJamesServer(Modules.combine(Iterables.concat(Arrays.asList(module), Arrays.asList(modules))));
- }
-
- public CassandraJamesServer overrideWith(Module... overrides) {
- return new CassandraJamesServer(Modules.override(module).with(overrides));
- }
-
- @Override
- public JmapGuiceProbe getJmapProbe() {
- return getGuiceProbeProvider().getProbe(JmapGuiceProbe.class);
- }
-
- @Override
- public WebAdminGuiceProbe getWebAdminProbe() {
- return getGuiceProbeProvider().getProbe(WebAdminGuiceProbe.class);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
index 209a8d4..769b789 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
@@ -35,7 +35,7 @@ import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import com.google.inject.Singleton;
-public class CassandraJamesServerTest extends AbstractJmapJamesServerTest<CassandraJamesServer> {
+public class CassandraJamesServerTest extends AbstractJmapJamesServerTest {
private TemporaryFolder temporaryFolder = new TemporaryFolder();
private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
@@ -45,8 +45,8 @@ public class CassandraJamesServerTest extends AbstractJmapJamesServerTest<Cassan
public RuleChain chain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch);
@Override
- protected CassandraJamesServer createJamesServer() {
- return new CassandraJamesServer()
+ protected JmapJamesServer createJamesServer() {
+ return new JmapJamesServer()
.combineWith(CassandraJamesServerMain.cassandraServerModule)
.overrideWith(new TestElasticSearchModule(embeddedElasticSearch),
new TestFilesystemModule(temporaryFolder),
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/container/guice/guice-common/src/main/java/org/apache/james/JmapJamesServer.java
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/JmapJamesServer.java b/server/container/guice/guice-common/src/main/java/org/apache/james/JmapJamesServer.java
index cf374ba..ee66967 100644
--- a/server/container/guice/guice-common/src/main/java/org/apache/james/JmapJamesServer.java
+++ b/server/container/guice/guice-common/src/main/java/org/apache/james/JmapJamesServer.java
@@ -18,6 +18,42 @@
****************************************************************/
package org.apache.james;
-public interface JmapJamesServer extends GuiceJamesServer, JmapServer, WebAdminServer {
+import java.util.Arrays;
+import org.apache.james.utils.JmapGuiceProbe;
+import org.apache.james.utils.WebAdminGuiceProbe;
+
+import com.google.common.collect.Iterables;
+import com.google.inject.Module;
+import com.google.inject.util.Modules;
+
+public class JmapJamesServer extends GuiceJamesServerImpl implements GuiceJamesServer, JmapServer, WebAdminServer {
+
+ public JmapJamesServer() {
+ super();
+ }
+
+ public JmapJamesServer(Module module) {
+ super(module);
+ }
+
+ public JmapJamesServer combineWith(Module... modules) {
+ return new JmapJamesServer(Modules.combine(Iterables.concat(Arrays.asList(module), Arrays.asList(modules))));
+ }
+
+ public JmapJamesServer overrideWith(Module... overrides) {
+ return new JmapJamesServer(Modules.override(module).with(overrides));
+ }
+
+ @Override
+ public JmapGuiceProbe getJmapProbe() {
+ return getGuiceProbeProvider().getProbe(JmapGuiceProbe.class);
+ }
+
+ @Override
+ public WebAdminGuiceProbe getWebAdminProbe() {
+ return getGuiceProbeProvider().getProbe(WebAdminGuiceProbe.class);
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java
index 46d8917..860da26 100644
--- a/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java
+++ b/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java
@@ -39,7 +39,7 @@ import com.jayway.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
-public abstract class AbstractJmapJamesServerTest<T extends JmapJamesServer> {
+public abstract class AbstractJmapJamesServerTest {
private static final int IMAP_PORT = 1143; // You need to be root (superuser) to bind to ports under 1024.
private static final int IMAP_PORT_SSL = 1993;
@@ -47,7 +47,7 @@ public abstract class AbstractJmapJamesServerTest<T extends JmapJamesServer> {
private static final int SMTP_PORT = 1025;
private static final int LMTP_PORT = 1024;
- private T server;
+ private JmapJamesServer server;
private SocketChannel socketChannel;
@Before
@@ -65,7 +65,7 @@ public abstract class AbstractJmapJamesServerTest<T extends JmapJamesServer> {
.build();
}
- protected abstract T createJamesServer();
+ protected abstract JmapJamesServer createJamesServer();
protected abstract void clean();
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServer.java
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServer.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServer.java
deleted file mode 100644
index ee927af..0000000
--- a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServer.java
+++ /dev/null
@@ -1,56 +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;
-
-import java.util.Arrays;
-
-import org.apache.james.utils.JmapGuiceProbe;
-import org.apache.james.utils.WebAdminGuiceProbe;
-
-import com.google.common.collect.Iterables;
-import com.google.inject.Module;
-import com.google.inject.util.Modules;
-
-public class MemoryJamesServer extends GuiceJamesServerImpl implements JmapJamesServer {
- public MemoryJamesServer() {
- super();
- }
-
- public MemoryJamesServer(Module module) {
- super(module);
- }
-
- public MemoryJamesServer combineWith(Module... modules) {
- return new MemoryJamesServer(Modules.combine(Iterables.concat(Arrays.asList(module), Arrays.asList(modules))));
- }
-
- public MemoryJamesServer overrideWith(Module... overrides) {
- return new MemoryJamesServer(Modules.override(module).with(overrides));
- }
-
- @Override
- public JmapGuiceProbe getJmapProbe() {
- return getGuiceProbeProvider().getProbe(JmapGuiceProbe.class);
- }
-
- @Override
- public WebAdminGuiceProbe getWebAdminProbe() {
- return getGuiceProbeProvider().getProbe(WebAdminGuiceProbe.class);
- }
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java
index cfeeb42..54f95c3 100644
--- a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java
+++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java
@@ -41,7 +41,7 @@ public class MemoryJamesServerMain {
new MemoryMailQueueModule());
public static void main(String[] args) throws Exception {
- new MemoryJamesServer()
+ new JmapJamesServer()
.combineWith(inMemoryServerModule, new JMXServerModule())
.start();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java
index 14d85ea..808a5bf 100644
--- a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java
+++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java
@@ -25,14 +25,14 @@ import org.apache.james.modules.TestJMAPServerModule;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
-public class MemoryJamesServerTest extends AbstractJmapJamesServerTest<MemoryJamesServer> {
+public class MemoryJamesServerTest extends AbstractJmapJamesServerTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Override
- protected MemoryJamesServer createJamesServer() {
- return new MemoryJamesServer()
+ protected JmapJamesServer createJamesServer() {
+ return new JmapJamesServer()
.combineWith(MemoryJamesServerMain.inMemoryServerModule)
.overrideWith(new TestFilesystemModule(temporaryFolder),
new TestJMAPServerModule(GetMessageListMethod.DEFAULT_MAXIMUM_LIMIT));
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
index 4b9ba55..146e4ba 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
@@ -28,7 +28,7 @@ import java.util.Arrays;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.io.IOUtils;
-import org.apache.james.MemoryJamesServer;
+import org.apache.james.JmapJamesServer;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.mailets.configuration.MailetContainer;
import org.apache.james.modules.TestJMAPServerModule;
@@ -44,13 +44,13 @@ public class TemporaryJamesServer {
private static final int LIMIT_TO_3_MESSAGES = 3;
- private final MemoryJamesServer jamesServer;
+ private final JmapJamesServer jamesServer;
public TemporaryJamesServer(TemporaryFolder temporaryFolder, MailetContainer mailetContainer, Module... additionalModules) throws Exception {
appendMailetConfigurations(temporaryFolder, mailetContainer);
- jamesServer = new MemoryJamesServer()
+ jamesServer = new JmapJamesServer()
.combineWith(MemoryJamesServerMain.inMemoryServerModule)
.overrideWith(ImmutableList.<Module>builder().addAll(Arrays.asList(additionalModules))
.add(new TestJMAPServerModule(LIMIT_TO_3_MESSAGES))
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java
index ff36364..815d2ff 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java
@@ -19,8 +19,8 @@
package org.apache.james.jmap.cassandra;
-import org.apache.james.CassandraJamesServer;
import org.apache.james.CassandraJamesServerMain;
+import org.apache.james.JmapJamesServer;
import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.methods.integration.GetMailboxesMethodTest;
import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
@@ -30,7 +30,7 @@ import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
-public class CassandraGetMailboxesMethodTest extends GetMailboxesMethodTest<CassandraJamesServer> {
+public class CassandraGetMailboxesMethodTest extends GetMailboxesMethodTest {
private TemporaryFolder temporaryFolder = new TemporaryFolder();
private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
@@ -42,8 +42,8 @@ public class CassandraGetMailboxesMethodTest extends GetMailboxesMethodTest<Cass
.around(embeddedElasticSearch);
@Override
- protected CassandraJamesServer createJmapServer() {
- return new CassandraJamesServer()
+ protected JmapJamesServer createJmapServer() {
+ return new JmapJamesServer()
.combineWith(CassandraJamesServerMain.cassandraServerModule)
.overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java
index c6b62f9..4e469dc 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java
@@ -19,8 +19,8 @@
package org.apache.james.jmap.cassandra;
-import org.apache.james.CassandraJamesServer;
import org.apache.james.CassandraJamesServerMain;
+import org.apache.james.JmapJamesServer;
import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.methods.integration.GetMessageListMethodTest;
import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
@@ -29,7 +29,7 @@ import org.junit.Rule;
import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
-public class CassandraGetMessageListMethodTest extends GetMessageListMethodTest<CassandraJamesServer> {
+public class CassandraGetMessageListMethodTest extends GetMessageListMethodTest {
private TemporaryFolder temporaryFolder = new TemporaryFolder();
private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
@@ -41,8 +41,8 @@ public class CassandraGetMessageListMethodTest extends GetMessageListMethodTest<
.around(embeddedElasticSearch);
@Override
- protected CassandraJamesServer createJmapServer() {
- return new CassandraJamesServer()
+ protected JmapJamesServer createJmapServer() {
+ return new JmapJamesServer()
.combineWith(CassandraJamesServerMain.cassandraServerModule)
.overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java
index 14227f6..121ad02 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java
@@ -19,8 +19,8 @@
package org.apache.james.jmap.cassandra;
-import org.apache.james.CassandraJamesServer;
import org.apache.james.CassandraJamesServerMain;
+import org.apache.james.JmapJamesServer;
import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.methods.integration.GetVacationResponseTest;
import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
@@ -30,7 +30,7 @@ import org.junit.Rule;
import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
-public class CassandraGetVacationResponseTest extends GetVacationResponseTest<CassandraJamesServer> {
+public class CassandraGetVacationResponseTest extends GetVacationResponseTest {
private TemporaryFolder temporaryFolder = new TemporaryFolder();
private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
@@ -42,8 +42,8 @@ public class CassandraGetVacationResponseTest extends GetVacationResponseTest<Ca
.around(embeddedElasticSearch);
@Override
- protected CassandraJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) {
- return new CassandraJamesServer()
+ protected JmapJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) {
+ return new JmapJamesServer()
.combineWith(CassandraJamesServerMain.cassandraServerModule)
.overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra),
binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider));
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java
index d7801d8..d7fff9e 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.james.jmap.cassandra;
-import org.apache.james.CassandraJamesServer;
import org.apache.james.CassandraJamesServerMain;
+import org.apache.james.JmapJamesServer;
import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.FixedDateZonedDateTimeProvider;
import org.apache.james.jmap.JMAPAuthenticationTest;
@@ -30,7 +30,7 @@ import org.junit.Rule;
import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
-public class CassandraJmapAuthenticationTest extends JMAPAuthenticationTest<CassandraJamesServer> {
+public class CassandraJmapAuthenticationTest extends JMAPAuthenticationTest {
private TemporaryFolder temporaryFolder = new TemporaryFolder();
private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
@@ -42,8 +42,8 @@ public class CassandraJmapAuthenticationTest extends JMAPAuthenticationTest<Cass
.around(embeddedElasticSearch);
@Override
- protected CassandraJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) {
- return new CassandraJamesServer()
+ protected JmapJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) {
+ return new JmapJamesServer()
.combineWith(CassandraJamesServerMain.cassandraServerModule)
.overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra),
(binder) -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider));
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java
index 59017a3..eb070cc 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java
@@ -19,8 +19,8 @@
package org.apache.james.jmap.cassandra;
-import org.apache.james.CassandraJamesServer;
import org.apache.james.CassandraJamesServerMain;
+import org.apache.james.JmapJamesServer;
import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.methods.integration.SetMailboxesMethodTest;
import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
@@ -29,7 +29,7 @@ import org.junit.Rule;
import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
-public class CassandraSetMailboxesMethodTest extends SetMailboxesMethodTest<CassandraJamesServer> {
+public class CassandraSetMailboxesMethodTest extends SetMailboxesMethodTest {
private TemporaryFolder temporaryFolder = new TemporaryFolder();
private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
@@ -41,8 +41,8 @@ public class CassandraSetMailboxesMethodTest extends SetMailboxesMethodTest<Cass
.around(embeddedElasticSearch);
@Override
- protected CassandraJamesServer createJmapServer() {
- return new CassandraJamesServer()
+ protected JmapJamesServer createJmapServer() {
+ return new JmapJamesServer()
.combineWith(CassandraJamesServerMain.cassandraServerModule)
.overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java
index af02e92..2be70db 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java
@@ -19,8 +19,8 @@
package org.apache.james.jmap.cassandra;
-import org.apache.james.CassandraJamesServer;
import org.apache.james.CassandraJamesServerMain;
+import org.apache.james.JmapJamesServer;
import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.methods.integration.SetMessagesMethodTest;
import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
@@ -29,7 +29,7 @@ import org.junit.Rule;
import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
-public class CassandraSetMessagesMethodTest extends SetMessagesMethodTest<CassandraJamesServer> {
+public class CassandraSetMessagesMethodTest extends SetMessagesMethodTest {
private TemporaryFolder temporaryFolder = new TemporaryFolder();
private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
@@ -41,8 +41,8 @@ public class CassandraSetMessagesMethodTest extends SetMessagesMethodTest<Cassan
.around(embeddedElasticSearch);
@Override
- protected CassandraJamesServer createJmapServer() {
- return new CassandraJamesServer()
+ protected JmapJamesServer createJmapServer() {
+ return new JmapJamesServer()
.combineWith(CassandraJamesServerMain.cassandraServerModule)
.overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java
index 64e848c..af3e629 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java
@@ -19,8 +19,8 @@
package org.apache.james.jmap.cassandra;
-import org.apache.james.CassandraJamesServer;
import org.apache.james.CassandraJamesServerMain;
+import org.apache.james.JmapJamesServer;
import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.methods.integration.SetVacationResponseTest;
import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
@@ -29,7 +29,7 @@ import org.junit.Rule;
import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
-public class CassandraSetVacationResponseTest extends SetVacationResponseTest<CassandraJamesServer> {
+public class CassandraSetVacationResponseTest extends SetVacationResponseTest {
private TemporaryFolder temporaryFolder = new TemporaryFolder();
private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
@@ -41,8 +41,8 @@ public class CassandraSetVacationResponseTest extends SetVacationResponseTest<Ca
.around(embeddedElasticSearch);
@Override
- protected CassandraJamesServer createJmapServer() {
- return new CassandraJamesServer()
+ protected JmapJamesServer createJmapServer() {
+ return new JmapJamesServer()
.combineWith(CassandraJamesServerMain.cassandraServerModule)
.overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java
index cec5976..91ea2c3 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java
@@ -19,8 +19,8 @@
package org.apache.james.jmap.cassandra;
-import org.apache.james.CassandraJamesServer;
import org.apache.james.CassandraJamesServerMain;
+import org.apache.james.JmapJamesServer;
import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.VacationIntegrationTest;
import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
@@ -29,7 +29,7 @@ import org.junit.Rule;
import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
-public class CassandraVacationIntegrationTest extends VacationIntegrationTest<CassandraJamesServer> {
+public class CassandraVacationIntegrationTest extends VacationIntegrationTest {
private TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -42,8 +42,8 @@ public class CassandraVacationIntegrationTest extends VacationIntegrationTest<Ca
.around(embeddedElasticSearch);
@Override
- protected CassandraJamesServer createJmapServer() {
- return new CassandraJamesServer()
+ protected JmapJamesServer createJmapServer() {
+ return new JmapJamesServer()
.combineWith(CassandraJamesServerMain.cassandraServerModule)
.overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
index 39f4b65..226e67c 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
@@ -23,8 +23,8 @@ import java.util.Arrays;
import javax.inject.Inject;
-import org.apache.james.CassandraJamesServer;
import org.apache.james.CassandraJamesServerMain;
+import org.apache.james.JmapJamesServer;
import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.methods.integration.cucumber.MainStepdefs;
import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
@@ -54,7 +54,7 @@ public class CassandraStepdefs {
public void init() throws Exception {
temporaryFolder.create();
embeddedElasticSearch.before();
- mainStepdefs.jmapServer = new CassandraJamesServer()
+ mainStepdefs.jmapServer = new JmapJamesServer()
.combineWith(CassandraJamesServerMain.cassandraServerModule)
.overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra));
mainStepdefs.awaitMethod = () -> embeddedElasticSearch.awaitForElasticSearch();
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
index 8e34206..41104ab 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
@@ -32,9 +32,7 @@ import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.UUID;
-import org.apache.james.GuiceJamesServerImpl;
-import org.apache.james.JmapServer;
-import org.apache.james.WebAdminServer;
+import org.apache.james.JmapJamesServer;
import org.apache.james.jmap.model.ContinuationToken;
import org.junit.After;
import org.junit.Before;
@@ -45,17 +43,17 @@ import com.jayway.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
-public abstract class JMAPAuthenticationTest<T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> {
+public abstract class JMAPAuthenticationTest {
private static final ZonedDateTime oldDate = ZonedDateTime.parse("2011-12-03T10:15:30+01:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME);
private static final ZonedDateTime newDate = ZonedDateTime.parse("2011-12-03T10:16:30+01:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME);
private static final ZonedDateTime afterExpirationDate = ZonedDateTime.parse("2011-12-03T10:30:31+01:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME);
- protected abstract T createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider);
+ protected abstract JmapJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider);
private UserCredentials userCredentials;
private FixedDateZonedDateTimeProvider zonedDateTimeProvider;
- private T jmapServer;
+ private JmapJamesServer jmapServer;
@Before
public void setup() throws Throwable {
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
index b039913..00470b9 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
@@ -31,9 +31,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import org.apache.james.GuiceJamesServerImpl;
-import org.apache.james.JmapServer;
-import org.apache.james.WebAdminServer;
+import org.apache.james.JmapJamesServer;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.jmap.api.vacation.AccountId;
import org.apache.james.jmap.api.vacation.VacationPatch;
@@ -51,7 +49,7 @@ import com.jayway.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
-public abstract class VacationIntegrationTest<T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> {
+public abstract class VacationIntegrationTest {
private static final String ARGUMENTS = "[0][1]";
private static final String SECOND_NAME = "[1][0]";
@@ -65,10 +63,10 @@ public abstract class VacationIntegrationTest<T extends GuiceJamesServerImpl & J
public static final String ORIGINAL_MESSAGE_TEXT_BODY = "Hello someone, and thank you for joining example.com!";
private ConditionFactory calmlyAwait;
- private T guiceJamesServer;
+ private JmapJamesServer guiceJamesServer;
private JmapGuiceProbe jmapGuiceProbe;
- protected abstract T createJmapServer();
+ protected abstract JmapJamesServer createJmapServer();
protected abstract void await();
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
index 011752c..0221bae 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
@@ -35,9 +35,7 @@ import java.util.Date;
import javax.mail.Flags;
-import org.apache.james.GuiceJamesServerImpl;
-import org.apache.james.JmapServer;
-import org.apache.james.WebAdminServer;
+import org.apache.james.JmapJamesServer;
import org.apache.james.jmap.JmapAuthentication;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.mailbox.model.MailboxConstants;
@@ -52,15 +50,15 @@ import com.jayway.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
-public abstract class GetMailboxesMethodTest<T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> {
+public abstract class GetMailboxesMethodTest {
private static final String NAME = "[0][0]";
private static final String ARGUMENTS = "[0][1]";
- protected abstract T createJmapServer();
+ protected abstract JmapJamesServer createJmapServer();
private AccessToken accessToken;
private String username;
- private T jmapServer;
+ private JmapJamesServer jmapServer;
@Before
public void setup() throws Throwable {
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
index a9b7a22..40ff7a8 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
@@ -36,9 +36,7 @@ import java.util.List;
import javax.mail.Flags;
-import org.apache.james.GuiceJamesServerImpl;
-import org.apache.james.JmapServer;
-import org.apache.james.WebAdminServer;
+import org.apache.james.JmapJamesServer;
import org.apache.james.jmap.JmapAuthentication;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.mailbox.model.MailboxConstants;
@@ -54,18 +52,18 @@ import com.jayway.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
-public abstract class GetMessageListMethodTest<T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> {
+public abstract class GetMessageListMethodTest {
private static final String NAME = "[0][0]";
private static final String ARGUMENTS = "[0][1]";
- protected abstract T createJmapServer();
+ protected abstract JmapJamesServer createJmapServer();
protected abstract void await();
private AccessToken accessToken;
private String username;
private String domain;
- private T jmapServer;
+ private JmapJamesServer jmapServer;
@Before
public void setup() throws Throwable {
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
index 16e2403..31f5ee1 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
@@ -28,9 +28,7 @@ import static org.hamcrest.core.IsNull.nullValue;
import java.time.ZonedDateTime;
-import org.apache.james.GuiceJamesServerImpl;
-import org.apache.james.JmapServer;
-import org.apache.james.WebAdminServer;
+import org.apache.james.JmapJamesServer;
import org.apache.james.jmap.FixedDateZonedDateTimeProvider;
import org.apache.james.jmap.JmapAuthentication;
import org.apache.james.jmap.api.access.AccessToken;
@@ -47,7 +45,7 @@ import com.jayway.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
-public abstract class GetVacationResponseTest<T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> {
+public abstract class GetVacationResponseTest {
private static final String NAME = "[0][0]";
private static final String ARGUMENTS = "[0][1]";
@@ -60,12 +58,12 @@ public abstract class GetVacationResponseTest<T extends GuiceJamesServerImpl & J
public static final ZonedDateTime DATE_2016 = ZonedDateTime.parse("2016-04-15T11:56:32.224+07:00[Asia/Vientiane]");
private JmapGuiceProbe jmapGuiceProbe;
- protected abstract T createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider);
+ protected abstract JmapJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider);
protected abstract void await();
private AccessToken accessToken;
- private T jmapServer;
+ private JmapJamesServer jmapServer;
private FixedDateZonedDateTimeProvider fixedDateZonedDateTimeProvider;
@Before
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
index 4f3b19b..5a8e86b 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
@@ -36,9 +36,7 @@ import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.collection.IsMapWithSize.aMapWithSize;
-import org.apache.james.GuiceJamesServerImpl;
-import org.apache.james.JmapServer;
-import org.apache.james.WebAdminServer;
+import org.apache.james.JmapJamesServer;
import org.apache.james.jmap.JmapAuthentication;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.mailbox.model.MailboxConstants;
@@ -54,19 +52,19 @@ import com.jayway.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
-public abstract class SetMailboxesMethodTest<T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> {
+public abstract class SetMailboxesMethodTest {
private static final String NAME = "[0][0]";
private static final String ARGUMENTS = "[0][1]";
private static final String USERS_DOMAIN = "domain.tld";
- protected abstract T createJmapServer();
+ protected abstract JmapJamesServer createJmapServer();
protected abstract void await();
private AccessToken accessToken;
private String username;
- private T jmapServer;
+ private JmapJamesServer jmapServer;
@Before
public void setup() throws Throwable {
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/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 0045e32..6fc1859 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
@@ -23,7 +23,6 @@ import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
-import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.endsWith;
@@ -37,6 +36,8 @@ import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.collection.IsMapWithSize.aMapWithSize;
import static org.hamcrest.collection.IsMapWithSize.anEmptyMap;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.time.ZonedDateTime;
@@ -49,9 +50,7 @@ import java.util.stream.Collectors;
import javax.mail.Flags;
import org.apache.commons.io.IOUtils;
-import org.apache.james.GuiceJamesServerImpl;
-import org.apache.james.JmapServer;
-import org.apache.james.WebAdminServer;
+import org.apache.james.JmapJamesServer;
import org.apache.james.jmap.JmapAuthentication;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.jmap.model.mailbox.Role;
@@ -80,7 +79,7 @@ import com.jayway.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType;
import com.jayway.restassured.specification.ResponseSpecification;
-public abstract class SetMessagesMethodTest<T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> {
+public abstract class SetMessagesMethodTest {
private static final int _1MB = 1024*1024;
private static final String NAME = "[0][0]";
@@ -92,13 +91,13 @@ public abstract class SetMessagesMethodTest<T extends GuiceJamesServerImpl & Jma
private ConditionFactory calmlyAwait;
- protected abstract T createJmapServer();
+ protected abstract JmapJamesServer createJmapServer();
protected abstract void await();
private AccessToken accessToken;
private String username;
- private T jmapServer;
+ private JmapJamesServer jmapServer;
@Before
public void setup() throws Throwable {
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/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 ab2d265..4b43223 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
@@ -22,15 +22,14 @@ package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
-import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.equalTo;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.time.ZonedDateTime;
import java.util.Optional;
-import org.apache.james.GuiceJamesServerImpl;
-import org.apache.james.JmapServer;
-import org.apache.james.WebAdminServer;
+import org.apache.james.JmapJamesServer;
import org.apache.james.jmap.JmapAuthentication;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.jmap.api.vacation.AccountId;
@@ -47,7 +46,7 @@ import com.jayway.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
-public abstract class SetVacationResponseTest<T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> {
+public abstract class SetVacationResponseTest {
private static final String NAME = "[0][0]";
private static final String ARGUMENTS = "[0][1]";
@@ -57,12 +56,12 @@ public abstract class SetVacationResponseTest<T extends GuiceJamesServerImpl & J
public static final String SUBJECT = "subject";
private JmapGuiceProbe jmapGuiceProbe;
- protected abstract T createJmapServer();
+ protected abstract JmapJamesServer createJmapServer();
protected abstract void await();
private AccessToken accessToken;
- private T jmapServer;
+ private JmapJamesServer jmapServer;
@Before
public void setup() throws Throwable {
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/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 0be8484..02935bb 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,21 +19,21 @@
package org.apache.james.jmap.memory;
-import org.apache.james.MemoryJamesServer;
+import org.apache.james.JmapJamesServer;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.jmap.methods.integration.GetMailboxesMethodTest;
import org.apache.james.jmap.servers.MemoryJmapServerModule;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
-public class MemoryGetMailboxesMethodTest extends GetMailboxesMethodTest<MemoryJamesServer> {
+public class MemoryGetMailboxesMethodTest extends GetMailboxesMethodTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Override
- protected MemoryJamesServer createJmapServer() {
- return new MemoryJamesServer()
+ protected JmapJamesServer createJmapServer() {
+ return new JmapJamesServer()
.combineWith(MemoryJamesServerMain.inMemoryServerModule)
.overrideWith(new MemoryJmapServerModule(temporaryFolder));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/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 845e1fa..b07f0c2 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,21 +19,21 @@
package org.apache.james.jmap.memory;
-import org.apache.james.MemoryJamesServer;
+import org.apache.james.JmapJamesServer;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.jmap.methods.integration.GetMessageListMethodTest;
import org.apache.james.jmap.servers.MemoryJmapServerModule;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
-public class MemoryGetMessageListMethodTest extends GetMessageListMethodTest<MemoryJamesServer> {
+public class MemoryGetMessageListMethodTest extends GetMessageListMethodTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Override
- protected MemoryJamesServer createJmapServer() {
- return new MemoryJamesServer()
+ protected JmapJamesServer createJmapServer() {
+ return new JmapJamesServer()
.combineWith(MemoryJamesServerMain.inMemoryServerModule)
.overrideWith(new MemoryJmapServerModule(temporaryFolder));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/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 02d8ada..464ad36 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.MemoryJamesServer;
+import org.apache.james.JmapJamesServer;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.jmap.methods.integration.GetVacationResponseTest;
import org.apache.james.jmap.servers.MemoryJmapServerModule;
@@ -27,14 +27,14 @@ import org.apache.james.util.date.ZonedDateTimeProvider;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
-public class MemoryGetVacationResponseMethodTest extends GetVacationResponseTest<MemoryJamesServer> {
+public class MemoryGetVacationResponseMethodTest extends GetVacationResponseTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Override
- protected MemoryJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) {
- return new MemoryJamesServer()
+ protected JmapJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) {
+ return new JmapJamesServer()
.combineWith(MemoryJamesServerMain.inMemoryServerModule)
.overrideWith(new MemoryJmapServerModule(temporaryFolder),
binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider));
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/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 927c513..d687c69 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.MemoryJamesServer;
+import org.apache.james.JmapJamesServer;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.jmap.FixedDateZonedDateTimeProvider;
import org.apache.james.jmap.JMAPAuthenticationTest;
@@ -28,14 +28,14 @@ import org.apache.james.util.date.ZonedDateTimeProvider;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
-public class MemoryJmapAuthenticationTest extends JMAPAuthenticationTest<MemoryJamesServer> {
+public class MemoryJmapAuthenticationTest extends JMAPAuthenticationTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Override
- protected MemoryJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) {
- return new MemoryJamesServer()
+ protected JmapJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) {
+ return new JmapJamesServer()
.combineWith(MemoryJamesServerMain.inMemoryServerModule)
.overrideWith(new MemoryJmapServerModule(temporaryFolder),
(binder) -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider));
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/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 4e98f06..272db3b 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,21 +19,21 @@
package org.apache.james.jmap.memory;
-import org.apache.james.MemoryJamesServer;
+import org.apache.james.JmapJamesServer;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.jmap.methods.integration.SetMailboxesMethodTest;
import org.apache.james.jmap.servers.MemoryJmapServerModule;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
-public class MemorySetMailboxesMethodTest extends SetMailboxesMethodTest<MemoryJamesServer> {
+public class MemorySetMailboxesMethodTest extends SetMailboxesMethodTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Override
- protected MemoryJamesServer createJmapServer() {
- return new MemoryJamesServer()
+ protected JmapJamesServer createJmapServer() {
+ return new JmapJamesServer()
.combineWith(MemoryJamesServerMain.inMemoryServerModule)
.overrideWith(new MemoryJmapServerModule(temporaryFolder));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/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 98697d2..38814d3 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,21 +19,21 @@
package org.apache.james.jmap.memory;
-import org.apache.james.MemoryJamesServer;
+import org.apache.james.JmapJamesServer;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.jmap.methods.integration.SetMessagesMethodTest;
import org.apache.james.jmap.servers.MemoryJmapServerModule;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
-public class MemorySetMessagesMethodTest extends SetMessagesMethodTest<MemoryJamesServer> {
+public class MemorySetMessagesMethodTest extends SetMessagesMethodTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Override
- protected MemoryJamesServer createJmapServer() {
- return new MemoryJamesServer()
+ protected JmapJamesServer createJmapServer() {
+ return new JmapJamesServer()
.combineWith(MemoryJamesServerMain.inMemoryServerModule)
.overrideWith(new MemoryJmapServerModule(temporaryFolder));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/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 816a510..0c4f45f 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,21 +19,21 @@
package org.apache.james.jmap.memory;
-import org.apache.james.MemoryJamesServer;
+import org.apache.james.JmapJamesServer;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.jmap.methods.integration.SetVacationResponseTest;
import org.apache.james.jmap.servers.MemoryJmapServerModule;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
-public class MemorySetVacationResponseMethodTest extends SetVacationResponseTest<MemoryJamesServer> {
+public class MemorySetVacationResponseMethodTest extends SetVacationResponseTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Override
- protected MemoryJamesServer createJmapServer() {
- return new MemoryJamesServer()
+ protected JmapJamesServer createJmapServer() {
+ return new JmapJamesServer()
.combineWith(MemoryJamesServerMain.inMemoryServerModule)
.overrideWith(new MemoryJmapServerModule(temporaryFolder));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/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 253c8ba..42750e3 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,21 +19,21 @@
package org.apache.james.jmap.memory;
-import org.apache.james.MemoryJamesServer;
+import org.apache.james.JmapJamesServer;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.jmap.VacationIntegrationTest;
import org.apache.james.jmap.servers.MemoryJmapServerModule;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
-public class MemoryVacationIntegrationTest extends VacationIntegrationTest<MemoryJamesServer> {
+public class MemoryVacationIntegrationTest extends VacationIntegrationTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Override
- protected MemoryJamesServer createJmapServer() {
- return new MemoryJamesServer()
+ protected JmapJamesServer createJmapServer() {
+ return new JmapJamesServer()
.combineWith(MemoryJamesServerMain.inMemoryServerModule)
.overrideWith(new MemoryJmapServerModule(temporaryFolder));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/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 fc36fc7..1af93a9 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
@@ -21,7 +21,7 @@ package org.apache.james.jmap.memory.cucumber;
import javax.inject.Inject;
-import org.apache.james.MemoryJamesServer;
+import org.apache.james.JmapJamesServer;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.jmap.methods.integration.cucumber.MainStepdefs;
import org.apache.james.jmap.servers.MemoryJmapServerModule;
@@ -46,7 +46,7 @@ public class MemoryStepdefs {
@Before
public void init() throws Exception {
temporaryFolder.create();
- mainStepdefs.jmapServer = new MemoryJamesServer()
+ mainStepdefs.jmapServer = new JmapJamesServer()
.combineWith(MemoryJamesServerMain.inMemoryServerModule)
.overrideWith(new MemoryJmapServerModule(temporaryFolder));
mainStepdefs.init();
http://git-wip-us.apache.org/repos/asf/james-project/blob/644ecaa1/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 83a33e4..cc6264a 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
@@ -24,11 +24,12 @@ import static com.jayway.restassured.RestAssured.when;
import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
import static org.apache.james.webadmin.Constants.SEPARATOR;
-import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.is;
-import org.apache.james.CassandraJamesServer;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.james.CassandraJamesServerMain;
+import org.apache.james.JmapJamesServer;
import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
import org.apache.james.modules.CassandraJmapServerModule;
@@ -65,11 +66,11 @@ public class WebAdminServerIntegrationTest {
.outerRule(temporaryFolder)
.around(embeddedElasticSearch);
- private CassandraJamesServer guiceJamesServer;
+ private JmapJamesServer guiceJamesServer;
@Before
public void setUp() throws Exception {
- guiceJamesServer = new CassandraJamesServer()
+ guiceJamesServer = new JmapJamesServer()
.combineWith(CassandraJamesServerMain.cassandraServerModule)
.overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra),
new WebAdminConfigurationModule());
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/2] james-project git commit: JAMES-1864 use @Rule for server start
in tests
Posted by ad...@apache.org.
JAMES-1864 use @Rule for server start in tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2a307690
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2a307690
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2a307690
Branch: refs/heads/master
Commit: 2a30769097da75e3293d6a25aac3dcf41bd6f7a8
Parents: 644ecaa
Author: Matthieu Baechler <ma...@linagora.com>
Authored: Mon Nov 21 12:30:38 2016 +0100
Committer: Matthieu Baechler <ma...@linagora.com>
Committed: Mon Nov 21 21:04:39 2016 +0100
----------------------------------------------------------------------
.../apache/james/CassandraJamesServerTest.java | 41 +------------
.../org/apache/james/CassandraJmapTestRule.java | 60 ++++++++++++++++++++
.../java/org/apache/james/JmapJamesServer.java | 2 +-
.../org/apache/james/MemoryJamesServerTest.java | 11 +---
.../org/apache/james/MemoryJmapTestRule.java | 47 +++++++++++++++
server/pom.xml | 6 ++
.../CassandraGetMailboxesMethodTest.java | 23 ++------
.../CassandraGetMessageListMethodTest.java | 23 ++------
.../CassandraGetVacationResponseTest.java | 29 +++-------
.../CassandraJmapAuthenticationTest.java | 27 +++------
.../CassandraSetMailboxesMethodTest.java | 27 +++------
.../CassandraSetMessagesMethodTest.java | 28 +++------
.../CassandraSetVacationResponseTest.java | 28 +++------
.../CassandraVacationIntegrationTest.java | 26 +++------
.../memory-jmap-integration-testing/pom.xml | 6 ++
.../memory/MemoryGetMailboxesMethodTest.java | 10 +---
.../memory/MemoryGetMessageListMethodTest.java | 10 +---
.../MemoryGetVacationResponseMethodTest.java | 14 ++---
.../memory/MemoryJmapAuthenticationTest.java | 14 ++---
.../memory/MemorySetMailboxesMethodTest.java | 10 +---
.../memory/MemorySetMessagesMethodTest.java | 10 +---
.../MemorySetVacationResponseMethodTest.java | 12 ++--
.../memory/MemoryVacationIntegrationTest.java | 10 +---
.../WebAdminServerIntegrationTest.java | 21 ++-----
24 files changed, 212 insertions(+), 283 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
index 769b789..41d6b71 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
@@ -19,57 +19,20 @@
package org.apache.james;
-import org.apache.james.backends.cassandra.CassandraCluster;
-import org.apache.james.backends.cassandra.components.CassandraModule;
-import org.apache.james.jmap.methods.GetMessageListMethod;
-import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
-import org.apache.james.modules.TestElasticSearchModule;
-import org.apache.james.modules.TestFilesystemModule;
-import org.apache.james.modules.TestJMAPServerModule;
import org.junit.Rule;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TemporaryFolder;
-
-import com.datastax.driver.core.Session;
-import com.google.inject.AbstractModule;
-import com.google.inject.Provides;
-import com.google.inject.Singleton;
public class CassandraJamesServerTest extends AbstractJmapJamesServerTest {
- private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
- private CassandraCluster cassandra;
-
@Rule
- public RuleChain chain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch);
+ public CassandraJmapTestRule cassandraJmap = new CassandraJmapTestRule();
@Override
protected JmapJamesServer createJamesServer() {
- return new JmapJamesServer()
- .combineWith(CassandraJamesServerMain.cassandraServerModule)
- .overrideWith(new TestElasticSearchModule(embeddedElasticSearch),
- new TestFilesystemModule(temporaryFolder),
- new TestJMAPServerModule(GetMessageListMethod.DEFAULT_MAXIMUM_LIMIT),
- new AbstractModule() {
-
- @Override
- protected void configure() {
- }
-
- @Provides
- @Singleton
- Session provideSession(CassandraModule cassandraModule) {
- cassandra = CassandraCluster.create(cassandraModule);
- return cassandra.getConf();
- }
- });
+ return cassandraJmap.jmapServer();
}
@Override
protected void clean() {
- cassandra.clearAllTables();
}
-
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java
new file mode 100644
index 0000000..5951c31
--- /dev/null
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java
@@ -0,0 +1,60 @@
+/****************************************************************
+ * 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;
+import org.apache.james.backends.cassandra.EmbeddedCassandra;
+import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
+import org.apache.james.modules.CassandraJmapServerModule;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TemporaryFolder;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+
+public class CassandraJmapTestRule implements TestRule {
+
+ private TemporaryFolder temporaryFolder = new TemporaryFolder();
+ private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
+ private EmbeddedCassandra cassandra = EmbeddedCassandra.createStartServer();
+
+ public RuleChain chain = RuleChain
+ .outerRule(temporaryFolder)
+ .around(embeddedElasticSearch);
+
+ public JmapJamesServer jmapServer() {
+ return new JmapJamesServer()
+ .combineWith(CassandraJamesServerMain.cassandraServerModule)
+ .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra));
+ }
+
+ @Override
+ public Statement apply(Statement base, Description description) {
+ return chain.apply(base, description);
+ }
+
+
+ public EmbeddedElasticSearch getElasticSearch() {
+ return embeddedElasticSearch;
+ }
+
+ public void await() {
+ embeddedElasticSearch.awaitForElasticSearch();
+ }
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/server/container/guice/guice-common/src/main/java/org/apache/james/JmapJamesServer.java
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/JmapJamesServer.java b/server/container/guice/guice-common/src/main/java/org/apache/james/JmapJamesServer.java
index ee66967..9dabe86 100644
--- a/server/container/guice/guice-common/src/main/java/org/apache/james/JmapJamesServer.java
+++ b/server/container/guice/guice-common/src/main/java/org/apache/james/JmapJamesServer.java
@@ -33,7 +33,7 @@ public class JmapJamesServer extends GuiceJamesServerImpl implements GuiceJamesS
super();
}
- public JmapJamesServer(Module module) {
+ private JmapJamesServer(Module module) {
super(module);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java
index 808a5bf..6da4804 100644
--- a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java
+++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java
@@ -19,23 +19,16 @@
package org.apache.james;
-import org.apache.james.jmap.methods.GetMessageListMethod;
-import org.apache.james.modules.TestFilesystemModule;
-import org.apache.james.modules.TestJMAPServerModule;
import org.junit.Rule;
-import org.junit.rules.TemporaryFolder;
public class MemoryJamesServerTest extends AbstractJmapJamesServerTest {
@Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
@Override
protected JmapJamesServer createJamesServer() {
- return new JmapJamesServer()
- .combineWith(MemoryJamesServerMain.inMemoryServerModule)
- .overrideWith(new TestFilesystemModule(temporaryFolder),
- new TestJMAPServerModule(GetMessageListMethod.DEFAULT_MAXIMUM_LIMIT));
+ return memoryJmap.jmapServer();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapTestRule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapTestRule.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapTestRule.java
new file mode 100644
index 0000000..fb87792
--- /dev/null
+++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapTestRule.java
@@ -0,0 +1,47 @@
+/****************************************************************
+ * 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;
+
+import org.apache.james.modules.TestFilesystemModule;
+import org.apache.james.modules.TestJMAPServerModule;
+import org.junit.rules.TemporaryFolder;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+public class MemoryJmapTestRule implements TestRule {
+
+ private static final int LIMIT_TO_3_MESSAGES = 3;
+
+ public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+ public JmapJamesServer jmapServer() {
+ return new JmapJamesServer()
+ .combineWith(MemoryJamesServerMain.inMemoryServerModule)
+ .overrideWith(new TestFilesystemModule(temporaryFolder),
+ new TestJMAPServerModule(LIMIT_TO_3_MESSAGES));
+ }
+
+ @Override
+ public Statement apply(Statement base, Description description) {
+ return temporaryFolder.apply(base, description);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index f86c171..e0de06a 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -593,6 +593,12 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-memory-guice</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-jmap</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java
index 815d2ff..7a6eb13 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java
@@ -19,33 +19,20 @@
package org.apache.james.jmap.cassandra;
-import org.apache.james.CassandraJamesServerMain;
+import org.apache.james.CassandraJmapTestRule;
import org.apache.james.JmapJamesServer;
-import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.methods.integration.GetMailboxesMethodTest;
-import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
-import org.apache.james.modules.CassandraJmapServerModule;
import org.junit.Rule;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TemporaryFolder;
public class CassandraGetMailboxesMethodTest extends GetMailboxesMethodTest {
- private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
- private EmbeddedCassandra cassandra = EmbeddedCassandra.createStartServer();
-
- @Rule
- public RuleChain chain = RuleChain
- .outerRule(temporaryFolder)
- .around(embeddedElasticSearch);
-
+ @Rule
+ public CassandraJmapTestRule rule = new CassandraJmapTestRule();
+
@Override
protected JmapJamesServer createJmapServer() {
- return new JmapJamesServer()
- .combineWith(CassandraJamesServerMain.cassandraServerModule)
- .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra));
+ return rule.jmapServer();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java
index 4e469dc..8d5aa57 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java
@@ -19,36 +19,23 @@
package org.apache.james.jmap.cassandra;
-import org.apache.james.CassandraJamesServerMain;
+import org.apache.james.CassandraJmapTestRule;
import org.apache.james.JmapJamesServer;
-import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.methods.integration.GetMessageListMethodTest;
-import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
-import org.apache.james.modules.CassandraJmapServerModule;
import org.junit.Rule;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TemporaryFolder;
public class CassandraGetMessageListMethodTest extends GetMessageListMethodTest {
- private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
- private EmbeddedCassandra cassandra = EmbeddedCassandra.createStartServer();
-
- @Rule
- public RuleChain chain = RuleChain
- .outerRule(temporaryFolder)
- .around(embeddedElasticSearch);
+ @Rule
+ public CassandraJmapTestRule rule = new CassandraJmapTestRule();
@Override
protected JmapJamesServer createJmapServer() {
- return new JmapJamesServer()
- .combineWith(CassandraJamesServerMain.cassandraServerModule)
- .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra));
+ return rule.jmapServer();
}
@Override
protected void await() {
- embeddedElasticSearch.awaitForElasticSearch();
+ rule.await();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java
index 121ad02..6e52b05 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java
@@ -19,38 +19,25 @@
package org.apache.james.jmap.cassandra;
-import org.apache.james.CassandraJamesServerMain;
+import org.apache.james.CassandraJmapTestRule;
import org.apache.james.JmapJamesServer;
-import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.methods.integration.GetVacationResponseTest;
-import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
-import org.apache.james.modules.CassandraJmapServerModule;
import org.apache.james.util.date.ZonedDateTimeProvider;
import org.junit.Rule;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TemporaryFolder;
public class CassandraGetVacationResponseTest extends GetVacationResponseTest {
- private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
- private EmbeddedCassandra cassandra = EmbeddedCassandra.createStartServer();
-
- @Rule
- public RuleChain chain = RuleChain
- .outerRule(temporaryFolder)
- .around(embeddedElasticSearch);
-
+ @Rule
+ public CassandraJmapTestRule rule = new CassandraJmapTestRule();
+
@Override
protected JmapJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) {
- return new JmapJamesServer()
- .combineWith(CassandraJamesServerMain.cassandraServerModule)
- .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra),
- binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider));
+ return rule.jmapServer()
+ .overrideWith(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider));
}
-
+
@Override
protected void await() {
- embeddedElasticSearch.awaitForElasticSearch();
+ rule.await();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java
index d7fff9e..28667a3 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java
@@ -18,35 +18,22 @@
****************************************************************/
package org.apache.james.jmap.cassandra;
-import org.apache.james.CassandraJamesServerMain;
+import org.apache.james.CassandraJmapTestRule;
import org.apache.james.JmapJamesServer;
-import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.FixedDateZonedDateTimeProvider;
import org.apache.james.jmap.JMAPAuthenticationTest;
-import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
-import org.apache.james.modules.CassandraJmapServerModule;
import org.apache.james.util.date.ZonedDateTimeProvider;
import org.junit.Rule;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TemporaryFolder;
public class CassandraJmapAuthenticationTest extends JMAPAuthenticationTest {
- private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
- private EmbeddedCassandra cassandra = EmbeddedCassandra.createStartServer();
-
- @Rule
- public RuleChain chain = RuleChain
- .outerRule(temporaryFolder)
- .around(embeddedElasticSearch);
-
+ @Rule
+ public CassandraJmapTestRule rule = new CassandraJmapTestRule();
+
@Override
protected JmapJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) {
- return new JmapJamesServer()
- .combineWith(CassandraJamesServerMain.cassandraServerModule)
- .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra),
- (binder) -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider));
+ return rule.jmapServer()
+ .overrideWith(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider));
}
-
+
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java
index eb070cc..10c32e5 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java
@@ -19,36 +19,23 @@
package org.apache.james.jmap.cassandra;
-import org.apache.james.CassandraJamesServerMain;
+import org.apache.james.CassandraJmapTestRule;
import org.apache.james.JmapJamesServer;
-import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.methods.integration.SetMailboxesMethodTest;
-import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
-import org.apache.james.modules.CassandraJmapServerModule;
import org.junit.Rule;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TemporaryFolder;
public class CassandraSetMailboxesMethodTest extends SetMailboxesMethodTest {
- private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
- private EmbeddedCassandra cassandra = EmbeddedCassandra.createStartServer();
-
- @Rule
- public RuleChain chain = RuleChain
- .outerRule(temporaryFolder)
- .around(embeddedElasticSearch);
-
+ @Rule
+ public CassandraJmapTestRule rule = new CassandraJmapTestRule();
+
@Override
protected JmapJamesServer createJmapServer() {
- return new JmapJamesServer()
- .combineWith(CassandraJamesServerMain.cassandraServerModule)
- .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra));
+ return rule.jmapServer();
}
-
+
@Override
protected void await() {
- embeddedElasticSearch.awaitForElasticSearch();
+ rule.await();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java
index 2be70db..ba2e4fe 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java
@@ -19,36 +19,24 @@
package org.apache.james.jmap.cassandra;
-import org.apache.james.CassandraJamesServerMain;
+import org.apache.james.CassandraJmapTestRule;
import org.apache.james.JmapJamesServer;
-import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.methods.integration.SetMessagesMethodTest;
-import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
-import org.apache.james.modules.CassandraJmapServerModule;
import org.junit.Rule;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TemporaryFolder;
public class CassandraSetMessagesMethodTest extends SetMessagesMethodTest {
- private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
- private EmbeddedCassandra cassandra = EmbeddedCassandra.createStartServer();
-
- @Rule
- public RuleChain chain = RuleChain
- .outerRule(temporaryFolder)
- .around(embeddedElasticSearch);
-
+ @Rule
+ public CassandraJmapTestRule rule = new CassandraJmapTestRule();
+
@Override
protected JmapJamesServer createJmapServer() {
- return new JmapJamesServer()
- .combineWith(CassandraJamesServerMain.cassandraServerModule)
- .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra));
+ return rule.jmapServer();
}
-
+
@Override
protected void await() {
- embeddedElasticSearch.awaitForElasticSearch();
+ rule.await();
}
+
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java
index af3e629..463971f 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java
@@ -19,36 +19,24 @@
package org.apache.james.jmap.cassandra;
-import org.apache.james.CassandraJamesServerMain;
+import org.apache.james.CassandraJmapTestRule;
import org.apache.james.JmapJamesServer;
-import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.methods.integration.SetVacationResponseTest;
-import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
-import org.apache.james.modules.CassandraJmapServerModule;
import org.junit.Rule;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TemporaryFolder;
public class CassandraSetVacationResponseTest extends SetVacationResponseTest {
- private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
- private EmbeddedCassandra cassandra = EmbeddedCassandra.createStartServer();
-
- @Rule
- public RuleChain chain = RuleChain
- .outerRule(temporaryFolder)
- .around(embeddedElasticSearch);
-
+ @Rule
+ public CassandraJmapTestRule rule = new CassandraJmapTestRule();
+
@Override
protected JmapJamesServer createJmapServer() {
- return new JmapJamesServer()
- .combineWith(CassandraJamesServerMain.cassandraServerModule)
- .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra));
+ return rule.jmapServer();
}
-
+
@Override
protected void await() {
- embeddedElasticSearch.awaitForElasticSearch();
+ rule.await();
}
+
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java
index 91ea2c3..c16c96d 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java
@@ -19,37 +19,25 @@
package org.apache.james.jmap.cassandra;
-import org.apache.james.CassandraJamesServerMain;
+import org.apache.james.CassandraJmapTestRule;
import org.apache.james.JmapJamesServer;
-import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.VacationIntegrationTest;
-import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
-import org.apache.james.modules.CassandraJmapServerModule;
import org.junit.Rule;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TemporaryFolder;
public class CassandraVacationIntegrationTest extends VacationIntegrationTest {
- private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
- private EmbeddedCassandra cassandra = EmbeddedCassandra.createStartServer();
-
- @Rule
- public RuleChain chain = RuleChain
- .outerRule(temporaryFolder)
- .around(embeddedElasticSearch);
-
+ @Rule
+ public CassandraJmapTestRule rule = new CassandraJmapTestRule();
+
@Override
protected JmapJamesServer createJmapServer() {
- return new JmapJamesServer()
- .combineWith(CassandraJamesServerMain.cassandraServerModule)
- .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra));
+ return rule.jmapServer();
}
@Override
protected void await() {
- embeddedElasticSearch.awaitForElasticSearch();
+ rule.await();
}
+
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/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 1019d01..0885af5 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
@@ -166,6 +166,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-memory-guice</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.jayway.restassured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/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 02935bb..02d3185 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
@@ -20,22 +20,18 @@
package org.apache.james.jmap.memory;
import org.apache.james.JmapJamesServer;
-import org.apache.james.MemoryJamesServerMain;
+import org.apache.james.MemoryJmapTestRule;
import org.apache.james.jmap.methods.integration.GetMailboxesMethodTest;
-import org.apache.james.jmap.servers.MemoryJmapServerModule;
import org.junit.Rule;
-import org.junit.rules.TemporaryFolder;
public class MemoryGetMailboxesMethodTest extends GetMailboxesMethodTest {
@Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
@Override
protected JmapJamesServer createJmapServer() {
- return new JmapJamesServer()
- .combineWith(MemoryJamesServerMain.inMemoryServerModule)
- .overrideWith(new MemoryJmapServerModule(temporaryFolder));
+ return memoryJmap.jmapServer();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/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 b07f0c2..c40fe5c 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
@@ -20,22 +20,18 @@
package org.apache.james.jmap.memory;
import org.apache.james.JmapJamesServer;
-import org.apache.james.MemoryJamesServerMain;
+import org.apache.james.MemoryJmapTestRule;
import org.apache.james.jmap.methods.integration.GetMessageListMethodTest;
-import org.apache.james.jmap.servers.MemoryJmapServerModule;
import org.junit.Rule;
-import org.junit.rules.TemporaryFolder;
public class MemoryGetMessageListMethodTest extends GetMessageListMethodTest {
@Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
@Override
protected JmapJamesServer createJmapServer() {
- return new JmapJamesServer()
- .combineWith(MemoryJamesServerMain.inMemoryServerModule)
- .overrideWith(new MemoryJmapServerModule(temporaryFolder));
+ return memoryJmap.jmapServer();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/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 464ad36..70348f4 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
@@ -20,24 +20,20 @@
package org.apache.james.jmap.memory;
import org.apache.james.JmapJamesServer;
-import org.apache.james.MemoryJamesServerMain;
+import org.apache.james.MemoryJmapTestRule;
import org.apache.james.jmap.methods.integration.GetVacationResponseTest;
-import org.apache.james.jmap.servers.MemoryJmapServerModule;
import org.apache.james.util.date.ZonedDateTimeProvider;
import org.junit.Rule;
-import org.junit.rules.TemporaryFolder;
public class MemoryGetVacationResponseMethodTest extends GetVacationResponseTest {
-
+
@Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
@Override
protected JmapJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) {
- return new JmapJamesServer()
- .combineWith(MemoryJamesServerMain.inMemoryServerModule)
- .overrideWith(new MemoryJmapServerModule(temporaryFolder),
- binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider));
+ return memoryJmap.jmapServer()
+ .overrideWith(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider));
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/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 d687c69..e561a09 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
@@ -20,24 +20,20 @@
package org.apache.james.jmap.memory;
import org.apache.james.JmapJamesServer;
-import org.apache.james.MemoryJamesServerMain;
+import org.apache.james.MemoryJmapTestRule;
import org.apache.james.jmap.FixedDateZonedDateTimeProvider;
import org.apache.james.jmap.JMAPAuthenticationTest;
-import org.apache.james.jmap.servers.MemoryJmapServerModule;
import org.apache.james.util.date.ZonedDateTimeProvider;
import org.junit.Rule;
-import org.junit.rules.TemporaryFolder;
public class MemoryJmapAuthenticationTest extends JMAPAuthenticationTest {
-
+
@Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
@Override
protected JmapJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) {
- return new JmapJamesServer()
- .combineWith(MemoryJamesServerMain.inMemoryServerModule)
- .overrideWith(new MemoryJmapServerModule(temporaryFolder),
- (binder) -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider));
+ return memoryJmap.jmapServer()
+ .overrideWith((binder) -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/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 272db3b..ce5ff4f 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
@@ -20,22 +20,18 @@
package org.apache.james.jmap.memory;
import org.apache.james.JmapJamesServer;
-import org.apache.james.MemoryJamesServerMain;
+import org.apache.james.MemoryJmapTestRule;
import org.apache.james.jmap.methods.integration.SetMailboxesMethodTest;
-import org.apache.james.jmap.servers.MemoryJmapServerModule;
import org.junit.Rule;
-import org.junit.rules.TemporaryFolder;
public class MemorySetMailboxesMethodTest extends SetMailboxesMethodTest {
@Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
@Override
protected JmapJamesServer createJmapServer() {
- return new JmapJamesServer()
- .combineWith(MemoryJamesServerMain.inMemoryServerModule)
- .overrideWith(new MemoryJmapServerModule(temporaryFolder));
+ return memoryJmap.jmapServer();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/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 38814d3..f859b40 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
@@ -20,22 +20,18 @@
package org.apache.james.jmap.memory;
import org.apache.james.JmapJamesServer;
-import org.apache.james.MemoryJamesServerMain;
+import org.apache.james.MemoryJmapTestRule;
import org.apache.james.jmap.methods.integration.SetMessagesMethodTest;
-import org.apache.james.jmap.servers.MemoryJmapServerModule;
import org.junit.Rule;
-import org.junit.rules.TemporaryFolder;
public class MemorySetMessagesMethodTest extends SetMessagesMethodTest {
@Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
@Override
protected JmapJamesServer createJmapServer() {
- return new JmapJamesServer()
- .combineWith(MemoryJamesServerMain.inMemoryServerModule)
- .overrideWith(new MemoryJmapServerModule(temporaryFolder));
+ return memoryJmap.jmapServer();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/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 0c4f45f..bca1a90 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
@@ -20,22 +20,18 @@
package org.apache.james.jmap.memory;
import org.apache.james.JmapJamesServer;
-import org.apache.james.MemoryJamesServerMain;
+import org.apache.james.MemoryJmapTestRule;
import org.apache.james.jmap.methods.integration.SetVacationResponseTest;
-import org.apache.james.jmap.servers.MemoryJmapServerModule;
import org.junit.Rule;
-import org.junit.rules.TemporaryFolder;
public class MemorySetVacationResponseMethodTest extends SetVacationResponseTest {
-
+
@Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
@Override
protected JmapJamesServer createJmapServer() {
- return new JmapJamesServer()
- .combineWith(MemoryJamesServerMain.inMemoryServerModule)
- .overrideWith(new MemoryJmapServerModule(temporaryFolder));
+ return memoryJmap.jmapServer();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/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 42750e3..df5b1f7 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
@@ -20,22 +20,18 @@
package org.apache.james.jmap.memory;
import org.apache.james.JmapJamesServer;
-import org.apache.james.MemoryJamesServerMain;
+import org.apache.james.MemoryJmapTestRule;
import org.apache.james.jmap.VacationIntegrationTest;
-import org.apache.james.jmap.servers.MemoryJmapServerModule;
import org.junit.Rule;
-import org.junit.rules.TemporaryFolder;
public class MemoryVacationIntegrationTest extends VacationIntegrationTest {
@Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
@Override
protected JmapJamesServer createJmapServer() {
- return new JmapJamesServer()
- .combineWith(MemoryJamesServerMain.inMemoryServerModule)
- .overrideWith(new MemoryJmapServerModule(temporaryFolder));
+ return memoryJmap.jmapServer();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a307690/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 cc6264a..baebd9c 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,11 +28,8 @@ import static org.hamcrest.Matchers.is;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.james.CassandraJamesServerMain;
+import org.apache.james.CassandraJmapTestRule;
import org.apache.james.JmapJamesServer;
-import org.apache.james.backends.cassandra.EmbeddedCassandra;
-import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
-import org.apache.james.modules.CassandraJmapServerModule;
import org.apache.james.webadmin.routes.DomainRoutes;
import org.apache.james.webadmin.routes.UserMailboxesRoutes;
import org.apache.james.webadmin.routes.UserRoutes;
@@ -40,8 +37,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TemporaryFolder;
import com.google.common.base.Charsets;
import com.jayway.restassured.RestAssured;
@@ -57,23 +52,15 @@ public class WebAdminServerIntegrationTest {
public static final String MAILBOX = "mailbox";
public static final String SPECIFIC_MAILBOX = SPECIFIC_USER + SEPARATOR + UserMailboxesRoutes.MAILBOXES + SEPARATOR + MAILBOX;
- private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
- private EmbeddedCassandra cassandra = EmbeddedCassandra.createStartServer();
-
@Rule
- public RuleChain chain = RuleChain
- .outerRule(temporaryFolder)
- .around(embeddedElasticSearch);
+ public CassandraJmapTestRule cassandraJmapTestRule = new CassandraJmapTestRule();
private JmapJamesServer guiceJamesServer;
@Before
public void setUp() throws Exception {
- guiceJamesServer = new JmapJamesServer()
- .combineWith(CassandraJamesServerMain.cassandraServerModule)
- .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra),
- new WebAdminConfigurationModule());
+ guiceJamesServer = cassandraJmapTestRule.jmapServer()
+ .overrideWith(new WebAdminConfigurationModule());
guiceJamesServer.start();
RestAssured.requestSpecification = new RequestSpecBuilder()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org