Fix checkstyle and warning
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/14710bb6 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/14710bb6 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/14710bb6 Branch: refs/heads/master Commit: 14710bb6bb9c90f59d1c1230493bcacc39e261e2 Parents: d78ea34 Author: Raphael Ouazana <[email protected]> Authored: Tue Nov 27 15:33:39 2018 +0100 Committer: Raphael Ouazana <[email protected]> Committed: Wed Dec 5 15:19:18 2018 +0100 ---------------------------------------------------------------------- .../james/mailbox/MailboxManagerTest.java | 60 ++++++++++---------- .../mailet/base/MailetPipelineLoggingTest.java | 12 +--- .../ldap/ReadOnlyUsersLDAPRepositoryTest.java | 2 +- .../apache/james/jmap/model/KeywordsTest.java | 1 + .../spamassassin/SpamAssassinExtension.java | 9 +-- 5 files changed, 39 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/14710bb6/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java index 59593cb..2ad59e1 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java @@ -175,18 +175,18 @@ public abstract class MailboxManagerTest { @Nested class AnnotationTests { - private final MailboxAnnotationKey PRIVATE_KEY = new MailboxAnnotationKey("/private/comment"); - private final MailboxAnnotationKey PRIVATE_CHILD_KEY = new MailboxAnnotationKey("/private/comment/user"); - private final MailboxAnnotationKey PRIVATE_GRANDCHILD_KEY = new MailboxAnnotationKey("/private/comment/user/name"); - private final MailboxAnnotationKey SHARED_KEY = new MailboxAnnotationKey("/shared/comment"); + private final MailboxAnnotationKey privateKey = new MailboxAnnotationKey("/private/comment"); + private final MailboxAnnotationKey privateChildKey = new MailboxAnnotationKey("/private/comment/user"); + private final MailboxAnnotationKey privateGrandchildKey = new MailboxAnnotationKey("/private/comment/user/name"); + private final MailboxAnnotationKey sharedKey = new MailboxAnnotationKey("/shared/comment"); - private final MailboxAnnotation PRIVATE_ANNOTATION = MailboxAnnotation.newInstance(PRIVATE_KEY, "My private comment"); - private final MailboxAnnotation PRIVATE_CHILD_ANNOTATION = MailboxAnnotation.newInstance(PRIVATE_CHILD_KEY, "My private comment"); - private final MailboxAnnotation PRIVATE_GRANDCHILD_ANNOTATION = MailboxAnnotation.newInstance(PRIVATE_GRANDCHILD_KEY, "My private comment"); - private final MailboxAnnotation PRIVATE_ANNOTATION_UPDATE = MailboxAnnotation.newInstance(PRIVATE_KEY, "My updated private comment"); - private final MailboxAnnotation SHARED_ANNOTATION = MailboxAnnotation.newInstance(SHARED_KEY, "My shared comment"); + private final MailboxAnnotation privateAnnotation = MailboxAnnotation.newInstance(privateKey, "My private comment"); + private final MailboxAnnotation privateChildAnnotation = MailboxAnnotation.newInstance(privateChildKey, "My private comment"); + private final MailboxAnnotation privateGrandchildAnnotation = MailboxAnnotation.newInstance(privateGrandchildKey, "My private comment"); + private final MailboxAnnotation privateAnnotationUpdate = MailboxAnnotation.newInstance(privateKey, "My updated private comment"); + private final MailboxAnnotation sharedAnnotation = MailboxAnnotation.newInstance(sharedKey, "My shared comment"); - private final List<MailboxAnnotation> ANNOTATIONS = ImmutableList.of(PRIVATE_ANNOTATION, SHARED_ANNOTATION); + private final List<MailboxAnnotation> annotations = ImmutableList.of(privateAnnotation, sharedAnnotation); @Test void updateAnnotationsShouldUpdateStoredAnnotation() throws Exception { @@ -195,10 +195,10 @@ public abstract class MailboxManagerTest { MailboxPath inbox = MailboxPath.inbox(session); mailboxManager.createMailbox(inbox, session); - mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(PRIVATE_ANNOTATION)); + mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(privateAnnotation)); - mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(PRIVATE_ANNOTATION_UPDATE)); - assertThat(mailboxManager.getAllAnnotations(inbox, session)).containsOnly(PRIVATE_ANNOTATION_UPDATE); + mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(privateAnnotationUpdate)); + assertThat(mailboxManager.getAllAnnotations(inbox, session)).containsOnly(privateAnnotationUpdate); } @Test @@ -208,9 +208,9 @@ public abstract class MailboxManagerTest { MailboxPath inbox = MailboxPath.inbox(session); mailboxManager.createMailbox(inbox, session); - mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(PRIVATE_ANNOTATION)); + mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(privateAnnotation)); - mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(MailboxAnnotation.nil(PRIVATE_KEY))); + mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(MailboxAnnotation.nil(privateKey))); assertThat(mailboxManager.getAllAnnotations(inbox, session)).isEmpty(); } @@ -220,7 +220,7 @@ public abstract class MailboxManagerTest { session = mailboxManager.createSystemSession(USER_2); MailboxPath inbox = MailboxPath.inbox(session); - assertThatThrownBy(() -> mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(PRIVATE_ANNOTATION))) + assertThatThrownBy(() -> mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(privateAnnotation))) .isInstanceOf(MailboxException.class); } @@ -241,9 +241,9 @@ public abstract class MailboxManagerTest { MailboxPath inbox = MailboxPath.inbox(session); mailboxManager.createMailbox(inbox, session); - mailboxManager.updateAnnotations(inbox, session, ANNOTATIONS); + mailboxManager.updateAnnotations(inbox, session, annotations); - assertThat(mailboxManager.getAllAnnotations(inbox, session)).isEqualTo(ANNOTATIONS); + assertThat(mailboxManager.getAllAnnotations(inbox, session)).isEqualTo(annotations); } @Test @@ -263,10 +263,10 @@ public abstract class MailboxManagerTest { MailboxPath inbox = MailboxPath.inbox(session); mailboxManager.createMailbox(inbox, session); - mailboxManager.updateAnnotations(inbox, session, ANNOTATIONS); + mailboxManager.updateAnnotations(inbox, session, annotations); - assertThat(mailboxManager.getAnnotationsByKeys(inbox, session, ImmutableSet.of(PRIVATE_KEY))) - .containsOnly(PRIVATE_ANNOTATION); + assertThat(mailboxManager.getAnnotationsByKeys(inbox, session, ImmutableSet.of(privateKey))) + .containsOnly(privateAnnotation); } @Test @@ -275,7 +275,7 @@ public abstract class MailboxManagerTest { session = mailboxManager.createSystemSession(USER_2); MailboxPath inbox = MailboxPath.inbox(session); - assertThatThrownBy(() -> mailboxManager.getAnnotationsByKeys(inbox, session, ImmutableSet.of(PRIVATE_KEY))) + assertThatThrownBy(() -> mailboxManager.getAnnotationsByKeys(inbox, session, ImmutableSet.of(privateKey))) .isInstanceOf(MailboxException.class); } @@ -286,10 +286,10 @@ public abstract class MailboxManagerTest { MailboxPath inbox = MailboxPath.inbox(session); mailboxManager.createMailbox(inbox, session); - mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(PRIVATE_ANNOTATION, PRIVATE_CHILD_ANNOTATION, PRIVATE_GRANDCHILD_ANNOTATION)); + mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(privateAnnotation, privateChildAnnotation, privateGrandchildAnnotation)); - assertThat(mailboxManager.getAnnotationsByKeysWithOneDepth(inbox, session, ImmutableSet.of(PRIVATE_KEY))) - .contains(PRIVATE_ANNOTATION, PRIVATE_CHILD_ANNOTATION); + assertThat(mailboxManager.getAnnotationsByKeysWithOneDepth(inbox, session, ImmutableSet.of(privateKey))) + .contains(privateAnnotation, privateChildAnnotation); } @Test @@ -298,7 +298,7 @@ public abstract class MailboxManagerTest { session = mailboxManager.createSystemSession(USER_2); MailboxPath inbox = MailboxPath.inbox(session); - assertThatThrownBy(() -> mailboxManager.getAnnotationsByKeysWithAllDepth(inbox, session, ImmutableSet.of(PRIVATE_KEY))) + assertThatThrownBy(() -> mailboxManager.getAnnotationsByKeysWithAllDepth(inbox, session, ImmutableSet.of(privateKey))) .isInstanceOf(MailboxException.class); } @@ -309,10 +309,10 @@ public abstract class MailboxManagerTest { MailboxPath inbox = MailboxPath.inbox(session); mailboxManager.createMailbox(inbox, session); - mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(PRIVATE_ANNOTATION, PRIVATE_CHILD_ANNOTATION, PRIVATE_GRANDCHILD_ANNOTATION)); + mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(privateAnnotation, privateChildAnnotation, privateGrandchildAnnotation)); - assertThat(mailboxManager.getAnnotationsByKeysWithAllDepth(inbox, session, ImmutableSet.of(PRIVATE_KEY))) - .contains(PRIVATE_ANNOTATION, PRIVATE_CHILD_ANNOTATION, PRIVATE_GRANDCHILD_ANNOTATION); + assertThat(mailboxManager.getAnnotationsByKeysWithAllDepth(inbox, session, ImmutableSet.of(privateKey))) + .contains(privateAnnotation, privateChildAnnotation, privateGrandchildAnnotation); } @Test @@ -322,7 +322,7 @@ public abstract class MailboxManagerTest { MailboxPath inbox = MailboxPath.inbox(session); mailboxManager.createMailbox(inbox, session); - assertThatThrownBy(() -> mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(MailboxAnnotation.newInstance(PRIVATE_KEY, "The limitation of data is less than 30")))) + assertThatThrownBy(() -> mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(MailboxAnnotation.newInstance(privateKey, "The limitation of data is less than 30")))) .isInstanceOf(AnnotationException.class); } http://git-wip-us.apache.org/repos/asf/james-project/blob/14710bb6/mailet/base/src/test/java/org/apache/mailet/base/MailetPipelineLoggingTest.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/MailetPipelineLoggingTest.java b/mailet/base/src/test/java/org/apache/mailet/base/MailetPipelineLoggingTest.java index 1115979..18a6a44 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/MailetPipelineLoggingTest.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/MailetPipelineLoggingTest.java @@ -22,21 +22,13 @@ package org.apache.mailet.base; import static org.assertj.core.api.Assertions.assertThat; import org.apache.mailet.Mail; -import org.junit.Before; import org.junit.Test; public class MailetPipelineLoggingTest { - MailetPipelineLogging testee; - - @Before - public void setup() { - testee = new MailetPipelineLogging(); - } - @Test public void getMailetInfoShouldReturnMailetInfoWhenGiven() { - assertThat(testee.getMailetInfo(new MailetWithMailetInfo())) + assertThat(MailetPipelineLogging.getMailetInfo(new MailetWithMailetInfo())) .isEqualTo("this is my info"); } @@ -54,7 +46,7 @@ public class MailetPipelineLoggingTest { @Test public void getMailetInfoShouldReturnSimpleClassNameWhenMailetInfoIsEmpty() { - assertThat(testee.getMailetInfo(new MailetWithoutMailetInfo())) + assertThat(MailetPipelineLogging.getMailetInfo(new MailetWithoutMailetInfo())) .isEqualTo("MailetWithoutMailetInfo"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/14710bb6/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java index b217ae1..5c21bcb 100644 --- a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java +++ b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java @@ -92,7 +92,7 @@ public class ReadOnlyUsersLDAPRepositoryTest { ReadOnlyUsersLDAPRepository usersLDAPRepository = new ReadOnlyUsersLDAPRepository(domainList); - assertThatThrownBy(()-> usersLDAPRepository.configure(configuration)) + assertThatThrownBy(() -> usersLDAPRepository.configure(configuration)) .isInstanceOf(ConversionException.class); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/14710bb6/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordsTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordsTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordsTest.java index b3c2493..d382ac1 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordsTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordsTest.java @@ -199,6 +199,7 @@ public class KeywordsTest { .fromMap(ImmutableMap.of("in&valid", true))) .isEqualTo(Keywords.DEFAULT_VALUE); } + @Test public void fromFlagsShouldNotThrowOnInvalidKeywordForLenientFactory() { assertThat(Keywords.lenientFactory() http://git-wip-us.apache.org/repos/asf/james-project/blob/14710bb6/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java ---------------------------------------------------------------------- diff --git a/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java b/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java index 6a3d876..95f75f5 100644 --- a/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java +++ b/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java @@ -55,10 +55,11 @@ public class SpamAssassinExtension implements BeforeAllCallback, AfterEachCallba .withFileFromClasspath("run.sh", "docker/spamassassin/run.sh") .withFileFromClasspath("spamd.sh", "docker/spamassassin/spamd.sh") .withFileFromClasspath("rule-update.sh", "docker/spamassassin/rule-update.sh") - .withFileFromClasspath("bayes_pg.sql", "docker/spamassassin/bayes_pg.sql")) - .withCreateContainerCmdModifier(cmd -> cmd.withName(containerName())); - spamAssassinContainer.withStartupTimeout(STARTUP_TIMEOUT); - spamAssassinContainer.waitingFor(new SpamAssassinWaitStrategy(spamAssassinContainer, STARTUP_TIMEOUT)); + .withFileFromClasspath("bayes_pg.sql", "docker/spamassassin/bayes_pg.sql")); + spamAssassinContainer + .withCreateContainerCmdModifier(cmd -> cmd.withName(containerName())) + .withStartupTimeout(STARTUP_TIMEOUT) + .waitingFor(new SpamAssassinWaitStrategy(spamAssassinContainer, STARTUP_TIMEOUT)); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
