This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 716c3cfcb5f88a24bd0164b8cbd915db05c65868
Author: Rene Cordier <rcord...@linagora.com>
AuthorDate: Fri Nov 15 15:03:23 2019 +0700
[Refactoring] Refactor some mailbox tests and implementations more
efficiently
---
.../james/mailbox/AbstractSubscriptionManagerTest.java | 10 +++++++---
.../org/apache/james/mailbox/MailboxManagerStressTest.java | 6 ++++--
.../cassandra/CassandraMailboxManagerStressTest.java | 6 ------
.../mailbox/cassandra/CassandraSubscriptionManagerTest.java | 13 -------------
.../james/mailbox/jpa/JPASubscriptionManagerTest.java | 6 ------
.../james/mailbox/jpa/JpaMailboxManagerStressTest.java | 6 ------
.../maildir/DomainUserMaildirMailboxManagerStressTest.java | 6 ------
.../maildir/FullUserMaildirMailboxManagerStressTest.java | 6 ------
.../mailbox/maildir/MaildirSubscriptionManagerTest.java | 6 ------
.../maildir/UserMaildirMailboxManagerStressTest.java | 6 ------
.../mailbox/inmemory/MemoryMailboxManagerStressTest.java | 6 ------
11 files changed, 11 insertions(+), 66 deletions(-)
diff --git
a/mailbox/api/src/test/java/org/apache/james/mailbox/AbstractSubscriptionManagerTest.java
b/mailbox/api/src/test/java/org/apache/james/mailbox/AbstractSubscriptionManagerTest.java
index f997204..2a0b5a3 100644
---
a/mailbox/api/src/test/java/org/apache/james/mailbox/AbstractSubscriptionManagerTest.java
+++
b/mailbox/api/src/test/java/org/apache/james/mailbox/AbstractSubscriptionManagerTest.java
@@ -22,6 +22,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.core.Username;
import org.apache.james.mailbox.exception.SubscriptionException;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/**
@@ -39,13 +41,15 @@ public abstract class AbstractSubscriptionManagerTest {
protected abstract SubscriptionManager createSubscriptionManager();
- protected void setup() {
+ @BeforeEach
+ void setup() {
manager = createSubscriptionManager();
session = MailboxSessionUtil.create(USER1);
manager.startProcessingRequest(session);
}
-
- protected void teardown() throws SubscriptionException {
+
+ @AfterEach
+ void teardown() throws SubscriptionException {
manager.unsubscribe(session, MAILBOX1);
manager.unsubscribe(session, MAILBOX2);
manager.endProcessingRequest(session);
diff --git
a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java
b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java
index da25c06..09e4dc8 100644
---
a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java
+++
b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java
@@ -41,6 +41,7 @@ import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mime4j.dom.Message;
import org.apache.james.util.concurrent.NamedThreadFactory;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableSet;
@@ -54,8 +55,9 @@ public abstract class MailboxManagerStressTest<T extends
MailboxManager> {
protected abstract T provideManager() throws MailboxException;
protected abstract EventBus retrieveEventBus(T mailboxManager);
-
- protected void setUp() throws Exception {
+
+ @BeforeEach
+ void setUp() throws Exception {
this.mailboxManager = provideManager();
}
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java
index 677c0b5..e53dc07 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java
@@ -25,7 +25,6 @@ import org.apache.james.mailbox.MailboxManagerStressTest;
import org.apache.james.mailbox.cassandra.mail.MailboxAggregateModule;
import org.apache.james.mailbox.events.EventBus;
import org.apache.james.mailbox.store.PreDeletionHooks;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -35,11 +34,6 @@ class CassandraMailboxManagerStressTest extends
MailboxManagerStressTest<Cassand
@RegisterExtension
static CassandraClusterExtension cassandra = new
CassandraClusterExtension(MailboxAggregateModule.MODULE_WITH_QUOTA);
- @BeforeEach
- void setup() throws Exception {
- super.setUp();
- }
-
@Override
protected CassandraMailboxManager provideManager() {
return
CassandraMailboxManagerProvider.provideMailboxManager(cassandra.getCassandraCluster().getConf(),
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 e1120db..80a0ac6 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
@@ -46,9 +46,6 @@ 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.CassandraSubscriptionModule;
-import org.apache.james.mailbox.exception.SubscriptionException;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -61,16 +58,6 @@ class CassandraSubscriptionManagerTest extends
AbstractSubscriptionManagerTest {
@RegisterExtension
static CassandraClusterExtension cassandraCluster = new
CassandraClusterExtension(CassandraSubscriptionModule.MODULE);
- @BeforeEach
- void init() {
- super.setup();
- }
-
- @AfterEach
- void close() throws SubscriptionException {
- super.teardown();
- }
-
@Override
protected SubscriptionManager createSubscriptionManager() {
CassandraMessageIdToImapUidDAO imapUidDAO = null;
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 f19d237..3e2cca1 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
@@ -27,17 +27,11 @@ import org.apache.james.mailbox.jpa.mail.JPAModSeqProvider;
import org.apache.james.mailbox.jpa.mail.JPAUidProvider;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
class JPASubscriptionManagerTest extends AbstractSubscriptionManagerTest {
private static final JpaTestCluster JPA_TEST_CLUSTER =
JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
- @BeforeEach
- void init() {
- super.setup();
- }
-
@Override
protected SubscriptionManager createSubscriptionManager() {
JVMMailboxPathLocker locker = new JVMMailboxPathLocker();
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 3316f03..a55b0b4 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
@@ -26,17 +26,11 @@ import org.apache.james.mailbox.MailboxManagerStressTest;
import org.apache.james.mailbox.events.EventBus;
import org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
class JpaMailboxManagerStressTest extends
MailboxManagerStressTest<OpenJPAMailboxManager> {
private static final JpaTestCluster JPA_TEST_CLUSTER =
JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
private Optional<OpenJPAMailboxManager> openJPAMailboxManager =
Optional.empty();
-
- @BeforeEach
- void setup() throws Exception {
- super.setUp();
- }
@Override
protected OpenJPAMailboxManager provideManager() {
diff --git
a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerStressTest.java
b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerStressTest.java
index c1eb8b3..c9090b1 100644
---
a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerStressTest.java
+++
b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerStressTest.java
@@ -24,17 +24,11 @@ import java.io.File;
import org.apache.james.mailbox.MailboxManagerStressTest;
import org.apache.james.mailbox.events.EventBus;
import org.apache.james.mailbox.store.StoreMailboxManager;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.io.TempDir;
class DomainUserMaildirMailboxManagerStressTest extends
MailboxManagerStressTest<StoreMailboxManager> {
@TempDir
File tmpFolder;
-
- @BeforeEach
- void setup() throws Exception {
- super.setUp();
- }
@Override
protected StoreMailboxManager provideManager() {
diff --git
a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerStressTest.java
b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerStressTest.java
index 07664d7..fd9f284 100644
---
a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerStressTest.java
+++
b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerStressTest.java
@@ -24,17 +24,11 @@ import java.io.File;
import org.apache.james.mailbox.MailboxManagerStressTest;
import org.apache.james.mailbox.events.EventBus;
import org.apache.james.mailbox.store.StoreMailboxManager;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.io.TempDir;
class FullUserMaildirMailboxManagerStressTest extends
MailboxManagerStressTest<StoreMailboxManager> {
@TempDir
File tmpFolder;
-
- @BeforeEach
- void setup() throws Exception {
- super.setUp();
- }
@Override
protected StoreMailboxManager provideManager() {
diff --git
a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManagerTest.java
b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManagerTest.java
index b458a9a..48e4664 100644
---
a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManagerTest.java
+++
b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManagerTest.java
@@ -24,7 +24,6 @@ import
org.apache.james.mailbox.AbstractSubscriptionManagerTest;
import org.apache.james.mailbox.SubscriptionManager;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.io.TempDir;
class MaildirSubscriptionManagerTest extends AbstractSubscriptionManagerTest {
@@ -32,11 +31,6 @@ class MaildirSubscriptionManagerTest extends
AbstractSubscriptionManagerTest {
@TempDir
File tmpFolder;
- @BeforeEach
- void setUp() {
- super.setup();
- }
-
@Override
protected SubscriptionManager createSubscriptionManager() {
MaildirStore store = new MaildirStore(tmpFolder +
"/Maildir/%domain/%user", new JVMMailboxPathLocker());
diff --git
a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/UserMaildirMailboxManagerStressTest.java
b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/UserMaildirMailboxManagerStressTest.java
index f64648c..d1f518e 100644
---
a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/UserMaildirMailboxManagerStressTest.java
+++
b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/UserMaildirMailboxManagerStressTest.java
@@ -24,17 +24,11 @@ import java.io.File;
import org.apache.james.mailbox.MailboxManagerStressTest;
import org.apache.james.mailbox.events.EventBus;
import org.apache.james.mailbox.store.StoreMailboxManager;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.io.TempDir;
class UserMaildirMailboxManagerStressTest extends
MailboxManagerStressTest<StoreMailboxManager> {
@TempDir
File tmpFolder;
-
- @BeforeEach
- void setup() throws Exception {
- super.setUp();
- }
@Override
protected StoreMailboxManager provideManager() {
diff --git
a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerStressTest.java
b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerStressTest.java
index 1f8db72..5416c41 100644
---
a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerStressTest.java
+++
b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerStressTest.java
@@ -22,14 +22,8 @@ package org.apache.james.mailbox.inmemory;
import org.apache.james.mailbox.MailboxManagerStressTest;
import org.apache.james.mailbox.events.EventBus;
import org.apache.james.mailbox.extension.PreDeletionHook;
-import org.junit.jupiter.api.BeforeEach;
class MemoryMailboxManagerStressTest extends
MailboxManagerStressTest<InMemoryMailboxManager> {
-
- @BeforeEach
- void setup() throws Exception {
- super.setUp();
- }
@Override
protected InMemoryMailboxManager provideManager() {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
