You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rc...@apache.org on 2019/12/11 10:28:58 UTC
[james-project] 10/13: [Refactoring] Small access modifiers cleanup
in test classes in mailbox-jpa module using JUnit 5
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 9223f56e8f44fdaf187ffd955e308664406478bd
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Tue Dec 10 16:11:12 2019 +0700
[Refactoring] Small access modifiers cleanup in test classes in mailbox-jpa module using JUnit 5
---
.../java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java | 6 +++---
.../org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java | 4 ++--
.../org/apache/james/mailbox/jpa/JpaMailboxManagerStressTest.java | 4 ++--
.../java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java | 2 +-
.../org/apache/james/mailbox/jpa/mail/JpaAnnotationMapperTest.java | 4 ++--
.../org/apache/james/mailbox/jpa/mail/JpaMailboxMapperTest.java | 4 ++--
.../org/apache/james/mailbox/jpa/mail/JpaMessageMapperTest.java | 2 +-
.../java/org/apache/james/mailbox/jpa/mail/JpaMessageMoveTest.java | 2 +-
.../apache/james/mailbox/jpa/quota/JPACurrentQuotaManagerTest.java | 2 +-
.../org/apache/james/mailbox/jpa/quota/JPAPerUserMaxQuotaTest.java | 2 +-
10 files changed, 16 insertions(+), 16 deletions(-)
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 ea377f2..4b917d9 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
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
-public class JPAMailboxManagerTest extends MailboxManagerTest<OpenJPAMailboxManager> {
+class JPAMailboxManagerTest extends MailboxManagerTest<OpenJPAMailboxManager> {
@Disabled("JPAMailboxManager is using DefaultMessageId which doesn't support full feature of a messageId, which is an essential" +
" element of the Vault")
@@ -37,8 +37,8 @@ public class JPAMailboxManagerTest extends MailboxManagerTest<OpenJPAMailboxMana
class HookTests {
}
- private static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
- private Optional<OpenJPAMailboxManager> openJPAMailboxManager = Optional.empty();
+ static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
+ Optional<OpenJPAMailboxManager> openJPAMailboxManager = Optional.empty();
@Override
protected OpenJPAMailboxManager provideMailboxManager() {
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 cda60c3..41bfd71 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
@@ -31,9 +31,9 @@ import org.junit.jupiter.api.BeforeEach;
class JPASubscriptionManagerTest implements SubscriptionManagerContract {
- private static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
+ static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
- private SubscriptionManager subscriptionManager;
+ SubscriptionManager subscriptionManager;
@Override
public SubscriptionManager getSubscriptionManager() {
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 da90cfb..520c195 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
@@ -30,8 +30,8 @@ import org.junit.jupiter.api.BeforeEach;
class JpaMailboxManagerStressTest implements MailboxManagerStressContract<OpenJPAMailboxManager> {
- private static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
- private Optional<OpenJPAMailboxManager> openJPAMailboxManager = Optional.empty();
+ static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
+ Optional<OpenJPAMailboxManager> openJPAMailboxManager = Optional.empty();
@Override
public OpenJPAMailboxManager getManager() {
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 7fe350a..c8eb976 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
@@ -51,7 +51,7 @@ public class JPAMapperProvider implements MapperProvider {
}
@Override
- public MailboxMapper createMailboxMapper() throws MailboxException {
+ public MailboxMapper createMailboxMapper() {
return new TransactionalMailboxMapper(new JPAMailboxMapper(jpaTestCluster.getEntityManagerFactory()));
}
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 641e298..d2826ff 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
@@ -31,9 +31,9 @@ import org.junit.jupiter.api.AfterEach;
class JpaAnnotationMapperTest extends AnnotationMapperTest {
- public static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
+ static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
- private final AtomicInteger counter = new AtomicInteger();
+ final AtomicInteger counter = new AtomicInteger();
@AfterEach
void tearDown() {
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 c9fe5be..a697b87 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
@@ -31,9 +31,9 @@ import org.junit.jupiter.api.AfterEach;
class JpaMailboxMapperTest extends MailboxMapperTest {
- public static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
+ static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
- private final AtomicInteger counter = new AtomicInteger();
+ final AtomicInteger counter = new AtomicInteger();
@Override
protected MailboxMapper createMailboxMapper() {
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 5ebe877..87cb269 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
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.AfterEach;
class JpaMessageMapperTest extends MessageMapperTest {
- public static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
+ static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
@Override
protected MapperProvider createMapperProvider() {
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMessageMoveTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMessageMoveTest.java
index 1940cb3..de8a1d3 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMessageMoveTest.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMessageMoveTest.java
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.AfterEach;
class JpaMessageMoveTest extends MessageMoveTest {
- public static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
+ static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
@Override
protected MapperProvider createMapperProvider() {
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/quota/JPACurrentQuotaManagerTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/quota/JPACurrentQuotaManagerTest.java
index 885a63f..dbcebc1 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/quota/JPACurrentQuotaManagerTest.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/quota/JPACurrentQuotaManagerTest.java
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.AfterEach;
class JPACurrentQuotaManagerTest extends StoreCurrentQuotaManagerTest {
- private static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.QUOTA_PERSISTANCE_CLASSES);
+ static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.QUOTA_PERSISTANCE_CLASSES);
@Override
protected StoreCurrentQuotaManager provideTestee() {
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/quota/JPAPerUserMaxQuotaTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/quota/JPAPerUserMaxQuotaTest.java
index b557d95..6c5df68 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/quota/JPAPerUserMaxQuotaTest.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/quota/JPAPerUserMaxQuotaTest.java
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.AfterEach;
class JPAPerUserMaxQuotaTest extends GenericMaxQuotaManagerTest {
- private static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.QUOTA_PERSISTANCE_CLASSES);
+ static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.QUOTA_PERSISTANCE_CLASSES);
@Override
protected MaxQuotaManager provideMaxQuotaManager() {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org