MAILBOX-342 Simplify yet a bit more CassandraSubscriptionManagerTest
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a0cab765 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a0cab765 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a0cab765 Branch: refs/heads/master Commit: a0cab7657a2a6729a1ce5280e1ad09ace0a9ff28 Parents: b0bf0e4 Author: benwa <[email protected]> Authored: Thu Jul 5 11:22:32 2018 +0700 Committer: benwa <[email protected]> Committed: Fri Jul 6 16:25:50 2018 +0700 ---------------------------------------------------------------------- .../cassandra/CassandraSubscriptionManagerTest.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/a0cab765/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java index 4a41d49..2835838 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java @@ -47,9 +47,7 @@ import org.apache.james.mailbox.cassandra.mail.CassandraModSeqProvider; import org.apache.james.mailbox.cassandra.mail.CassandraUidProvider; import org.apache.james.mailbox.cassandra.mail.CassandraUserMailboxRightsDAO; import org.apache.james.mailbox.cassandra.modules.CassandraMailboxCounterModule; -import org.apache.james.mailbox.cassandra.modules.CassandraModSeqModule; import org.apache.james.mailbox.cassandra.modules.CassandraSubscriptionModule; -import org.apache.james.mailbox.cassandra.modules.CassandraUidModule; import org.apache.james.mailbox.exception.SubscriptionException; import org.junit.After; import org.junit.Before; @@ -68,10 +66,8 @@ public class CassandraSubscriptionManagerTest extends AbstractSubscriptionManage public void init() { CassandraModuleComposite modules = new CassandraModuleComposite( new CassandraSubscriptionModule(), - new CassandraMailboxCounterModule(), - new CassandraUidModule(), - new CassandraModSeqModule()); - cassandra = CassandraCluster.create(modules, cassandraServer.getIp(), cassandraServer.getBindingPort()); + new CassandraMailboxCounterModule()); + cassandra = CassandraCluster.create(modules, cassandraServer.getHost()); super.setup(); } @@ -101,10 +97,12 @@ public class CassandraSubscriptionManagerTest extends AbstractSubscriptionManage CassandraACLMapper aclMapper = null; CassandraUserMailboxRightsDAO userMailboxRightsDAO = null; ObjectStore objectStore = null; + CassandraUidProvider uidProvider = null; + CassandraModSeqProvider modSeqProvider = null; return new CassandraSubscriptionManager( new CassandraMailboxSessionMapperFactory( - new CassandraUidProvider(cassandra.getConf()), - new CassandraModSeqProvider(cassandra.getConf()), + uidProvider, + modSeqProvider, cassandra.getConf(), messageDAO, messageIdDAO, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
