This is an automated email from the ASF dual-hosted git repository.

aduprat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit e67e60f700872743183e9f6edffdd7cb58d79538
Author: Gautier DI FOLCO <gdifo...@linagora.com>
AuthorDate: Tue Apr 9 11:27:54 2019 +0200

    JAMES-2732 Fix checkstyle in tests
---
 .../apache/james/mailbox/backup/ZipAssertTest.java |  4 +-
 .../james/mailbox/events/InVMEventBusTest.java     |  2 +-
 .../mailbox/events/LocalListenerRegistryTest.java  | 50 +++++++++++-----------
 .../apache/james/event/json/SerializerFixture.java |  1 -
 .../vault/DeletedMessageVaultSearchContract.java   |  4 +-
 .../james/vault/RetentionConfigurationTest.java    |  2 +-
 .../blob/objectstorage/AESPayloadCodecTest.java    |  2 -
 .../james/blob/union/UnionBlobStoreTest.java       |  5 ++-
 .../apache/james/modules/RabbitMQExtension.java    |  3 +-
 .../SetMessagesOutboxFlagUpdateTest.java           |  1 -
 .../EventDeadLettersIntegrationTest.java           |  1 -
 .../james/queue/rabbitmq/EnqueuedItemTest.java     |  6 +--
 .../view/cassandra/EnqueuedMailsDaoUtilTest.java   |  3 +-
 .../view/cassandra/configuration/DTOTest.java      |  2 +-
 .../model/EnqueuedItemWithSlicingContextTest.java  |  6 +--
 15 files changed, 46 insertions(+), 46 deletions(-)

diff --git 
a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/ZipAssertTest.java
 
b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/ZipAssertTest.java
index ce473e4..90eb97b 100644
--- 
a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/ZipAssertTest.java
+++ 
b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/ZipAssertTest.java
@@ -43,7 +43,8 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableList;
+
+import com.google.common.collect.ImmutableList;
 
 @ExtendWith(TemporaryFolderExtension.class)
 public class ZipAssertTest {
@@ -97,6 +98,7 @@ public class ZipAssertTest {
             this.extraFields = extraFields;
         }
     }
+
     private static final String ENTRY_NAME = "entryName";
     private static final String ENTRY_NAME_2 = "entryName2";
     private static final String DIRECTORY_NAME = "folder/";
diff --git 
a/mailbox/event/event-memory/src/test/java/org/apache/james/mailbox/events/InVMEventBusTest.java
 
b/mailbox/event/event-memory/src/test/java/org/apache/james/mailbox/events/InVMEventBusTest.java
index 56a9cde..862fc82 100644
--- 
a/mailbox/event/event-memory/src/test/java/org/apache/james/mailbox/events/InVMEventBusTest.java
+++ 
b/mailbox/event/event-memory/src/test/java/org/apache/james/mailbox/events/InVMEventBusTest.java
@@ -24,7 +24,7 @@ import org.apache.james.metrics.api.NoopMetricFactory;
 import org.junit.jupiter.api.BeforeEach;
 
 public class InVMEventBusTest implements 
KeyContract.SingleEventBusKeyContract, 
GroupContract.SingleEventBusGroupContract,
-    ErrorHandlingContract{
+    ErrorHandlingContract {
 
     private InVMEventBus eventBus;
     private MemoryEventDeadLetters deadLetters;
diff --git 
a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/LocalListenerRegistryTest.java
 
b/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/LocalListenerRegistryTest.java
index 05a6a13..8136239 100644
--- 
a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/LocalListenerRegistryTest.java
+++ 
b/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/LocalListenerRegistryTest.java
@@ -52,7 +52,7 @@ class LocalListenerRegistryTest {
 
     @Test
     void getLocalMailboxListenersShouldReturnPreviouslyAddedListener() {
-        MailboxListener listener = event -> {};
+        MailboxListener listener = event -> { };
         testee.addListener(KEY_1, listener);
 
         
assertThat(testee.getLocalMailboxListeners(KEY_1).collectList().block())
@@ -61,8 +61,8 @@ class LocalListenerRegistryTest {
 
     @Test
     void getLocalMailboxListenersShouldReturnPreviouslyAddedListeners() {
-        MailboxListener listener1 = event -> {};
-        MailboxListener listener2 = event -> {};
+        MailboxListener listener1 = event -> { };
+        MailboxListener listener2 = event -> { };
         testee.addListener(KEY_1, listener1);
         testee.addListener(KEY_1, listener2);
 
@@ -72,8 +72,8 @@ class LocalListenerRegistryTest {
 
     @Test
     void getLocalMailboxListenersShouldNotReturnRemovedListeners() {
-        MailboxListener listener1 = event -> {};
-        MailboxListener listener2 = event -> {};
+        MailboxListener listener1 = event -> { };
+        MailboxListener listener2 = event -> { };
         testee.addListener(KEY_1, listener1);
         LocalListenerRegistry.LocalRegistration registration = 
testee.addListener(KEY_1, listener2);
 
@@ -85,15 +85,15 @@ class LocalListenerRegistryTest {
 
     @Test
     void 
addListenerShouldReturnFirstListenerWhenNoPreviouslyRegisteredListeners() {
-        MailboxListener listener = event -> {};
+        MailboxListener listener = event -> { };
 
         assertThat(testee.addListener(KEY_1, 
listener).isFirstListener()).isTrue();
     }
 
     @Test
     void 
addListenerShouldNotReturnFirstListenerWhenPreviouslyRegisteredListeners() {
-        MailboxListener listener = event -> {};
-        MailboxListener listener2 = event -> {};
+        MailboxListener listener = event -> { };
+        MailboxListener listener2 = event -> { };
 
         testee.addListener(KEY_1, listener);
 
@@ -102,8 +102,8 @@ class LocalListenerRegistryTest {
 
     @Test
     void removeListenerShouldNotReturnLastListenerRemovedWhenSeveralListener() 
{
-        MailboxListener listener = event -> {};
-        MailboxListener listener2 = event -> {};
+        MailboxListener listener = event -> { };
+        MailboxListener listener2 = event -> { };
 
         LocalListenerRegistry.LocalRegistration registration = 
testee.addListener(KEY_1, listener);
         testee.addListener(KEY_1, listener2);
@@ -113,7 +113,7 @@ class LocalListenerRegistryTest {
 
     @Test
     void removeListenerShouldReturnLastListenerRemovedWhenOneListener() {
-        MailboxListener listener = event -> {};
+        MailboxListener listener = event -> { };
 
 
         LocalListenerRegistry.LocalRegistration registration = 
testee.addListener(KEY_1, listener);
@@ -127,7 +127,7 @@ class LocalListenerRegistryTest {
 
         @Test
         void getLocalMailboxListenersShouldReturnPreviousAddedListener() 
throws Exception {
-            MailboxListener listener = event -> {};
+            MailboxListener listener = event -> { };
 
             ConcurrentTestRunner.builder()
                 .operation((threadNumber, operationNumber) -> 
testee.addListener(KEY_1, listener))
@@ -141,9 +141,9 @@ class LocalListenerRegistryTest {
 
         @Test
         void getLocalMailboxListenersShouldReturnAllPreviousAddedListeners() 
throws Exception {
-            MailboxListener listener1 = event -> {};
-            MailboxListener listener2 = event -> {};
-            MailboxListener listener3 = event -> {};
+            MailboxListener listener1 = event -> { };
+            MailboxListener listener2 = event -> { };
+            MailboxListener listener3 = event -> { };
 
             ConcurrentTestRunner.builder()
                 .operation((threadNumber, operationNumber) -> {
@@ -165,7 +165,7 @@ class LocalListenerRegistryTest {
 
         @Test
         void 
getLocalMailboxListenersShouldReturnEmptyWhenRemoveAddedListener() throws 
Exception {
-            MailboxListener listener1 = event -> {};
+            MailboxListener listener1 = event -> { };
 
             LocalListenerRegistry.LocalRegistration registration = 
testee.addListener(KEY_1, listener1);
 
@@ -181,9 +181,9 @@ class LocalListenerRegistryTest {
 
         @Test
         void addListenerOnlyReturnIsFirstListenerForEmptyRegistry() throws 
Exception {
-            MailboxListener listener1 = event -> {};
-            MailboxListener listener2 = event -> {};
-            MailboxListener listener3 = event -> {};
+            MailboxListener listener1 = event -> { };
+            MailboxListener listener2 = event -> { };
+            MailboxListener listener3 = event -> { };
 
             AtomicInteger firstListenerCount = new AtomicInteger(0);
 
@@ -215,7 +215,7 @@ class LocalListenerRegistryTest {
 
         @Test
         void removeListenerOnlyReturnLastListenerRemovedForEmptyRegistry() 
throws Exception {
-            MailboxListener listener1 = event -> {};
+            MailboxListener listener1 = event -> { };
             AtomicInteger lastListenerRemoved = new AtomicInteger(0);
 
             LocalListenerRegistry.LocalRegistration registration = 
testee.addListener(KEY_1, listener1);
@@ -234,11 +234,11 @@ class LocalListenerRegistryTest {
 
         @Test
         void iterationShouldPerformOnASnapshotOfListenersSet() {
-            MailboxListener listener1 = event -> {};
-            MailboxListener listener2 = event -> {};
-            MailboxListener listener3 = event -> {};
-            MailboxListener listener4 = event -> {};
-            MailboxListener listener5 = event -> {};
+            MailboxListener listener1 = event -> { };
+            MailboxListener listener2 = event -> { };
+            MailboxListener listener3 = event -> { };
+            MailboxListener listener4 = event -> { };
+            MailboxListener listener5 = event -> { };
 
             testee.addListener(KEY_1, listener1);
             testee.addListener(KEY_1, listener2);
diff --git 
a/mailbox/event/json/src/test/java/org/apache/james/event/json/SerializerFixture.java
 
b/mailbox/event/json/src/test/java/org/apache/james/event/json/SerializerFixture.java
index 19c402d..3cf904a 100644
--- 
a/mailbox/event/json/src/test/java/org/apache/james/event/json/SerializerFixture.java
+++ 
b/mailbox/event/json/src/test/java/org/apache/james/event/json/SerializerFixture.java
@@ -19,7 +19,6 @@
 
 package org.apache.james.event.json;
 
-
 import org.apache.james.mailbox.events.Event;
 import org.apache.james.mailbox.model.TestId;
 import org.apache.james.mailbox.model.TestMessageId;
diff --git 
a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultSearchContract.java
 
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultSearchContract.java
index 051de74..3a446f6 100644
--- 
a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultSearchContract.java
+++ 
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultSearchContract.java
@@ -529,11 +529,11 @@ public interface DeletedMessageVaultSearchContract {
             "equalsIgnoreCase with a special locale")
         @Test
         default void 
shouldReturnsMessageWhenPassingAStringInDifferentLocaleToContainsIgnoreCase() {
-            Locale TURKISH_LOCALE = Locale.forLanguageTag("tr");
+            Locale turkishLocale = Locale.forLanguageTag("tr");
             String subjectInTurkishLanguage = "TITLE";
             DeletedMessage message1 = 
storeMessageWithSubject(subjectInTurkishLanguage);
 
-            String subjectLowercase = 
subjectInTurkishLanguage.toLowerCase(TURKISH_LOCALE);
+            String subjectLowercase = 
subjectInTurkishLanguage.toLowerCase(turkishLocale);
             
assertThat(search(Query.of(CriterionFactory.subject().containsIgnoreCase(subjectLowercase))))
                 .contains(message1);
         }
diff --git 
a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/RetentionConfigurationTest.java
 
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/RetentionConfigurationTest.java
index 7a15011..19939b9 100644
--- 
a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/RetentionConfigurationTest.java
+++ 
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/RetentionConfigurationTest.java
@@ -31,7 +31,7 @@ import nl.jqno.equalsverifier.EqualsVerifier;
 
 class RetentionConfigurationTest {
     @Test
-    void ShouldMatchBeanContract() {
+    void shouldMatchBeanContract() {
         EqualsVerifier.forClass(RetentionConfiguration.class)
             .verify();
     }
diff --git 
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/AESPayloadCodecTest.java
 
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/AESPayloadCodecTest.java
index 9fbd588..1442602 100644
--- 
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/AESPayloadCodecTest.java
+++ 
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/AESPayloadCodecTest.java
@@ -26,8 +26,6 @@ import java.io.ByteArrayInputStream;
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
 import java.util.Optional;
 
 import org.apache.commons.io.IOUtils;
diff --git 
a/server/blob/blob-union/src/test/java/org/apache/james/blob/union/UnionBlobStoreTest.java
 
b/server/blob/blob-union/src/test/java/org/apache/james/blob/union/UnionBlobStoreTest.java
index 563f3cd..f044606 100644
--- 
a/server/blob/blob-union/src/test/java/org/apache/james/blob/union/UnionBlobStoreTest.java
+++ 
b/server/blob/blob-union/src/test/java/org/apache/james/blob/union/UnionBlobStoreTest.java
@@ -45,8 +45,9 @@ import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.testcontainers.shaded.com.google.common.base.MoreObjects;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableList;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
 
 import reactor.core.publisher.Mono;
 
diff --git 
a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/RabbitMQExtension.java
 
b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/RabbitMQExtension.java
index 24decaf..095baca 100644
--- 
a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/RabbitMQExtension.java
+++ 
b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/RabbitMQExtension.java
@@ -19,10 +19,11 @@
 
 package org.apache.james.modules;
 
-import com.google.inject.Module;
 import org.apache.james.GuiceModuleTestExtension;
 import org.junit.jupiter.api.extension.ExtensionContext;
 
+import com.google.inject.Module;
+
 public class RabbitMQExtension implements GuiceModuleTestExtension {
 
     private final DockerRabbitMQRule rabbitMQRule = new DockerRabbitMQRule();
diff --git 
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesOutboxFlagUpdateTest.java
 
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesOutboxFlagUpdateTest.java
index ce2f696..cbf14d5 100644
--- 
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesOutboxFlagUpdateTest.java
+++ 
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesOutboxFlagUpdateTest.java
@@ -36,7 +36,6 @@ import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.lang3.NotImplementedException;
 import org.apache.james.GuiceJamesServer;
diff --git 
a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/EventDeadLettersIntegrationTest.java
 
b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/EventDeadLettersIntegrationTest.java
index a78aa92..1e4ddc9 100644
--- 
a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/EventDeadLettersIntegrationTest.java
+++ 
b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/EventDeadLettersIntegrationTest.java
@@ -56,7 +56,6 @@ import org.eclipse.jetty.http.HttpStatus;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
diff --git 
a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/EnqueuedItemTest.java
 
b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/EnqueuedItemTest.java
index 6f97456..a3a205a 100644
--- 
a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/EnqueuedItemTest.java
+++ 
b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/EnqueuedItemTest.java
@@ -21,6 +21,9 @@ package org.apache.james.queue.rabbitmq;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import java.time.Instant;
+import javax.mail.MessagingException;
+
 import org.apache.james.blob.api.HashBlobId;
 import org.apache.james.blob.mail.MimeMessagePartsId;
 import org.apache.mailet.Mail;
@@ -29,9 +32,6 @@ import org.junit.jupiter.api.Test;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
 
-import javax.mail.MessagingException;
-import java.time.Instant;
-
 class EnqueuedItemTest {
 
     private MailQueueName mailQueueName;
diff --git 
a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/EnqueuedMailsDaoUtilTest.java
 
b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/EnqueuedMailsDaoUtilTest.java
index bde0c0d..d75e737 100644
--- 
a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/EnqueuedMailsDaoUtilTest.java
+++ 
b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/EnqueuedMailsDaoUtilTest.java
@@ -26,7 +26,8 @@ import java.nio.charset.StandardCharsets;
 
 import org.apache.mailet.Attribute;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
+
+import com.google.common.collect.ImmutableMap;
 
 class EnqueuedMailsDaoUtilTest {
 
diff --git 
a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/DTOTest.java
 
b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/DTOTest.java
index b277995..4bf2658 100644
--- 
a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/DTOTest.java
+++ 
b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/DTOTest.java
@@ -42,7 +42,7 @@ class DTOTest {
     private static final Duration SLICE_WINDOW = Duration.ofHours(1);
     private static final String CONFIGURATION_AGGREGATE_KEY = "aggKey";
 
-    private final ConfigurationChangedDTO CONFIGURATION_CHANGED_DTO = new 
ConfigurationChangedDTO(
+    private static final ConfigurationChangedDTO CONFIGURATION_CHANGED_DTO = 
new ConfigurationChangedDTO(
         EVENT_ID, CONFIGURATION_AGGREGATE_KEY, TYPE_NAME, BUCKET_COUNT, 
UPDATE_PACE, SLICE_WINDOW);
 
     private static final String CONFIGURATION_CHANGED_DTO_JSON = 
getSystemResourceAsString(
diff --git 
a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/model/EnqueuedItemWithSlicingContextTest.java
 
b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/model/EnqueuedItemWithSlicingContextTest.java
index e81ad5d..5eb63a1 100644
--- 
a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/model/EnqueuedItemWithSlicingContextTest.java
+++ 
b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/model/EnqueuedItemWithSlicingContextTest.java
@@ -21,6 +21,9 @@ package org.apache.james.queue.rabbitmq.view.cassandra.model;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import java.time.Instant;
+import javax.mail.MessagingException;
+
 import org.apache.james.blob.api.HashBlobId;
 import org.apache.james.blob.mail.MimeMessagePartsId;
 import org.apache.james.queue.rabbitmq.EnqueuedItem;
@@ -30,9 +33,6 @@ import org.junit.jupiter.api.Test;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
 
-import javax.mail.MessagingException;
-import java.time.Instant;
-
 class EnqueuedItemWithSlicingContextTest {
 
     private EnqueuedItem enqueuedItem;


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

Reply via email to