MAILBOX-310 Cassandra modseq and uid test don't need mailbox mapper
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/36333bad Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/36333bad Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/36333bad Branch: refs/heads/master Commit: 36333bad8c1bbfa4694fc8eec2548f339aadf400 Parents: 5de2d00 Author: benwa <btell...@linagora.com> Authored: Tue Oct 3 14:24:08 2017 +0700 Committer: Matthieu Baechler <matth...@apache.org> Committed: Thu Oct 5 20:00:38 2017 +0200 ---------------------------------------------------------------------- .../mail/CassandraModSeqProviderTest.java | 29 +++++--------------- .../mail/CassandraUidProviderTest.java | 27 +++--------------- 2 files changed, 11 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/36333bad/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java index f3d6ed2..c2c0c76 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java @@ -25,11 +25,7 @@ import java.util.stream.LongStream; import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.backends.cassandra.DockerCassandraRule; -import org.apache.james.backends.cassandra.init.CassandraConfiguration; -import org.apache.james.backends.cassandra.init.CassandraModuleComposite; -import org.apache.james.backends.cassandra.utils.CassandraUtils; -import org.apache.james.mailbox.cassandra.modules.CassandraAclModule; -import org.apache.james.mailbox.cassandra.modules.CassandraMailboxModule; +import org.apache.james.mailbox.cassandra.ids.CassandraId; import org.apache.james.mailbox.cassandra.modules.CassandraModSeqModule; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox; @@ -41,36 +37,25 @@ import org.junit.Test; import com.github.fge.lambdas.Throwing; public class CassandraModSeqProviderTest { + private static final CassandraId CASSANDRA_ID = new CassandraId.Factory().fromString("e22b3ac0-a80b-11e7-bb00-777268d65503"); @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); private CassandraCluster cassandra; private CassandraModSeqProvider modSeqProvider; - private CassandraMailboxMapper mapper; private SimpleMailbox mailbox; @Before public void setUp() throws Exception { - CassandraModuleComposite modules = - new CassandraModuleComposite( - new CassandraAclModule(), - new CassandraMailboxModule(), - new CassandraModSeqModule()); - cassandra = CassandraCluster.create(modules, cassandraServer.getIp(), cassandraServer.getBindingPort()); + cassandra = CassandraCluster.create( + new CassandraModSeqModule(), + cassandraServer.getIp(), + cassandraServer.getBindingPort()); modSeqProvider = new CassandraModSeqProvider(cassandra.getConf()); - CassandraMailboxDAO mailboxDAO = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider()); - CassandraMailboxPathDAO mailboxPathDAO = new CassandraMailboxPathDAO(cassandra.getConf(), cassandra.getTypesProvider()); - CassandraUserMailboxRightsDAO userMailboxRightsDAO = new CassandraUserMailboxRightsDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION); - mapper = new CassandraMailboxMapper( - mailboxDAO, - mailboxPathDAO, - userMailboxRightsDAO, - new CassandraACLMapper(cassandra.getConf(), CassandraConfiguration.DEFAULT_CONFIGURATION), - CassandraConfiguration.DEFAULT_CONFIGURATION); MailboxPath path = new MailboxPath("gsoc", "ieugen", "Trash"); mailbox = new SimpleMailbox(path, 1234); - mapper.save(mailbox); + mailbox.setMailboxId(CASSANDRA_ID); } @After http://git-wip-us.apache.org/repos/asf/james-project/blob/36333bad/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java index b9f22d8..dd7b239 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java @@ -25,12 +25,8 @@ import java.util.stream.LongStream; import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.backends.cassandra.DockerCassandraRule; -import org.apache.james.backends.cassandra.init.CassandraConfiguration; -import org.apache.james.backends.cassandra.init.CassandraModuleComposite; -import org.apache.james.backends.cassandra.utils.CassandraUtils; import org.apache.james.mailbox.MessageUid; -import org.apache.james.mailbox.cassandra.modules.CassandraAclModule; -import org.apache.james.mailbox.cassandra.modules.CassandraMailboxModule; +import org.apache.james.mailbox.cassandra.ids.CassandraId; import org.apache.james.mailbox.cassandra.modules.CassandraUidModule; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox; @@ -42,36 +38,21 @@ import org.junit.Test; import com.github.fge.lambdas.Throwing; public class CassandraUidProviderTest { + private static final CassandraId CASSANDRA_ID = new CassandraId.Factory().fromString("e22b3ac0-a80b-11e7-bb00-777268d65503"); @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); - - private final CassandraModuleComposite modules = new CassandraModuleComposite( - new CassandraAclModule(), - new CassandraMailboxModule(), - new CassandraUidModule()); - - private final CassandraCluster cassandra = CassandraCluster.create(modules, cassandraServer.getIp(), cassandraServer.getBindingPort()); + private final CassandraCluster cassandra = CassandraCluster.create(new CassandraUidModule(), cassandraServer.getIp(), cassandraServer.getBindingPort()); private CassandraUidProvider uidProvider; - private CassandraMailboxMapper mapper; private SimpleMailbox mailbox; @Before public void setUpClass() throws Exception { uidProvider = new CassandraUidProvider(cassandra.getConf()); - CassandraMailboxDAO mailboxDAO = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider()); - CassandraMailboxPathDAO mailboxPathDAO = new CassandraMailboxPathDAO(cassandra.getConf(), cassandra.getTypesProvider()); - CassandraUserMailboxRightsDAO userMailboxRightsDAO = new CassandraUserMailboxRightsDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION); - mapper = new CassandraMailboxMapper( - mailboxDAO, - mailboxPathDAO, - userMailboxRightsDAO, - new CassandraACLMapper(cassandra.getConf(), CassandraConfiguration.DEFAULT_CONFIGURATION), - CassandraConfiguration.DEFAULT_CONFIGURATION); MailboxPath path = new MailboxPath("gsoc", "ieugen", "Trash"); mailbox = new SimpleMailbox(path, 1234); - mapper.save(mailbox); + mailbox.setMailboxId(CASSANDRA_ID); } @After --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
