MAILBOX-342 Don't use mapper provider for AttachmentMapperTest In Cassandra test by limiting loaded modules, 25s -> 8s
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f204fa7b Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f204fa7b Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f204fa7b Branch: refs/heads/master Commit: f204fa7bdbe46f0ab75be3fd94fbe478264f3455 Parents: 4bd253a Author: benwa <[email protected]> Authored: Thu Jul 5 11:24:34 2018 +0700 Committer: benwa <[email protected]> Committed: Fri Jul 6 16:25:50 2018 +0700 ---------------------------------------------------------------------- mailbox/cassandra/pom.xml | 5 +++ .../mail/CassandraAttachmentMapperTest.java | 34 ++++---------------- .../mail/MemoryAttachmentMapperTest.java | 8 ++--- .../store/mail/model/AttachmentMapperTest.java | 7 ++-- 4 files changed, 18 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/f204fa7b/mailbox/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/pom.xml b/mailbox/cassandra/pom.xml index 9380413..c7ce077 100644 --- a/mailbox/cassandra/pom.xml +++ b/mailbox/cassandra/pom.xml @@ -110,6 +110,11 @@ <artifactId>guava</artifactId> </dependency> <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.jayway.awaitility</groupId> <artifactId>awaitility</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/f204fa7b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java index 14ddd79..82a1ff2 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java @@ -24,22 +24,12 @@ import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.backends.cassandra.init.CassandraModuleComposite; import org.apache.james.blob.cassandra.CassandraBlobModule; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; -import org.apache.james.mailbox.cassandra.modules.CassandraAclModule; -import org.apache.james.mailbox.cassandra.modules.CassandraAnnotationModule; -import org.apache.james.mailbox.cassandra.modules.CassandraApplicableFlagsModule; +import org.apache.james.mailbox.cassandra.mail.utils.GuiceUtils; import org.apache.james.mailbox.cassandra.modules.CassandraAttachmentModule; -import org.apache.james.mailbox.cassandra.modules.CassandraDeletedMessageModule; -import org.apache.james.mailbox.cassandra.modules.CassandraFirstUnseenModule; -import org.apache.james.mailbox.cassandra.modules.CassandraMailboxCounterModule; -import org.apache.james.mailbox.cassandra.modules.CassandraMailboxModule; -import org.apache.james.mailbox.cassandra.modules.CassandraMailboxRecentsModule; -import org.apache.james.mailbox.cassandra.modules.CassandraMessageModule; -import org.apache.james.mailbox.cassandra.modules.CassandraModSeqModule; -import org.apache.james.mailbox.cassandra.modules.CassandraUidModule; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MessageId; +import org.apache.james.mailbox.store.mail.AttachmentMapper; import org.apache.james.mailbox.store.mail.model.AttachmentMapperTest; -import org.apache.james.mailbox.store.mail.model.MapperProvider; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -54,20 +44,9 @@ public class CassandraAttachmentMapperTest extends AttachmentMapperTest { @Before public void setUp() throws MailboxException { CassandraModuleComposite modules = new CassandraModuleComposite( - new CassandraAclModule(), - new CassandraMailboxModule(), - new CassandraMessageModule(), - new CassandraMailboxCounterModule(), - new CassandraMailboxRecentsModule(), - new CassandraModSeqModule(), - new CassandraUidModule(), new CassandraAttachmentModule(), - new CassandraAnnotationModule(), - new CassandraFirstUnseenModule(), - new CassandraApplicableFlagsModule(), - new CassandraDeletedMessageModule(), new CassandraBlobModule()); - this.cassandra = CassandraCluster.create(modules, cassandraServer.getIp(), cassandraServer.getBindingPort()); + this.cassandra = CassandraCluster.create(modules, cassandraServer.getHost()); super.setUp(); } @@ -75,10 +54,11 @@ public class CassandraAttachmentMapperTest extends AttachmentMapperTest { public void tearDown() { cassandra.close(); } - + @Override - protected MapperProvider createMapperProvider() { - return new CassandraMapperProvider(cassandra); + protected AttachmentMapper createAttachmentMapper() { + return GuiceUtils.testInjector(cassandra) + .getInstance(CassandraAttachmentMapper.class); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/f204fa7b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAttachmentMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAttachmentMapperTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAttachmentMapperTest.java index 650d758..b379621 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAttachmentMapperTest.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAttachmentMapperTest.java @@ -22,8 +22,8 @@ package org.apache.james.mailbox.inmemory.mail; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.inmemory.InMemoryMessageId; import org.apache.james.mailbox.model.MessageId; +import org.apache.james.mailbox.store.mail.AttachmentMapper; import org.apache.james.mailbox.store.mail.model.AttachmentMapperTest; -import org.apache.james.mailbox.store.mail.model.MapperProvider; import org.junit.Before; public class MemoryAttachmentMapperTest extends AttachmentMapperTest { @@ -33,10 +33,10 @@ public class MemoryAttachmentMapperTest extends AttachmentMapperTest { public void setUp() throws MailboxException { super.setUp(); } - + @Override - protected MapperProvider createMapperProvider() { - return new InMemoryMapperProvider(); + protected AttachmentMapper createAttachmentMapper() { + return new InMemoryAttachmentMapper(); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/f204fa7b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AttachmentMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AttachmentMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AttachmentMapperTest.java index 5aea667..63f50c2 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AttachmentMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AttachmentMapperTest.java @@ -31,7 +31,6 @@ import org.apache.james.mailbox.model.Attachment; import org.apache.james.mailbox.model.AttachmentId; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.store.mail.AttachmentMapper; -import org.junit.Assume; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -48,14 +47,12 @@ public abstract class AttachmentMapperTest { @Rule public ExpectedException expected = ExpectedException.none(); - protected abstract MapperProvider createMapperProvider(); + protected abstract AttachmentMapper createAttachmentMapper(); protected abstract MessageId generateMessageId(); public void setUp() throws MailboxException { - MapperProvider mapperProvider = createMapperProvider(); - Assume.assumeTrue(mapperProvider.getSupportedCapabilities().contains(MapperProvider.Capabilities.ATTACHMENT)); - this.attachmentMapper = mapperProvider.createAttachmentMapper(); + this.attachmentMapper = createAttachmentMapper(); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
