JAMES-2008 Use JpaTestCluster everywhere in JPA mailbox
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/88847660 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/88847660 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/88847660 Branch: refs/heads/master Commit: 88847660c49c0f3f0065b8ac2ce1d19cb3cab058 Parents: e9e1f55 Author: benwa <btell...@linagora.com> Authored: Fri Apr 21 15:02:49 2017 +0700 Committer: Antoine Duprat <adup...@linagora.com> Committed: Wed Apr 26 13:50:11 2017 +0200 ---------------------------------------------------------------------- .../org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java | 6 +----- .../apache/james/mailbox/jpa/JPASubscriptionManagerTest.java | 2 +- .../james/mailbox/jpa/JpaMailboxManagerStressTest.java | 6 +----- .../org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java | 8 +++++--- .../james/mailbox/jpa/mail/JpaAnnotationMapperTest.java | 7 ++++++- .../apache/james/mailbox/jpa/mail/JpaMailboxMapperTest.java | 7 ++++++- .../apache/james/mailbox/jpa/mail/JpaMessageMapperTest.java | 7 ++++++- 7 files changed, 26 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/88847660/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java index 037dd86..6a53323 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java @@ -23,7 +23,6 @@ import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxManagerTest; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager; -import org.apache.james.mailbox.mock.MockMailboxSession; import org.junit.After; import com.google.common.base.Optional; @@ -43,10 +42,7 @@ public class JPAMailboxManagerTest extends MailboxManagerTest { @After public void tearDown() throws MailboxException { - if (openJPAMailboxManager.isPresent()) { - openJPAMailboxManager.get() - .deleteEverything(new MockMailboxSession("Any name")); - } + JPA_TEST_CLUSTER.clear(JPAMailboxFixture.MAILBOX_TABLE_NAMES); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/88847660/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java index 8b8dc61..edf4623 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java @@ -47,6 +47,6 @@ public class JPASubscriptionManagerTest extends AbstractSubscriptionManagerTest{ @After public void teardown() throws SubscriptionException { - super.teardown(); + JPA_TEST_CLUSTER.clear(JPAMailboxFixture.MAILBOX_TABLE_NAMES); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/88847660/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerStressTest.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerStressTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerStressTest.java index 8bd3475..fc05755 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerStressTest.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerStressTest.java @@ -24,7 +24,6 @@ import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxManagerStressTest; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager; -import org.apache.james.mailbox.mock.MockMailboxSession; import org.junit.After; import com.google.common.base.Optional; @@ -44,9 +43,6 @@ public class JpaMailboxManagerStressTest extends MailboxManagerStressTest { @After public void tearDown() throws MailboxException { - if (openJPAMailboxManager.isPresent()) { - openJPAMailboxManager.get() - .deleteEverything(new MockMailboxSession("Any name")); - } + JPA_TEST_CLUSTER.clear(JPAMailboxFixture.MAILBOX_TABLE_NAMES); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/88847660/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java index 74b1713..244198a 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java @@ -22,10 +22,8 @@ package org.apache.james.mailbox.jpa.mail; import java.util.List; import java.util.Random; -import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import com.google.common.base.Preconditions; import org.apache.commons.lang.NotImplementedException; import org.apache.james.backends.jpa.JpaTestCluster; import org.apache.james.mailbox.MessageUid; @@ -49,7 +47,11 @@ import com.google.common.collect.ImmutableList; public class JPAMapperProvider implements MapperProvider { - private static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES); + private final JpaTestCluster JPA_TEST_CLUSTER; + + public JPAMapperProvider(JpaTestCluster JPA_TEST_CLUSTER) { + this.JPA_TEST_CLUSTER = JPA_TEST_CLUSTER; + } @Override public MailboxMapper createMailboxMapper() throws MailboxException { http://git-wip-us.apache.org/repos/asf/james-project/blob/88847660/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaAnnotationMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaAnnotationMapperTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaAnnotationMapperTest.java index 767b8c1..f61200f 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaAnnotationMapperTest.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaAnnotationMapperTest.java @@ -19,12 +19,17 @@ package org.apache.james.mailbox.jpa.mail; +import org.apache.james.backends.jpa.JpaTestCluster; +import org.apache.james.mailbox.jpa.JPAMailboxFixture; import org.apache.james.mailbox.store.mail.model.AnnotationMapperTest; import org.apache.james.mailbox.store.mail.model.MapperProvider; public class JpaAnnotationMapperTest extends AnnotationMapperTest { + + public static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES); + @Override protected MapperProvider createMapperProvider() { - return new JPAMapperProvider(); + return new JPAMapperProvider(JPA_TEST_CLUSTER); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/88847660/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMailboxMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMailboxMapperTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMailboxMapperTest.java index 4429d34..4dde441 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMailboxMapperTest.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMailboxMapperTest.java @@ -19,12 +19,17 @@ package org.apache.james.mailbox.jpa.mail; +import org.apache.james.backends.jpa.JpaTestCluster; +import org.apache.james.mailbox.jpa.JPAMailboxFixture; import org.apache.james.mailbox.store.mail.model.MailboxMapperTest; import org.apache.james.mailbox.store.mail.model.MapperProvider; public class JpaMailboxMapperTest extends MailboxMapperTest { + + public static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES); + @Override protected MapperProvider createMapperProvider() { - return new JPAMapperProvider(); + return new JPAMapperProvider(JPA_TEST_CLUSTER); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/88847660/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMessageMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMessageMapperTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMessageMapperTest.java index ce0605d..1230ae4 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMessageMapperTest.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMessageMapperTest.java @@ -19,12 +19,17 @@ package org.apache.james.mailbox.jpa.mail; +import org.apache.james.backends.jpa.JpaTestCluster; +import org.apache.james.mailbox.jpa.JPAMailboxFixture; import org.apache.james.mailbox.store.mail.model.MapperProvider; import org.apache.james.mailbox.store.mail.model.MessageMapperTest; public class JpaMessageMapperTest extends MessageMapperTest { + + public static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES); + @Override protected MapperProvider createMapperProvider() { - return new JPAMapperProvider(); + return new JPAMapperProvider(JPA_TEST_CLUSTER); } } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
