Author: matthieu
Date: Fri Dec 11 12:36:06 2015
New Revision: 1719397
URL: http://svn.apache.org/viewvc?rev=1719397&view=rev
Log:
JAMES-1644 rework integration tests
Added:
james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/EmbeddedCassandra.java
- copied, changed from r1719396,
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMailboxesMethodTest.java
Modified:
james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/JmapServer.java
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapServer.java
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessageListMethodTest.java
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMailboxesMethodTest.java
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMessageListMethodTest.java
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMessagesMethodTest.java
Modified:
james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java?rev=1719397&r1=1719396&r2=1719397&view=diff
==============================================================================
---
james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
(original)
+++
james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
Fri Dec 11 12:36:06 2015
@@ -20,6 +20,9 @@ package org.apache.james.backends.cassan
import java.util.Optional;
+import javax.annotation.PreDestroy;
+import javax.inject.Inject;
+
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.init.CassandraTableManager;
import org.apache.james.backends.cassandra.init.CassandraTypesProvider;
@@ -27,7 +30,6 @@ import org.apache.james.backends.cassand
import
org.apache.james.backends.cassandra.init.ClusterWithKeyspaceCreatedFactory;
import
org.apache.james.backends.cassandra.init.SessionWithInitializedTablesFactory;
import org.apache.james.backends.cassandra.utils.FunctionRunnerWithRetry;
-import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
import com.datastax.driver.core.Cluster;
import com.datastax.driver.core.Session;
@@ -48,18 +50,16 @@ public final class CassandraCluster {
private CassandraTypesProvider typesProvider;
public static CassandraCluster create(CassandraModule module) throws
RuntimeException {
- return new CassandraCluster(module);
+ return new CassandraCluster(module,
EmbeddedCassandra.createStartServer());
}
- private CassandraCluster(CassandraModule module) throws RuntimeException {
+ @Inject
+ private CassandraCluster(CassandraModule module, EmbeddedCassandra
embeddedCassandra) throws RuntimeException {
this.module = module;
try {
- EmbeddedCassandraServerHelper.startEmbeddedCassandra(20000L);
-
- session = new FunctionRunnerWithRetry(MAX_RETRY)
-
.executeAndRetrieveObject(CassandraCluster.this::tryInitializeSession);
+ session = new
FunctionRunnerWithRetry(MAX_RETRY).executeAndRetrieveObject(CassandraCluster.this::tryInitializeSession);
typesProvider = new CassandraTypesProvider(module, session);
- } catch(Exception exception) {
+ } catch (Exception exception) {
Throwables.propagate(exception);
}
}
@@ -72,6 +72,7 @@ public final class CassandraCluster {
new CassandraTableManager(module, session).ensureAllTables();
}
+ @PreDestroy
public void clearAllTables() {
new CassandraTableManager(module, session).clearAllTables();
}
Copied:
james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/EmbeddedCassandra.java
(from r1719396,
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMailboxesMethodTest.java)
URL:
http://svn.apache.org/viewvc/james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/EmbeddedCassandra.java?p2=james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/EmbeddedCassandra.java&p1=james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMailboxesMethodTest.java&r1=1719396&r2=1719397&rev=1719397&view=diff
==============================================================================
---
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMailboxesMethodTest.java
(original)
+++
james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/EmbeddedCassandra.java
Fri Dec 11 12:36:06 2015
@@ -16,19 +16,30 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
+package org.apache.james.backends.cassandra;
-package org.apache.james.jmap.methods.cassandra;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
-import org.apache.james.jmap.JmapServer;
-import org.apache.james.jmap.cassandra.CassandraJmapServer;
-import org.apache.james.jmap.methods.GetMailboxesMethodTest;
-import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
-import org.junit.rules.TemporaryFolder;
-
-public class CassandraGetMailboxesMethodTest extends GetMailboxesMethodTest {
-
- @Override
- protected JmapServer jmapServer(TemporaryFolder temporaryFolder,
EmbeddedElasticSearch embeddedElasticSearch) {
- return new CassandraJmapServer(temporaryFolder, embeddedElasticSearch);
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.thrift.transport.TTransportException;
+import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
+
+import com.google.common.base.Throwables;
+
+public class EmbeddedCassandra {
+
+
+ public static EmbeddedCassandra createStartServer() {
+ return new EmbeddedCassandra();
+ }
+
+ private EmbeddedCassandra() {
+ try {
+
EmbeddedCassandraServerHelper.startEmbeddedCassandra(TimeUnit.SECONDS.toMillis(20));
+ } catch (ConfigurationException | TTransportException | IOException |
InterruptedException e) {
+ Throwables.propagate(e);
+ }
}
+
}
Modified:
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/JmapServer.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/JmapServer.java?rev=1719397&r1=1719396&r2=1719397&view=diff
==============================================================================
---
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/JmapServer.java
(original)
+++
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/JmapServer.java
Fri Dec 11 12:36:06 2015
@@ -24,9 +24,8 @@ import org.junit.rules.TestRule;
public interface JmapServer extends TestRule {
- void clean();
-
int getPort();
ExtendedServerProbe serverProbe();
+
}
Modified:
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapServer.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapServer.java?rev=1719397&r1=1719396&r2=1719397&view=diff
==============================================================================
---
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapServer.java
(original)
+++
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapServer.java
Fri Dec 11 12:36:06 2015
@@ -24,7 +24,7 @@ import javax.inject.Singleton;
import org.apache.james.CassandraJamesServer;
import org.apache.james.CassandraJamesServerMain;
import org.apache.james.backends.cassandra.CassandraCluster;
-import org.apache.james.backends.cassandra.components.CassandraModule;
+import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.JmapServer;
import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
import org.apache.james.modules.TestElasticSearchModule;
@@ -45,34 +45,33 @@ public class CassandraJmapServer impleme
private static final int LIMIT_TO_3_MESSAGES = 3;
private CassandraJamesServer server;
- private CassandraCluster cassandra;
private final Module module;
- public CassandraJmapServer(TemporaryFolder temporaryFolder,
EmbeddedElasticSearch embeddedElasticSearch) {
- this.module = createServerModule(temporaryFolder,
embeddedElasticSearch);
- }
+ public static Module defaultOverrideModule(TemporaryFolder
temporaryFolder, EmbeddedElasticSearch embeddedElasticSearch, EmbeddedCassandra
cassandra) {
+ return Modules.combine(new
TestElasticSearchModule(embeddedElasticSearch),
+ new TestFilesystemModule(temporaryFolder),
+ new TestJMAPServerModule(LIMIT_TO_3_MESSAGES),
+ new AbstractModule() {
- private Module createServerModule(TemporaryFolder temporaryFolder,
EmbeddedElasticSearch embeddedElasticSearch) {
- return Modules.override(CassandraJamesServerMain.defaultModule)
- .with(new TestElasticSearchModule(embeddedElasticSearch),
- new TestFilesystemModule(temporaryFolder),
- new TestJMAPServerModule(LIMIT_TO_3_MESSAGES),
- new AbstractModule() {
-
- @Override
- protected void configure() {
- }
-
- @Provides
- @Singleton
- com.datastax.driver.core.Session
provideSession(CassandraModule cassandraModule) {
- cassandra = CassandraCluster.create(cassandraModule);
- return cassandra.getConf();
- }
- });
+ @Override
+ protected void configure() {
+ bind(EmbeddedCassandra.class).toInstance(cassandra);
+ }
+
+ @Provides
+ @Singleton
+ com.datastax.driver.core.Session provideSession(CassandraCluster
initializedCassandra) {
+ return initializedCassandra.getConf();
+ }
+ });
}
+
+ public CassandraJmapServer(Module overrideModule) {
+ this.module =
Modules.override(CassandraJamesServerMain.defaultModule).with(overrideModule);
+ }
+
@Override
public Statement apply(Statement base, Description description) {
return new Statement() {
@@ -99,11 +98,6 @@ public class CassandraJmapServer impleme
}
@Override
- public void clean() {
- cassandra.clearAllTables();
- }
-
- @Override
public int getPort() {
return server.getJmapPort();
}
Modified:
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java?rev=1719397&r1=1719396&r2=1719397&view=diff
==============================================================================
---
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
(original)
+++
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
Fri Dec 11 12:36:06 2015
@@ -31,13 +31,13 @@ import java.util.Date;
import javax.mail.Flags;
+import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.JmapAuthentication;
import org.apache.james.jmap.JmapServer;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailbox.model.MailboxPath;
-import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -52,9 +52,10 @@ public abstract class GetMailboxesMethod
private TemporaryFolder temporaryFolder = new TemporaryFolder();
private EmbeddedElasticSearch embeddedElasticSearch = new
EmbeddedElasticSearch(temporaryFolder);
- private JmapServer jmapServer = jmapServer(temporaryFolder,
embeddedElasticSearch);
+ private EmbeddedCassandra cassandra =
EmbeddedCassandra.createStartServer();
+ private JmapServer jmapServer = jmapServer(temporaryFolder,
embeddedElasticSearch, cassandra);
- protected abstract JmapServer jmapServer(TemporaryFolder temporaryFolder,
EmbeddedElasticSearch embeddedElasticSearch);
+ protected abstract JmapServer jmapServer(TemporaryFolder temporaryFolder,
EmbeddedElasticSearch embeddedElasticSearch, EmbeddedCassandra cassandra);
@Rule
public RuleChain chain = RuleChain
@@ -77,11 +78,6 @@ public abstract class GetMailboxesMethod
accessToken = JmapAuthentication.authenticateJamesUser(username,
password);
}
- @After
- public void tearDown() {
- jmapServer.clean();
- }
-
@Test
public void
getMailboxesShouldErrorNotSupportedWhenRequestContainsNonNullAccountId() throws
Exception {
given()
Modified:
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessageListMethodTest.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessageListMethodTest.java?rev=1719397&r1=1719396&r2=1719397&view=diff
==============================================================================
---
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessageListMethodTest.java
(original)
+++
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessageListMethodTest.java
Fri Dec 11 12:36:06 2015
@@ -31,13 +31,13 @@ import java.util.Date;
import javax.mail.Flags;
+import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.JmapAuthentication;
import org.apache.james.jmap.JmapServer;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailbox.model.MailboxPath;
-import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
@@ -53,9 +53,10 @@ public abstract class GetMessageListMeth
private TemporaryFolder temporaryFolder = new TemporaryFolder();
private EmbeddedElasticSearch embeddedElasticSearch = new
EmbeddedElasticSearch(temporaryFolder);
- private JmapServer jmapServer = jmapServer(temporaryFolder,
embeddedElasticSearch);
+ private EmbeddedCassandra cassandra =
EmbeddedCassandra.createStartServer();
+ private JmapServer jmapServer = jmapServer(temporaryFolder,
embeddedElasticSearch, cassandra);
- protected abstract JmapServer jmapServer(TemporaryFolder temporaryFolder,
EmbeddedElasticSearch embeddedElasticSearch);
+ protected abstract JmapServer jmapServer(TemporaryFolder temporaryFolder,
EmbeddedElasticSearch embeddedElasticSearch, EmbeddedCassandra cassandra);
@Rule
public RuleChain chain = RuleChain
@@ -78,11 +79,6 @@ public abstract class GetMessageListMeth
accessToken = JmapAuthentication.authenticateJamesUser(username,
password);
}
- @After
- public void tearDown() {
- jmapServer.clean();
- }
-
@Test
public void
getMessageListShouldErrorInvalidArgumentsWhenRequestIsInvalid() throws
Exception {
given()
Modified:
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java?rev=1719397&r1=1719396&r2=1719397&view=diff
==============================================================================
---
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
(original)
+++
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
Fri Dec 11 12:36:06 2015
@@ -34,6 +34,7 @@ import java.util.Map;
import javax.mail.Flags;
+import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.JmapAuthentication;
import org.apache.james.jmap.JmapServer;
import org.apache.james.jmap.api.access.AccessToken;
@@ -41,7 +42,6 @@ import org.apache.james.mailbox.elastics
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailbox.model.MailboxPath;
import org.assertj.core.data.MapEntry;
-import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -61,9 +61,10 @@ public abstract class GetMessagesMethodT
private TemporaryFolder temporaryFolder = new TemporaryFolder();
private EmbeddedElasticSearch embeddedElasticSearch = new
EmbeddedElasticSearch(temporaryFolder);
- private JmapServer jmapServer = jmapServer(temporaryFolder,
embeddedElasticSearch);
+ private EmbeddedCassandra cassandra =
EmbeddedCassandra.createStartServer();
+ private JmapServer jmapServer = jmapServer(temporaryFolder,
embeddedElasticSearch, cassandra);
- protected abstract JmapServer jmapServer(TemporaryFolder temporaryFolder,
EmbeddedElasticSearch embeddedElasticSearch);
+ protected abstract JmapServer jmapServer(TemporaryFolder temporaryFolder,
EmbeddedElasticSearch embeddedElasticSearch, EmbeddedCassandra cassandra);
@Rule
public RuleChain chain = RuleChain
@@ -92,11 +93,6 @@ public abstract class GetMessagesMethodT
accessToken = JmapAuthentication.authenticateJamesUser(username,
password);
}
- @After
- public void tearDown() {
- jmapServer.clean();
- }
-
@Test
public void
getMessagesShouldErrorNotSupportedWhenRequestContainsNonNullAccountId() throws
Exception {
given()
Modified:
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMailboxesMethodTest.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMailboxesMethodTest.java?rev=1719397&r1=1719396&r2=1719397&view=diff
==============================================================================
---
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMailboxesMethodTest.java
(original)
+++
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMailboxesMethodTest.java
Fri Dec 11 12:36:06 2015
@@ -19,6 +19,7 @@
package org.apache.james.jmap.methods.cassandra;
+import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.JmapServer;
import org.apache.james.jmap.cassandra.CassandraJmapServer;
import org.apache.james.jmap.methods.GetMailboxesMethodTest;
@@ -28,7 +29,7 @@ import org.junit.rules.TemporaryFolder;
public class CassandraGetMailboxesMethodTest extends GetMailboxesMethodTest {
@Override
- protected JmapServer jmapServer(TemporaryFolder temporaryFolder,
EmbeddedElasticSearch embeddedElasticSearch) {
- return new CassandraJmapServer(temporaryFolder, embeddedElasticSearch);
+ protected JmapServer jmapServer(TemporaryFolder temporaryFolder,
EmbeddedElasticSearch embeddedElasticSearch, EmbeddedCassandra cassandra) {
+ return new
CassandraJmapServer(CassandraJmapServer.defaultOverrideModule(temporaryFolder,
embeddedElasticSearch, cassandra));
}
}
Modified:
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMessageListMethodTest.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMessageListMethodTest.java?rev=1719397&r1=1719396&r2=1719397&view=diff
==============================================================================
---
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMessageListMethodTest.java
(original)
+++
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMessageListMethodTest.java
Fri Dec 11 12:36:06 2015
@@ -19,6 +19,7 @@
package org.apache.james.jmap.methods.cassandra;
+import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.JmapServer;
import org.apache.james.jmap.cassandra.CassandraJmapServer;
import org.apache.james.jmap.methods.GetMessageListMethodTest;
@@ -28,7 +29,7 @@ import org.junit.rules.TemporaryFolder;
public class CassandraGetMessageListMethodTest extends
GetMessageListMethodTest {
@Override
- protected JmapServer jmapServer(TemporaryFolder temporaryFolder,
EmbeddedElasticSearch embeddedElasticSearch) {
- return new CassandraJmapServer(temporaryFolder, embeddedElasticSearch);
+ protected JmapServer jmapServer(TemporaryFolder temporaryFolder,
EmbeddedElasticSearch embeddedElasticSearch, EmbeddedCassandra cassandra) {
+ return new
CassandraJmapServer(CassandraJmapServer.defaultOverrideModule(temporaryFolder,
embeddedElasticSearch, cassandra));
}
}
Modified:
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMessagesMethodTest.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMessagesMethodTest.java?rev=1719397&r1=1719396&r2=1719397&view=diff
==============================================================================
---
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMessagesMethodTest.java
(original)
+++
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMessagesMethodTest.java
Fri Dec 11 12:36:06 2015
@@ -19,6 +19,7 @@
package org.apache.james.jmap.methods.cassandra;
+import org.apache.james.backends.cassandra.EmbeddedCassandra;
import org.apache.james.jmap.JmapServer;
import org.apache.james.jmap.cassandra.CassandraJmapServer;
import org.apache.james.jmap.methods.GetMessagesMethodTest;
@@ -28,7 +29,7 @@ import org.junit.rules.TemporaryFolder;
public class CassandraGetMessagesMethodTest extends GetMessagesMethodTest {
@Override
- protected JmapServer jmapServer(TemporaryFolder temporaryFolder,
EmbeddedElasticSearch embeddedElasticSearch) {
- return new CassandraJmapServer(temporaryFolder, embeddedElasticSearch);
+ protected JmapServer jmapServer(TemporaryFolder temporaryFolder,
EmbeddedElasticSearch embeddedElasticSearch, EmbeddedCassandra cassandra) {
+ return new
CassandraJmapServer(CassandraJmapServer.defaultOverrideModule(temporaryFolder,
embeddedElasticSearch, cassandra));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
