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 40a00cbd695643a15636e48924fd38996c46dc60 Author: Rene Cordier <[email protected]> AuthorDate: Tue Nov 19 17:04:55 2019 +0700 [Refactoring] Refactor james-server-util test classes with correct access modifiers --- .../org/apache/james/util/BodyOffsetInputStreamTest.java | 2 +- .../java/org/apache/james/util/CommutativityCheckerTest.java | 2 +- .../src/test/java/org/apache/james/util/GuavaUtilsTest.java | 2 +- .../util/src/test/java/org/apache/james/util/HostTest.java | 2 +- .../test/java/org/apache/james/util/IteratorWrapperTest.java | 2 +- .../test/java/org/apache/james/util/LoggingLevelTest.java | 12 ++++++------ .../src/test/java/org/apache/james/util/MDCBuilderTest.java | 2 +- .../test/java/org/apache/james/util/OptionalUtilsTest.java | 4 ++-- .../util/src/test/java/org/apache/james/util/PortTest.java | 2 +- .../src/test/java/org/apache/james/util/SizeFormatTest.java | 2 +- .../util/src/test/java/org/apache/james/util/SizeTest.java | 2 +- .../src/test/java/org/apache/james/util/StreamUtilsTest.java | 2 +- .../src/test/java/org/apache/james/util/ValuePatchTest.java | 10 +++++----- .../james/util/concurrency/ConcurrentTestRunnerTest.java | 6 +++--- .../apache/james/util/date/ImapDateTimeFormatterTest.java | 2 +- .../apache/james/util/mime/MessageContentExtractorTest.java | 2 +- .../apache/james/util/retry/DoublingRetryScheduleTest.java | 2 +- .../apache/james/util/retry/ExceptionRetryHandlerTest.java | 2 +- .../util/retry/naming/NamingExceptionRetryHandlerTest.java | 2 +- .../apache/james/util/streams/ImmutableCollectorsTest.java | 2 +- .../java/org/apache/james/util/streams/IteratorsTest.java | 2 +- .../test/java/org/apache/james/util/streams/LimitTest.java | 2 +- .../test/java/org/apache/james/util/streams/OffsetTest.java | 2 +- 23 files changed, 35 insertions(+), 35 deletions(-) diff --git a/server/container/util/src/test/java/org/apache/james/util/BodyOffsetInputStreamTest.java b/server/container/util/src/test/java/org/apache/james/util/BodyOffsetInputStreamTest.java index cf3a09e..de5ca13 100644 --- a/server/container/util/src/test/java/org/apache/james/util/BodyOffsetInputStreamTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/BodyOffsetInputStreamTest.java @@ -25,7 +25,7 @@ import java.io.IOException; import org.junit.jupiter.api.Test; -public class BodyOffsetInputStreamTest { +class BodyOffsetInputStreamTest { private String mail = "Subject: test\r\n\r\nbody"; private long expectedOffset = 17; private long bytes = mail.length(); diff --git a/server/container/util/src/test/java/org/apache/james/util/CommutativityCheckerTest.java b/server/container/util/src/test/java/org/apache/james/util/CommutativityCheckerTest.java index 3561c0a..7b999bb 100644 --- a/server/container/util/src/test/java/org/apache/james/util/CommutativityCheckerTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/CommutativityCheckerTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; import com.google.common.collect.ImmutableSet; -public class CommutativityCheckerTest { +class CommutativityCheckerTest { @Test void constructorShouldThrowWhenNullValuesToTest() { BinaryOperator<Integer> binaryOperator = (a, b) -> a * a + b; diff --git a/server/container/util/src/test/java/org/apache/james/util/GuavaUtilsTest.java b/server/container/util/src/test/java/org/apache/james/util/GuavaUtilsTest.java index 5b2ec4d..6943b63 100644 --- a/server/container/util/src/test/java/org/apache/james/util/GuavaUtilsTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/GuavaUtilsTest.java @@ -29,7 +29,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; -public class GuavaUtilsTest { +class GuavaUtilsTest { @Test void toMultimapShouldAcceptEmptyMaps() { diff --git a/server/container/util/src/test/java/org/apache/james/util/HostTest.java b/server/container/util/src/test/java/org/apache/james/util/HostTest.java index 2052b5e..290b3e4 100644 --- a/server/container/util/src/test/java/org/apache/james/util/HostTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/HostTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; import nl.jqno.equalsverifier.EqualsVerifier; -public class HostTest { +class HostTest { private static final int DEFAULT_PORT = 154; diff --git a/server/container/util/src/test/java/org/apache/james/util/IteratorWrapperTest.java b/server/container/util/src/test/java/org/apache/james/util/IteratorWrapperTest.java index 687f7b7..44a9714 100644 --- a/server/container/util/src/test/java/org/apache/james/util/IteratorWrapperTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/IteratorWrapperTest.java @@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test; import com.google.common.collect.ImmutableList; -public class IteratorWrapperTest { +class IteratorWrapperTest { @Test void getEntriesSeenShouldReturnEmptyWhenNotConsumed() { diff --git a/server/container/util/src/test/java/org/apache/james/util/LoggingLevelTest.java b/server/container/util/src/test/java/org/apache/james/util/LoggingLevelTest.java index dfb5fc0..e6f3060 100644 --- a/server/container/util/src/test/java/org/apache/james/util/LoggingLevelTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/LoggingLevelTest.java @@ -25,37 +25,37 @@ import static org.mockito.Mockito.verify; import org.junit.jupiter.api.Test; import org.slf4j.Logger; -public class LoggingLevelTest { +class LoggingLevelTest { @Test - public void formatShouldCallDebugWhenDebugLevelIsGiven() { + void formatShouldCallDebugWhenDebugLevelIsGiven() { Logger logger = mock(Logger.class); LoggingLevel.DEBUG.format(logger, "easy as {} {} {}", 1, 2.0, "3"); verify(logger).debug("easy as {} {} {}", 1, 2.0, "3"); } @Test - public void formatShouldCallErrorWhenErrorLevelIsGiven() { + void formatShouldCallErrorWhenErrorLevelIsGiven() { Logger logger = mock(Logger.class); LoggingLevel.ERROR.format(logger, "easy as {} {} {}", 1, 2.0, "3"); verify(logger).error("easy as {} {} {}", 1, 2.0, "3"); } @Test - public void formatShouldCallInfoWhenInfoLevelIsGiven() { + void formatShouldCallInfoWhenInfoLevelIsGiven() { Logger logger = mock(Logger.class); LoggingLevel.INFO.format(logger, "easy as {} {} {}", 1, 2.0, "3"); verify(logger).info("easy as {} {} {}", 1, 2.0, "3"); } @Test - public void formatShouldCallTraceWhenTraceLevelIsGiven() { + void formatShouldCallTraceWhenTraceLevelIsGiven() { Logger logger = mock(Logger.class); LoggingLevel.TRACE.format(logger, "easy as {} {} {}", 1, 2.0, "3"); verify(logger).trace("easy as {} {} {}", 1, 2.0, "3"); } @Test - public void formatShouldCallWarningWhenWarningLevelIsGiven() { + void formatShouldCallWarningWhenWarningLevelIsGiven() { Logger logger = mock(Logger.class); LoggingLevel.WARNING.format(logger, "easy as {} {} {}", 1, 2.0, "3"); verify(logger).warn("easy as {} {} {}", 1, 2.0, "3"); diff --git a/server/container/util/src/test/java/org/apache/james/util/MDCBuilderTest.java b/server/container/util/src/test/java/org/apache/james/util/MDCBuilderTest.java index 02494a8..af47acb 100644 --- a/server/container/util/src/test/java/org/apache/james/util/MDCBuilderTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/MDCBuilderTest.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test; import com.google.common.collect.ImmutableList; -public class MDCBuilderTest { +class MDCBuilderTest { private static final String KEY_1 = "key1"; private static final String KEY_2 = "key2"; diff --git a/server/container/util/src/test/java/org/apache/james/util/OptionalUtilsTest.java b/server/container/util/src/test/java/org/apache/james/util/OptionalUtilsTest.java index 8d750b9..c80bafe 100644 --- a/server/container/util/src/test/java/org/apache/james/util/OptionalUtilsTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/OptionalUtilsTest.java @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.Test; -public class OptionalUtilsTest { +class OptionalUtilsTest { @Test void ifEmptyShouldPreserveValueOfEmptyOptionals() { @@ -215,7 +215,7 @@ public class OptionalUtilsTest { } @Test - void containsDifferentShouldReturnFalseWhenEmpty() throws Exception { + void containsDifferentShouldReturnFalseWhenEmpty() { assertThat(OptionalUtils.containsDifferent(Optional.empty(), "any")).isFalse(); } diff --git a/server/container/util/src/test/java/org/apache/james/util/PortTest.java b/server/container/util/src/test/java/org/apache/james/util/PortTest.java index 7e2c129..793c162 100644 --- a/server/container/util/src/test/java/org/apache/james/util/PortTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/PortTest.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.junit.jupiter.api.Test; -public class PortTest { +class PortTest { @Test void assertValidShouldThrowOnNegativePort() { assertThatThrownBy(() -> Port.assertValid(-1)) diff --git a/server/container/util/src/test/java/org/apache/james/util/SizeFormatTest.java b/server/container/util/src/test/java/org/apache/james/util/SizeFormatTest.java index ef492a4..03c5a24 100644 --- a/server/container/util/src/test/java/org/apache/james/util/SizeFormatTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/SizeFormatTest.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.junit.jupiter.api.Test; -public class SizeFormatTest { +class SizeFormatTest { @Test void formatShouldThrowWhenNegative() { diff --git a/server/container/util/src/test/java/org/apache/james/util/SizeTest.java b/server/container/util/src/test/java/org/apache/james/util/SizeTest.java index 7afdf56..0392a63 100644 --- a/server/container/util/src/test/java/org/apache/james/util/SizeTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/SizeTest.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.junit.jupiter.api.Test; -public class SizeTest { +class SizeTest { @Test void testNoUnit() throws Exception { diff --git a/server/container/util/src/test/java/org/apache/james/util/StreamUtilsTest.java b/server/container/util/src/test/java/org/apache/james/util/StreamUtilsTest.java index 75f2526..e08ebea 100644 --- a/server/container/util/src/test/java/org/apache/james/util/StreamUtilsTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/StreamUtilsTest.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test; import com.github.steveash.guavate.Guavate; import com.google.common.collect.ImmutableList; -public class StreamUtilsTest { +class StreamUtilsTest { @Test void flattenShouldReturnEmptyWhenEmptyStreams() { diff --git a/server/container/util/src/test/java/org/apache/james/util/ValuePatchTest.java b/server/container/util/src/test/java/org/apache/james/util/ValuePatchTest.java index 07144f0..115da14 100644 --- a/server/container/util/src/test/java/org/apache/james/util/ValuePatchTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/ValuePatchTest.java @@ -27,12 +27,12 @@ import java.util.Optional; import org.junit.jupiter.api.Test; -public class ValuePatchTest { +class ValuePatchTest { - public static final int REPLACEMENT_VALUE = 24; - public static final Optional<Integer> REPLACEMENT = Optional.of(REPLACEMENT_VALUE); - public static final int VALUE = 12; - public static final Optional<Integer> OPTIONAL_OF_VALUE = Optional.of(VALUE); + private static final int REPLACEMENT_VALUE = 24; + private static final Optional<Integer> REPLACEMENT = Optional.of(REPLACEMENT_VALUE); + private static final int VALUE = 12; + private static final Optional<Integer> OPTIONAL_OF_VALUE = Optional.of(VALUE); @Test void keepShouldProduceKeptValues() { diff --git a/server/container/util/src/test/java/org/apache/james/util/concurrency/ConcurrentTestRunnerTest.java b/server/container/util/src/test/java/org/apache/james/util/concurrency/ConcurrentTestRunnerTest.java index 7a4afc0..b40077e 100644 --- a/server/container/util/src/test/java/org/apache/james/util/concurrency/ConcurrentTestRunnerTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/concurrency/ConcurrentTestRunnerTest.java @@ -32,9 +32,9 @@ import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; -public class ConcurrentTestRunnerTest { - public static final ConcurrentTestRunner.ConcurrentOperation NOOP = (threadNumber, step) -> { }; - public static final Duration DEFAULT_AWAIT_TIME = Duration.ofMillis(100); +class ConcurrentTestRunnerTest { + private static final ConcurrentTestRunner.ConcurrentOperation NOOP = (threadNumber, step) -> { }; + private static final Duration DEFAULT_AWAIT_TIME = Duration.ofMillis(100); @Test void constructorShouldThrowOnNegativeThreadCount() { diff --git a/server/container/util/src/test/java/org/apache/james/util/date/ImapDateTimeFormatterTest.java b/server/container/util/src/test/java/org/apache/james/util/date/ImapDateTimeFormatterTest.java index 41c1046..4eb9fbc 100644 --- a/server/container/util/src/test/java/org/apache/james/util/date/ImapDateTimeFormatterTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/date/ImapDateTimeFormatterTest.java @@ -29,7 +29,7 @@ import java.time.format.DateTimeParseException; import org.junit.jupiter.api.Test; -public class ImapDateTimeFormatterTest { +class ImapDateTimeFormatterTest { @Test void dayOfWeekShouldBeParsed() { diff --git a/server/container/util/src/test/java/org/apache/james/util/mime/MessageContentExtractorTest.java b/server/container/util/src/test/java/org/apache/james/util/mime/MessageContentExtractorTest.java index ecf0e5a..e622d80 100644 --- a/server/container/util/src/test/java/org/apache/james/util/mime/MessageContentExtractorTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/mime/MessageContentExtractorTest.java @@ -41,7 +41,7 @@ import org.apache.james.util.mime.MessageContentExtractor.MessageContent; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class MessageContentExtractorTest { +class MessageContentExtractorTest { private static final String BINARY_CONTENT = "binary"; private static final String TEXT_CONTENT = "text content"; private static final String HTML_CONTENT = "<b>html</b> content"; diff --git a/server/container/util/src/test/java/org/apache/james/util/retry/DoublingRetryScheduleTest.java b/server/container/util/src/test/java/org/apache/james/util/retry/DoublingRetryScheduleTest.java index ba0faf9..60f348f 100644 --- a/server/container/util/src/test/java/org/apache/james/util/retry/DoublingRetryScheduleTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/retry/DoublingRetryScheduleTest.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; import org.apache.james.util.retry.api.RetrySchedule; import org.junit.jupiter.api.Test; -public class DoublingRetryScheduleTest { +class DoublingRetryScheduleTest { @Test void testDoublingRetrySchedule() { diff --git a/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java b/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java index 07ba09d..6e96018 100644 --- a/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java @@ -32,7 +32,7 @@ import org.apache.james.util.retry.api.RetrySchedule; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class ExceptionRetryHandlerTest { +class ExceptionRetryHandlerTest { private static class TestRetryingProxy implements ExceptionRetryingProxy { @Override diff --git a/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java b/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java index 2bb357a..60ef0ad 100644 --- a/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java @@ -29,7 +29,7 @@ import org.apache.james.util.retry.api.RetryHandler; import org.apache.james.util.retry.api.RetrySchedule; import org.junit.jupiter.api.Test; -public class NamingExceptionRetryHandlerTest { +class NamingExceptionRetryHandlerTest { private static class TestRetryingProxy implements ExceptionRetryingProxy { @Override diff --git a/server/container/util/src/test/java/org/apache/james/util/streams/ImmutableCollectorsTest.java b/server/container/util/src/test/java/org/apache/james/util/streams/ImmutableCollectorsTest.java index d6f1bf2..c43ad2a 100644 --- a/server/container/util/src/test/java/org/apache/james/util/streams/ImmutableCollectorsTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/streams/ImmutableCollectorsTest.java @@ -35,7 +35,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -public class ImmutableCollectorsTest { +class ImmutableCollectorsTest { @Test void immutableListCollectorShouldReturnEmptyImmutableListWhenEmptyStream() { diff --git a/server/container/util/src/test/java/org/apache/james/util/streams/IteratorsTest.java b/server/container/util/src/test/java/org/apache/james/util/streams/IteratorsTest.java index bb01f00..06f8186 100644 --- a/server/container/util/src/test/java/org/apache/james/util/streams/IteratorsTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/streams/IteratorsTest.java @@ -31,7 +31,7 @@ import com.google.common.collect.UnmodifiableIterator; import reactor.core.publisher.Flux; -public class IteratorsTest { +class IteratorsTest { @Test void toStreamShouldReturnEmptyStreamWhenEmptyIterator() { diff --git a/server/container/util/src/test/java/org/apache/james/util/streams/LimitTest.java b/server/container/util/src/test/java/org/apache/james/util/streams/LimitTest.java index 2a1d35b..6a17cbd 100644 --- a/server/container/util/src/test/java/org/apache/james/util/streams/LimitTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/streams/LimitTest.java @@ -32,7 +32,7 @@ import com.google.common.collect.ImmutableList; import nl.jqno.equalsverifier.EqualsVerifier; -public class LimitTest { +class LimitTest { private final List<Integer> aList = ImmutableList.of(1, 2, 3, 4, 5, 6); diff --git a/server/container/util/src/test/java/org/apache/james/util/streams/OffsetTest.java b/server/container/util/src/test/java/org/apache/james/util/streams/OffsetTest.java index f62762e..780c566 100644 --- a/server/container/util/src/test/java/org/apache/james/util/streams/OffsetTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/streams/OffsetTest.java @@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test; import nl.jqno.equalsverifier.EqualsVerifier; -public class OffsetTest { +class OffsetTest { public static final int VALUE = 18; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
