MPT-39 Re-enable CONDSTORE related tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6a23a1b2 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6a23a1b2 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6a23a1b2 Branch: refs/heads/master Commit: 6a23a1b2519b2e8abfdf00e5d711933888a680f4 Parents: 78cf06a Author: benwa <btell...@linagora.com> Authored: Fri Jun 23 10:21:00 2017 +0700 Committer: Matthieu Baechler <matth...@apache.org> Committed: Thu Jul 6 10:32:17 2017 -0400 ---------------------------------------------------------------------- .../james/mpt/imapmailbox/cassandra/CassandraCondstore.java | 2 -- .../mpt/imapmailbox/cassandra/CassandraMailboxTestModule.java | 6 ++++-- .../java/org/apache/james/mpt/imapmailbox/suite/Condstore.java | 2 +- .../org/apache/james/imap/scripts/CondstoreDisable.test | 3 ++- .../org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java | 2 -- .../james/mpt/imapmailbox/hbase/HBaseMailboxTestModule.java | 6 ++++-- .../james/mpt/imapmailbox/inmemory/InMemoryCondstore.java | 2 -- .../org/apache/james/mpt/imapmailbox/jpa/JpaCondstore.java | 2 -- .../apache/james/mpt/imapmailbox/jpa/JpaMailboxTestModule.java | 4 +++- .../james/mpt/imapmailbox/lucenesearch/LuceneCondstore.java | 2 -- .../lucenesearch/LuceneSearchMailboxTestModule.java | 6 ++++-- .../apache/james/mpt/imapmailbox/maildir/MaildirCondstore.java | 2 -- .../mpt/imapmailbox/maildir/MaildirMailboxTestModule.java | 6 ++++-- 13 files changed, 22 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/6a23a1b2/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCondstore.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCondstore.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCondstore.java index 6e59ec6..5fb4727 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCondstore.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCondstore.java @@ -4,12 +4,10 @@ import org.apache.james.mpt.host.JamesImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.Condstore; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import com.google.inject.Guice; import com.google.inject.Injector; -@Ignore("why it was no enabled on cassandra ?") public class CassandraCondstore extends Condstore { private JamesImapHostSystem system; http://git-wip-us.apache.org/repos/asf/james-project/blob/6a23a1b2/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 516de6d..1133302 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 @@ -21,6 +21,7 @@ package org.apache.james.mpt.imapmailbox.cassandra; import org.apache.james.mpt.api.HostSystem; import org.apache.james.mpt.api.ImapHostSystem; +import org.apache.james.mpt.host.JamesImapHostSystem; import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystem; import com.google.inject.AbstractModule; @@ -31,12 +32,13 @@ public class CassandraMailboxTestModule extends AbstractModule { @Override protected void configure() { - bind(HostSystem.class).to(ImapHostSystem.class); + bind(HostSystem.class).to(JamesImapHostSystem.class); + bind(ImapHostSystem.class).to(JamesImapHostSystem.class); } @Provides @Singleton - public ImapHostSystem provideHostSystem() throws Exception { + public JamesImapHostSystem provideHostSystem() throws Exception { return new CassandraHostSystem(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/6a23a1b2/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/Condstore.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/Condstore.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/Condstore.java index 8ae9864..106e7f2 100644 --- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/Condstore.java +++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/Condstore.java @@ -40,7 +40,7 @@ public abstract class Condstore implements ImapTestConstants { public void setUp() throws Exception { system = createJamesImapHostSystem(); simpleScriptedTestProtocol = new SimpleScriptedTestProtocol("/org/apache/james/imap/scripts/", system) - .withUser(TO_ADDRESS, PASSWORD) + .withUser(USER, PASSWORD) .withLocale(Locale.US); BasicImapCommands.welcome(simpleScriptedTestProtocol); BasicImapCommands.authenticate(simpleScriptedTestProtocol); http://git-wip-us.apache.org/repos/asf/james-project/blob/6a23a1b2/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/CondstoreDisable.test ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/CondstoreDisable.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/CondstoreDisable.test index 3db4cb0..25cd409 100644 --- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/CondstoreDisable.test +++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/CondstoreDisable.test @@ -17,7 +17,8 @@ # under the License. # ################################################################ C: A0 CAPABILITY -S: \* CAPABILITY NAMESPACE QUOTA IMAP4rev1 QRESYNC UNSELECT WITHIN SASL-IR ACL ENABLE SEARCHRES UIDPLUS CHILDREN AUTH=PLAIN LITERAL\+ MOVE ANNOTATION ESEARCH IDLE I18NLEVEL\=1 +# This regex ensure the response string do not contain CONDSTORE string +S: ^((?!CONDSTORE).)*$ S: A0 OK CAPABILITY completed. C: A1 ENABLE CONDSTORE http://git-wip-us.apache.org/repos/asf/james-project/blob/6a23a1b2/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 3781b03..a21b14c 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 @@ -4,12 +4,10 @@ import org.apache.james.mpt.host.JamesImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.Condstore; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import com.google.inject.Guice; import com.google.inject.Injector; -@Ignore("why it was no enabled on cassandra ?") public class HBaseCondstore extends Condstore { private JamesImapHostSystem system; http://git-wip-us.apache.org/repos/asf/james-project/blob/6a23a1b2/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTestModule.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTestModule.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTestModule.java index eecfaa3..40d9c3d 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTestModule.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTestModule.java @@ -2,6 +2,7 @@ package org.apache.james.mpt.imapmailbox.hbase; import org.apache.james.mpt.api.HostSystem; import org.apache.james.mpt.api.ImapHostSystem; +import org.apache.james.mpt.host.JamesImapHostSystem; import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem; import com.google.inject.AbstractModule; @@ -12,12 +13,13 @@ public class HBaseMailboxTestModule extends AbstractModule { @Override protected void configure() { - bind(HostSystem.class).to(ImapHostSystem.class); + bind(HostSystem.class).to(JamesImapHostSystem.class); + bind(ImapHostSystem.class).to(JamesImapHostSystem.class); } @Provides @Singleton - public ImapHostSystem provideHostSystem() throws Exception { + public JamesImapHostSystem provideHostSystem() throws Exception { return HBaseHostSystem.build(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/6a23a1b2/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 be72a68..8b4f625 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 @@ -4,12 +4,10 @@ import org.apache.james.mpt.host.JamesImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.Condstore; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import com.google.inject.Guice; import com.google.inject.Injector; -@Ignore("why it was no enabled on cassandra ?") public class InMemoryCondstore extends Condstore { private JamesImapHostSystem system; http://git-wip-us.apache.org/repos/asf/james-project/blob/6a23a1b2/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaCondstore.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaCondstore.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaCondstore.java index 6ccec80..8cdee93 100644 --- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaCondstore.java +++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaCondstore.java @@ -4,12 +4,10 @@ import org.apache.james.mpt.host.JamesImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.Condstore; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import com.google.inject.Guice; import com.google.inject.Injector; -@Ignore("why ?") public class JpaCondstore extends Condstore { private JamesImapHostSystem system; http://git-wip-us.apache.org/repos/asf/james-project/blob/6a23a1b2/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTestModule.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTestModule.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTestModule.java index b4c5399..3c2d0f4 100644 --- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTestModule.java +++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTestModule.java @@ -20,6 +20,7 @@ package org.apache.james.mpt.imapmailbox.jpa; import org.apache.james.mpt.api.HostSystem; import org.apache.james.mpt.api.ImapHostSystem; +import org.apache.james.mpt.host.JamesImapHostSystem; import org.apache.james.mpt.imapmailbox.jpa.host.JPAHostSystem; import com.google.inject.AbstractModule; @@ -31,11 +32,12 @@ public class JpaMailboxTestModule extends AbstractModule { @Override protected void configure() { bind(HostSystem.class).to(ImapHostSystem.class); + bind(ImapHostSystem.class).to(JamesImapHostSystem.class); } @Provides @Singleton - public ImapHostSystem provideImapHostSystem() throws Exception { + public JamesImapHostSystem provideImapHostSystem() throws Exception { return JPAHostSystem.build(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/6a23a1b2/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneCondstore.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneCondstore.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneCondstore.java index ad90cf4..42b12db 100644 --- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneCondstore.java +++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneCondstore.java @@ -4,12 +4,10 @@ import org.apache.james.mpt.host.JamesImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.Condstore; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import com.google.inject.Guice; import com.google.inject.Injector; -@Ignore("why ?") public class LuceneCondstore extends Condstore { private JamesImapHostSystem system; http://git-wip-us.apache.org/repos/asf/james-project/blob/6a23a1b2/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSearchMailboxTestModule.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSearchMailboxTestModule.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSearchMailboxTestModule.java index 474cc5d..4f54114 100644 --- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSearchMailboxTestModule.java +++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSearchMailboxTestModule.java @@ -21,6 +21,7 @@ package org.apache.james.mpt.imapmailbox.lucenesearch; import org.apache.james.mpt.api.HostSystem; import org.apache.james.mpt.api.ImapHostSystem; +import org.apache.james.mpt.host.JamesImapHostSystem; import org.apache.james.mpt.imapmailbox.lucenesearch.host.LuceneSearchHostSystem; import com.google.inject.AbstractModule; @@ -30,12 +31,13 @@ import com.google.inject.Singleton; public class LuceneSearchMailboxTestModule extends AbstractModule { @Override protected void configure() { - bind(HostSystem.class).to(ImapHostSystem.class); + bind(HostSystem.class).to(JamesImapHostSystem.class); + bind(ImapHostSystem.class).to(JamesImapHostSystem.class); } @Provides @Singleton - public ImapHostSystem provideImapHostSystem() throws Exception { + public JamesImapHostSystem provideImapHostSystem() throws Exception { return new LuceneSearchHostSystem(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/6a23a1b2/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirCondstore.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirCondstore.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirCondstore.java index ff7b6e0..43972d1 100644 --- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirCondstore.java +++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirCondstore.java @@ -4,12 +4,10 @@ import org.apache.james.mpt.host.JamesImapHostSystem; import org.apache.james.mpt.imapmailbox.suite.Condstore; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import com.google.inject.Guice; import com.google.inject.Injector; -@Ignore("why ?") public class MaildirCondstore extends Condstore { private JamesImapHostSystem system; http://git-wip-us.apache.org/repos/asf/james-project/blob/6a23a1b2/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTestModule.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTestModule.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTestModule.java index 9c1f04c..33b7768 100644 --- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTestModule.java +++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTestModule.java @@ -20,6 +20,7 @@ package org.apache.james.mpt.imapmailbox.maildir; import org.apache.james.mpt.api.HostSystem; import org.apache.james.mpt.api.ImapHostSystem; +import org.apache.james.mpt.host.JamesImapHostSystem; import org.apache.james.mpt.imapmailbox.maildir.host.MaildirHostSystem; import com.google.inject.AbstractModule; @@ -30,12 +31,13 @@ public class MaildirMailboxTestModule extends AbstractModule { @Override protected void configure() { - bind(HostSystem.class).to(ImapHostSystem.class); + bind(HostSystem.class).to(JamesImapHostSystem.class); + bind(ImapHostSystem.class).to(JamesImapHostSystem.class); } @Provides @Singleton - public ImapHostSystem provideImapHostSystem() throws Exception { + public JamesImapHostSystem provideImapHostSystem() throws Exception { return MaildirHostSystem.build(); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
