http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxAnnotation.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxAnnotation.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxAnnotation.java index 1072e24..0bec8c3 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxAnnotation.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxAnnotation.java @@ -19,22 +19,27 @@ package org.apache.james.mpt.imapmailbox.cassandra; +import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.mpt.api.ImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.MailboxAnnotation; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import com.google.inject.Guice; import com.google.inject.Injector; public class CassandraMailboxAnnotation extends MailboxAnnotation { - private ImapHostSystem system; + @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); + private ImapHostSystem system; + @Before public void setUp() throws Exception { - Injector injector = Guice.createInjector(new CassandraMailboxTestModule()); + Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort())); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); }
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxTestModule.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxTestModule.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxTestModule.java index 1133302..d22246b 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxTestModule.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxTestModule.java @@ -30,6 +30,14 @@ import com.google.inject.Singleton; public class CassandraMailboxTestModule extends AbstractModule { + private final String cassandraHost; + private final int cassandraPort; + + public CassandraMailboxTestModule(String cassandraHost, int cassandraPort) { + this.cassandraHost = cassandraHost; + this.cassandraPort = cassandraPort; + } + @Override protected void configure() { bind(HostSystem.class).to(JamesImapHostSystem.class); @@ -39,6 +47,6 @@ public class CassandraMailboxTestModule extends AbstractModule { @Provides @Singleton public JamesImapHostSystem provideHostSystem() throws Exception { - return new CassandraHostSystem(); + return new CassandraHostSystem(cassandraHost, cassandraPort); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxWithLongNameError.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxWithLongNameError.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxWithLongNameError.java index 920f422..189118b 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxWithLongNameError.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxWithLongNameError.java @@ -19,22 +19,27 @@ package org.apache.james.mpt.imapmailbox.cassandra; +import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.mpt.api.ImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.MailboxWithLongNameError; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import com.google.inject.Guice; import com.google.inject.Injector; public class CassandraMailboxWithLongNameError extends MailboxWithLongNameError { - private ImapHostSystem system; + @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); + private ImapHostSystem system; + @Before public void setUp() throws Exception { - Injector injector = Guice.createInjector(new CassandraMailboxTestModule()); + Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort())); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMove.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMove.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMove.java index 178af1f..c2691f5 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMove.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMove.java @@ -19,22 +19,27 @@ package org.apache.james.mpt.imapmailbox.cassandra; +import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.mpt.api.ImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.Move; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import com.google.inject.Guice; import com.google.inject.Injector; public class CassandraMove extends Move { - private ImapHostSystem system; + @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); + private ImapHostSystem system; + @Before public void setUp() throws Exception { - Injector injector = Guice.createInjector(new CassandraMailboxTestModule()); + Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort())); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraNonAuthenticatedState.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraNonAuthenticatedState.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraNonAuthenticatedState.java index 24760b4..3338b00 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraNonAuthenticatedState.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraNonAuthenticatedState.java @@ -19,22 +19,27 @@ package org.apache.james.mpt.imapmailbox.cassandra; +import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.mpt.api.ImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.NonAuthenticatedState; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import com.google.inject.Guice; import com.google.inject.Injector; public class CassandraNonAuthenticatedState extends NonAuthenticatedState { - private ImapHostSystem system; + @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); + private ImapHostSystem system; + @Before public void setUp() throws Exception { - Injector injector = Guice.createInjector(new CassandraMailboxTestModule()); + Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort())); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraPartialFetch.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraPartialFetch.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraPartialFetch.java index 3f9d163..ef45eff 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraPartialFetch.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraPartialFetch.java @@ -19,22 +19,27 @@ package org.apache.james.mpt.imapmailbox.cassandra; +import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.mpt.api.ImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.PartialFetch; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import com.google.inject.Guice; import com.google.inject.Injector; public class CassandraPartialFetch extends PartialFetch { - private ImapHostSystem system; + @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); + private ImapHostSystem system; + @Before public void setUp() throws Exception { - Injector injector = Guice.createInjector(new CassandraMailboxTestModule()); + Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort())); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java index 8957a7b..759a484 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java @@ -19,22 +19,27 @@ package org.apache.james.mpt.imapmailbox.cassandra; +import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.mpt.api.ImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.QuotaTest; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import com.google.inject.Guice; import com.google.inject.Injector; public class CassandraQuotaTest extends QuotaTest { - private ImapHostSystem system; + @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); + private ImapHostSystem system; + @Before public void setUp() throws Exception { - Injector injector = Guice.createInjector(new CassandraMailboxTestModule()); + Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort())); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraRename.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraRename.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraRename.java index 00459aa..b7b5746 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraRename.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraRename.java @@ -19,22 +19,27 @@ package org.apache.james.mpt.imapmailbox.cassandra; +import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.mpt.api.ImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.Rename; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import com.google.inject.Guice; import com.google.inject.Injector; public class CassandraRename extends Rename { - private ImapHostSystem system; + @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); + private ImapHostSystem system; + @Before public void setUp() throws Exception { - Injector injector = Guice.createInjector(new CassandraMailboxTestModule()); + Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort())); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSearch.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSearch.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSearch.java index cbfa080..e40b985 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSearch.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSearch.java @@ -19,22 +19,27 @@ package org.apache.james.mpt.imapmailbox.cassandra; +import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.mpt.api.ImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.Search; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import com.google.inject.Guice; import com.google.inject.Injector; public class CassandraSearch extends Search { - private ImapHostSystem system; + @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); + private ImapHostSystem system; + @Before public void setUp() throws Exception { - Injector injector = Guice.createInjector(new CassandraMailboxTestModule()); + Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort())); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSecurity.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSecurity.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSecurity.java index f647f36..ea10c9a 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSecurity.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSecurity.java @@ -19,22 +19,27 @@ package org.apache.james.mpt.imapmailbox.cassandra; +import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.mpt.api.ImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.Security; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import com.google.inject.Guice; import com.google.inject.Injector; public class CassandraSecurity extends Security { - private ImapHostSystem system; + @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); + private ImapHostSystem system; + @Before public void setUp() throws Exception { - Injector injector = Guice.createInjector(new CassandraMailboxTestModule()); + Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort())); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelect.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelect.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelect.java index 0563e8e..2e6e95e 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelect.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelect.java @@ -19,22 +19,27 @@ package org.apache.james.mpt.imapmailbox.cassandra; +import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.mpt.api.ImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.Select; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import com.google.inject.Guice; import com.google.inject.Injector; public class CassandraSelect extends Select { - private ImapHostSystem system; + @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); + private ImapHostSystem system; + @Before public void setUp() throws Exception { - Injector injector = Guice.createInjector(new CassandraMailboxTestModule()); + Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort())); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectedInbox.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectedInbox.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectedInbox.java index ab53bbf..97b251b 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectedInbox.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectedInbox.java @@ -19,22 +19,27 @@ package org.apache.james.mpt.imapmailbox.cassandra; +import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.mpt.api.ImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.SelectedInbox; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import com.google.inject.Guice; import com.google.inject.Injector; public class CassandraSelectedInbox extends SelectedInbox { - private ImapHostSystem system; + @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); + private ImapHostSystem system; + @Before public void setUp() throws Exception { - Injector injector = Guice.createInjector(new CassandraMailboxTestModule()); + Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort())); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectedState.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectedState.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectedState.java index 5d31780..7b30c55 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectedState.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectedState.java @@ -19,22 +19,27 @@ package org.apache.james.mpt.imapmailbox.cassandra; +import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.mpt.api.ImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.SelectedState; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import com.google.inject.Guice; import com.google.inject.Injector; public class CassandraSelectedState extends SelectedState { - private ImapHostSystem system; + @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); + private ImapHostSystem system; + @Before public void setUp() throws Exception { - Injector injector = Guice.createInjector(new CassandraMailboxTestModule()); + Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort())); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUidSearch.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUidSearch.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUidSearch.java index a6a9887..f97610c 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUidSearch.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUidSearch.java @@ -19,22 +19,27 @@ package org.apache.james.mpt.imapmailbox.cassandra; +import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.mpt.api.ImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.UidSearch; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import com.google.inject.Guice; import com.google.inject.Injector; public class CassandraUidSearch extends UidSearch { - private ImapHostSystem system; + @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); + private ImapHostSystem system; + @Before public void setUp() throws Exception { - Injector injector = Guice.createInjector(new CassandraMailboxTestModule()); + Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort())); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUidSearchOnIndex.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUidSearchOnIndex.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUidSearchOnIndex.java index e35abfe..92afdbe 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUidSearchOnIndex.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUidSearchOnIndex.java @@ -19,22 +19,27 @@ package org.apache.james.mpt.imapmailbox.cassandra; +import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.mpt.api.ImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.UidSearchOnIndex; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import com.google.inject.Guice; import com.google.inject.Injector; public class CassandraUidSearchOnIndex extends UidSearchOnIndex { - private ImapHostSystem system; + @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); + private ImapHostSystem system; + @Before public void setUp() throws Exception { - Injector injector = Guice.createInjector(new CassandraMailboxTestModule()); + Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort())); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUserFlagsSupport.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUserFlagsSupport.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUserFlagsSupport.java index 2087953..c55ceb9 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUserFlagsSupport.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUserFlagsSupport.java @@ -19,22 +19,27 @@ package org.apache.james.mpt.imapmailbox.cassandra; +import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.mpt.api.ImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.UserFlagsSupport; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import com.google.inject.Guice; import com.google.inject.Injector; public class CassandraUserFlagsSupport extends UserFlagsSupport { - private ImapHostSystem system; + @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); + private ImapHostSystem system; + @Before public void setUp() throws Exception { - Injector injector = Guice.createInjector(new CassandraMailboxTestModule()); + Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort())); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java index 0ca4992..2f47b9c 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java @@ -82,12 +82,7 @@ public class CassandraHostSystem extends JamesImapHostSystem { Feature.QUOTA_SUPPORT, Feature.ANNOTATION_SUPPORT); - private final CassandraMailboxManager mailboxManager; - private final CassandraCluster cassandra; - private final CassandraPerUserMaxQuotaManager perUserMaxQuotaManager; - - public CassandraHostSystem() throws Exception { - CassandraModule mailboxModule = new CassandraModuleComposite( + private final CassandraModule mailboxModule = new CassandraModuleComposite( new CassandraAclModule(), new CassandraMailboxModule(), new CassandraMessageModule(), @@ -103,7 +98,22 @@ public class CassandraHostSystem extends JamesImapHostSystem { new CassandraAttachmentModule(), new CassandraAnnotationModule(), new CassandraApplicableFlagsModule()); - cassandra = CassandraCluster.create(mailboxModule); + + private final String cassandraHost; + private final int cassandraPort; + private CassandraMailboxManager mailboxManager; + private CassandraCluster cassandra; + private CassandraPerUserMaxQuotaManager perUserMaxQuotaManager; + + public CassandraHostSystem(String cassandraHost, int cassandraPort) { + this.cassandraHost = cassandraHost; + this.cassandraPort = cassandraPort; + } + + @Override + public void beforeTest() throws Exception { + super.beforeTest(); + cassandra = CassandraCluster.create(mailboxModule, cassandraHost, cassandraPort); com.datastax.driver.core.Session session = cassandra.getConf(); CassandraModSeqProvider modSeqProvider = new CassandraModSeqProvider(session); CassandraUidProvider uidProvider = new CassandraUidProvider(session); @@ -158,7 +168,6 @@ public class CassandraHostSystem extends JamesImapHostSystem { configure(new DefaultImapDecoderFactory().buildImapDecoder(), new DefaultImapEncoderFactory().buildImapEncoder(), DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, subscriptionManager, quotaManager, quotaRootResolver, new DefaultMetricFactory())); - cassandra.ensureAllTables(); } @Override @@ -168,11 +177,6 @@ public class CassandraHostSystem extends JamesImapHostSystem { } @Override - protected void resetData() throws Exception { - cassandra.clearAllTables(); - } - - @Override protected void finalize() throws Throwable { super.finalize(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java index bb1539f..d1bc8af 100644 --- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java +++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java @@ -19,9 +19,6 @@ package org.apache.james.mpt.host; -import java.util.HashSet; -import java.util.Set; - import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.commons.configuration.plist.PropertyListConfiguration; @@ -32,7 +29,6 @@ import org.apache.james.imap.api.process.ImapProcessor; import org.apache.james.imap.decode.ImapDecoder; import org.apache.james.imap.decode.main.ImapRequestStreamHandler; import org.apache.james.imap.encode.ImapEncoder; -import org.apache.james.mailbox.MailboxSession.User; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.store.Authenticator; import org.apache.james.mailbox.store.Authorizator; @@ -47,18 +43,17 @@ import com.google.common.base.Throwables; public abstract class JamesImapHostSystem implements ImapHostSystem { - private final MemoryUsersRepository memoryUsersRepository; - private final Set<User> users; - protected final Authorizator authorizator; - protected final Authenticator authenticator; + private MemoryUsersRepository memoryUsersRepository; + protected Authorizator authorizator; + protected Authenticator authenticator; private ImapDecoder decoder; private ImapEncoder encoder; private ImapProcessor processor; - public JamesImapHostSystem() { - super(); - users = new HashSet<>(); + + @Override + public void beforeTest() throws Exception { memoryUsersRepository = MemoryUsersRepository.withoutVirtualHosting(); try { memoryUsersRepository.configure(userRepositoryConfiguration()); @@ -68,6 +63,11 @@ public abstract class JamesImapHostSystem implements ImapHostSystem { authenticator = new UserRepositoryAuthenticator(memoryUsersRepository); authorizator = new UserRepositoryAuthorizator(memoryUsersRepository); } + + @Override + public void afterTest() throws Exception { + } + public void configure(ImapDecoder decoder, ImapEncoder encoder, final ImapProcessor processor) { @@ -86,18 +86,7 @@ public abstract class JamesImapHostSystem implements ImapHostSystem { throws Exception { return new Session(continuation); } - - public void beforeTest() throws Exception { - } - - public void afterTest() throws Exception { - users.clear(); - memoryUsersRepository.clear(); - resetData(); - } - protected abstract void resetData() throws Exception; - public abstract void createMailbox(MailboxPath mailboxPath) throws Exception; class Session implements org.apache.james.mpt.api.Session { @@ -146,14 +135,6 @@ public abstract class JamesImapHostSystem implements ImapHostSystem { } - public void afterTests() throws Exception { - // default do nothing - } - - public void beforeTests() throws Exception { - // default do nothing - } - private HierarchicalConfiguration userRepositoryConfiguration() { PropertyListConfiguration configuration = new PropertyListConfiguration(); configuration.addProperty("administratorId", "imapuser"); http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/UidSearchOnIndex.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/UidSearchOnIndex.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/UidSearchOnIndex.java index 231768d..3f19ad0 100644 --- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/UidSearchOnIndex.java +++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/UidSearchOnIndex.java @@ -25,7 +25,6 @@ import org.apache.james.mpt.api.ImapHostSystem; import org.apache.james.mpt.imapmailbox.ImapTestConstants; import org.apache.james.mpt.imapmailbox.suite.base.BasicImapCommands; import org.apache.james.mpt.script.SimpleScriptedTestProtocol; -import org.junit.Before; import org.junit.Test; public abstract class UidSearchOnIndex implements ImapTestConstants { @@ -35,7 +34,6 @@ public abstract class UidSearchOnIndex implements ImapTestConstants { private ImapHostSystem system; private SimpleScriptedTestProtocol simpleScriptedTestProtocol; - @Before public void setUp() throws Exception { system = createImapHostSystem(); simpleScriptedTestProtocol = new SimpleScriptedTestProtocol("/org/apache/james/imap/scripts/", system) http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/CreateErrorWithLongName.test ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/CreateErrorWithLongName.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/CreateErrorWithLongName.test index 995fc8e..53b9af6 100644 --- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/CreateErrorWithLongName.test +++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/CreateErrorWithLongName.test @@ -547,7 +547,7 @@ C: bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb C: bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb C: bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb C: bbbbbbbbbbbbbbbbbbbbbbbba -S: A2 NO DELETE failed. No such mailbox. +S: A2 BAD DELETE too long mailbox name. Illegal arguments. C: A3 CREATE newmailbox http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java index c69c075..288ca22 100644 --- a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java +++ b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java @@ -80,6 +80,7 @@ public class ElasticSearchHostSystem extends JamesImapHostSystem { @Override public void beforeTest() throws Exception { + super.beforeTest(); this.tempDirectory = Files.createTempDirectory("elasticsearch"); this.embeddedElasticSearch = new EmbeddedElasticSearch(tempDirectory, MailboxElasticsearchConstants.MAILBOX_INDEX); embeddedElasticSearch.before(); @@ -92,11 +93,6 @@ public class ElasticSearchHostSystem extends JamesImapHostSystem { FileUtils.deleteDirectory(tempDirectory.toFile()); } - @Override - protected void resetData() throws Exception { - - } - private void initFields() { Client client = NodeMappingFactory.applyMapping( IndexCreationFactory.createIndex(new TestingClientProvider(embeddedElasticSearch.getNode()).get(), MailboxElasticsearchConstants.MAILBOX_INDEX), http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java index 787b1ea..c83847d 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java @@ -35,6 +35,7 @@ public class HBaseAuthenticatePlain extends AuthenticatePlain { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java index fafa024..f110e2d 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java @@ -35,6 +35,7 @@ public class HBaseAuthenticatedState extends AuthenticatedState { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java index a2636fe..f518653 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java @@ -35,6 +35,7 @@ public class HBaseConcurrentSessions extends ConcurrentSessions { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java index ae11769..779b414 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java @@ -35,6 +35,7 @@ public class HBaseCondstore extends Condstore { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(JamesImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java index 90bcf7b..44235e8 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java @@ -35,6 +35,7 @@ public class HBaseCopy extends Copy { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java index 104b81a..2f86772 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java @@ -35,6 +35,7 @@ public class HBaseEvents extends Events { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java index 2c4cb4b..548aff5 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java @@ -35,6 +35,7 @@ public class HBaseExpunge extends Expunge { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java index 7d6d099..8b37745 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java @@ -35,6 +35,7 @@ public class HBaseFetch extends Fetch { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java index 566c69e..e36560c 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java @@ -35,6 +35,7 @@ public class HBaseFetchBodySection extends FetchBodySection { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java index deb92ff..a8b7a8f 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java @@ -35,6 +35,7 @@ public class HBaseFetchBodyStructure extends FetchBodyStructure { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java index 4977bf9..9887b71 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java @@ -35,6 +35,7 @@ public class HBaseFetchHeaders extends FetchHeaders { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java index 6cd7456..a736e70 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java @@ -35,6 +35,7 @@ public class HBaseListing extends Listing { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java index 9114f55..3b4694b 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java @@ -35,6 +35,7 @@ public class HBaseMailboxAnnotation extends MailboxAnnotation { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java index ce545e7..d933565 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java @@ -35,6 +35,7 @@ public class HBaseMailboxWithLongNameError extends MailboxWithLongNameError { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java index 6074a99..2e065b4 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java @@ -35,6 +35,7 @@ public class HBaseNonAuthenticatedState extends NonAuthenticatedState { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java index bab9cfb..6221b57 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java @@ -35,6 +35,7 @@ public class HBasePartialFetch extends PartialFetch { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java index 776082d..a8a1b57 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java @@ -35,6 +35,7 @@ public class HBaseQuotaTest extends QuotaTest { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java index a8cb517..bf38dba 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java @@ -35,6 +35,7 @@ public class HBaseRename extends Rename { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java index fc417f8..8ee268e 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java @@ -35,6 +35,7 @@ public class HBaseSearch extends Search { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java index ff2148a..ba629e9 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java @@ -35,6 +35,7 @@ public class HBaseSecurity extends Security { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java index a4977da..e79181a 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java @@ -35,6 +35,7 @@ public class HBaseSelect extends Select { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java index 56408d9..efbe37f 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java @@ -35,6 +35,7 @@ public class HBaseSelectedInbox extends SelectedInbox { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedState.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedState.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedState.java index 600e60e..760ce66 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedState.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedState.java @@ -35,6 +35,7 @@ public class HBaseSelectedState extends SelectedState { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearch.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearch.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearch.java index ec4b4df..f04bdc3 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearch.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearch.java @@ -35,6 +35,7 @@ public class HBaseUidSearch extends UidSearch { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearchOnIndex.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearchOnIndex.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearchOnIndex.java index 3211f4a..c51ded0 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearchOnIndex.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearchOnIndex.java @@ -35,6 +35,7 @@ public class HBaseUidSearchOnIndex extends UidSearchOnIndex { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUserFlagsSupport.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUserFlagsSupport.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUserFlagsSupport.java index 2082fca..0c7ef3e 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUserFlagsSupport.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUserFlagsSupport.java @@ -35,6 +35,7 @@ public class HBaseUserFlagsSupport extends UserFlagsSupport { public void setUp() throws Exception { Injector injector = Guice.createInjector(new HBaseMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java index 67cf8fe..557d609 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java @@ -46,7 +46,7 @@ import org.apache.james.mailbox.store.mail.model.DefaultMessageId; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.apache.james.mailbox.store.quota.DefaultQuotaRootResolver; import org.apache.james.mailbox.store.quota.NoQuotaManager; -import org.apache.james.metrics.logger.DefaultMetricFactory; +import org.apache.james.metrics.api.NoopMetricFactory; import org.apache.james.mpt.api.ImapFeatures; import org.apache.james.mpt.api.ImapFeatures.Feature; import org.apache.james.mpt.host.JamesImapHostSystem; @@ -63,10 +63,10 @@ public class HBaseHostSystem extends JamesImapHostSystem { * cluster on the classpath. */ public static Boolean useMiniCluster = true; - - private final HBaseMailboxManager mailboxManager; + private MiniHBaseCluster hbaseCluster; private final Configuration conf; + private HBaseMailboxManager mailboxManager; public static synchronized JamesImapHostSystem build() throws Exception { if (host == null) { @@ -88,7 +88,12 @@ public class HBaseHostSystem extends JamesImapHostSystem { } else { conf = HBaseConfiguration.create(); } + } + + @Override + public void beforeTest() throws Exception { + super.beforeTest(); final HBaseModSeqProvider modSeqProvider = new HBaseModSeqProvider(conf); final HBaseUidProvider uidProvider = new HBaseUidProvider(conf); DefaultMessageId.Factory messageIdFactory = new DefaultMessageId.Factory(); @@ -110,7 +115,7 @@ public class HBaseHostSystem extends JamesImapHostSystem { subscriptionManager, new NoQuotaManager(), new DefaultQuotaRootResolver(mapperFactory), - new DefaultMetricFactory()); + new NoopMetricFactory()); resetUserMetaData(); @@ -118,15 +123,17 @@ public class HBaseHostSystem extends JamesImapHostSystem { new DefaultImapEncoderFactory().buildImapEncoder(), defaultImapProcessorFactory); } - @Override - protected void resetData() throws Exception { + public void afterTest() throws Exception { + super.afterTest(); resetUserMetaData(); - MailboxSession session = mailboxManager.createSystemSession("test"); - mailboxManager.startProcessingRequest(session); - mailboxManager.deleteEverything(session); - mailboxManager.endProcessingRequest(session); - mailboxManager.logout(session, false); + if (mailboxManager != null) { + MailboxSession session = mailboxManager.createSystemSession("test"); + mailboxManager.startProcessingRequest(session); + mailboxManager.deleteEverything(session); + mailboxManager.endProcessingRequest(session); + mailboxManager.logout(session, false); + } } public final void resetUserMetaData() throws Exception { http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/hbase/src/test/resources/logback-test.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/resources/logback-test.xml b/mpt/impl/imap-mailbox/hbase/src/test/resources/logback-test.xml new file mode 100644 index 0000000..bc84c7b --- /dev/null +++ b/mpt/impl/imap-mailbox/hbase/src/test/resources/logback-test.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<configuration> + + <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"> + <resetJUL>true</resetJUL> + </contextListener> + + <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> + <encoder> + <pattern>%d{HH:mm:ss.SSS} [%-5level] %logger{15} - %msg%n%rEx</pattern> + <immediateFlush>false</immediateFlush> + </encoder> + </appender> + + <root level="WARN"> + <appender-ref ref="CONSOLE" /> + </root> + + <logger name="org.apache.james" level="DEBUG" /> + + +</configuration> http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatePlain.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatePlain.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatePlain.java index ad0ab04..03d2f72 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatePlain.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatePlain.java @@ -35,6 +35,7 @@ public class InMemoryAuthenticatePlain extends AuthenticatePlain { public void setUp() throws Exception { Injector injector = Guice.createInjector(new InMemoryMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatedState.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatedState.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatedState.java index dd341ea..b21a04a 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatedState.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatedState.java @@ -35,6 +35,7 @@ public class InMemoryAuthenticatedState extends AuthenticatedState { public void setUp() throws Exception { Injector injector = Guice.createInjector(new InMemoryMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryConcurrentSessions.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryConcurrentSessions.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryConcurrentSessions.java index be80e09..2185441 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryConcurrentSessions.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryConcurrentSessions.java @@ -35,6 +35,7 @@ public class InMemoryConcurrentSessions extends ConcurrentSessions { public void setUp() throws Exception { Injector injector = Guice.createInjector(new InMemoryMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCondstore.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCondstore.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCondstore.java index a293e10..3df824a 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCondstore.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCondstore.java @@ -35,6 +35,7 @@ public class InMemoryCondstore extends Condstore { public void setUp() throws Exception { Injector injector = Guice.createInjector(new InMemoryMailboxTestModule()); system = injector.getInstance(JamesImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCopy.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCopy.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCopy.java index 218423b..8113480 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCopy.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCopy.java @@ -35,6 +35,7 @@ public class InMemoryCopy extends Copy { public void setUp() throws Exception { Injector injector = Guice.createInjector(new InMemoryMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryEvents.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryEvents.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryEvents.java index 9f43f9c..f1ddc35 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryEvents.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryEvents.java @@ -35,6 +35,7 @@ public class InMemoryEvents extends Events { public void setUp() throws Exception { Injector injector = Guice.createInjector(new InMemoryMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryExpunge.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryExpunge.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryExpunge.java index 2c11bad..5834830 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryExpunge.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryExpunge.java @@ -35,6 +35,7 @@ public class InMemoryExpunge extends Expunge { public void setUp() throws Exception { Injector injector = Guice.createInjector(new InMemoryMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetch.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetch.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetch.java index b3c8c5a..a71c163 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetch.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetch.java @@ -35,6 +35,7 @@ public class InMemoryFetch extends Fetch { public void setUp() throws Exception { Injector injector = Guice.createInjector(new InMemoryMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodySection.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodySection.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodySection.java index c2e1b8d..0862752 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodySection.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodySection.java @@ -35,6 +35,7 @@ public class InMemoryFetchBodySection extends FetchBodySection { public void setUp() throws Exception { Injector injector = Guice.createInjector(new InMemoryMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodyStructure.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodyStructure.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodyStructure.java index 5a51101..61051cc 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodyStructure.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodyStructure.java @@ -35,6 +35,7 @@ public class InMemoryFetchBodyStructure extends FetchBodyStructure { public void setUp() throws Exception { Injector injector = Guice.createInjector(new InMemoryMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchHeaders.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchHeaders.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchHeaders.java index c66d684..c9209eb 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchHeaders.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchHeaders.java @@ -35,6 +35,7 @@ public class InMemoryFetchHeaders extends FetchHeaders { public void setUp() throws Exception { Injector injector = Guice.createInjector(new InMemoryMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryListing.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryListing.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryListing.java index 18845ab..b77315d 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryListing.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryListing.java @@ -35,6 +35,7 @@ public class InMemoryListing extends Listing { public void setUp() throws Exception { Injector injector = Guice.createInjector(new InMemoryMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxAnnotation.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxAnnotation.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxAnnotation.java index c6833ca..7235fb2 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxAnnotation.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxAnnotation.java @@ -35,6 +35,7 @@ public class InMemoryMailboxAnnotation extends MailboxAnnotation { public void setUp() throws Exception { Injector injector = Guice.createInjector(new InMemoryMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxWithLongNameSuccess.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxWithLongNameSuccess.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxWithLongNameSuccess.java index cd56144..29dce81 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxWithLongNameSuccess.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxWithLongNameSuccess.java @@ -35,6 +35,7 @@ public class InMemoryMailboxWithLongNameSuccess extends MailboxWithLongNameSucce public void setUp() throws Exception { Injector injector = Guice.createInjector(new InMemoryMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMove.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMove.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMove.java index 56afcdd..aa834f4 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMove.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMove.java @@ -35,6 +35,7 @@ public class InMemoryMove extends Move { public void setUp() throws Exception { Injector injector = Guice.createInjector(new InMemoryMailboxTestModule()); system = injector.getInstance(ImapHostSystem.class); + system.beforeTest(); super.setUp(); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org