JAMES-2541 use Duration in ConcurrentTestRunner
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/99329eec Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/99329eec Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/99329eec Branch: refs/heads/master Commit: 99329eecffbe6b074f8b4414a3c8b6749a98ba13 Parents: 7134fcf Author: Matthieu Baechler <[email protected]> Authored: Tue Sep 11 15:43:32 2018 +0200 Committer: Benoit Tellier <[email protected]> Committed: Thu Oct 4 15:12:08 2018 +0700 ---------------------------------------------------------------------- .../james/mailbox/MailboxManagerTest.java | 4 +-- .../CassandraMailboxMapperConcurrencyTest.java | 6 ++--- .../QuotaThresholdMailingIntegrationTest.java | 4 +-- .../store/mail/model/MessageIdMapperTest.java | 6 ++--- .../store/mail/model/MessageMapperTest.java | 6 ++--- .../mailbox/tika/CachingTextExtractorTest.java | 4 +-- .../processor/base/UidMsnConverterTest.java | 8 +++--- .../protocols/smtp/AbstractSMTPServerTest.java | 3 ++- .../util/concurrency/ConcurrentTestRunner.java | 13 +++++----- .../concurrency/ConcurrentTestRunnerTest.java | 27 ++++++++++---------- .../api/MailRepositoryUrlStoreContract.java | 6 ++--- .../memory/MemoryMailRepositoryStoreTest.java | 4 +-- .../mailets/delivery/MailboxAppenderTest.java | 4 +-- .../mailrepository/MailRepositoryContract.java | 4 +-- .../org/apache/james/jmap/ProvisioningTest.java | 4 +-- .../DefaultMailboxesProvisioningFilterTest.java | 4 +-- ...ltMailboxesProvisioningFilterThreadTest.java | 4 +-- .../jmap/UserProvisioningFilterThreadTest.java | 4 +-- .../james/queue/api/MailQueueContract.java | 3 ++- 19 files changed, 61 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/99329eec/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 1108237..8ad168e 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 @@ -24,9 +24,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; +import java.time.Duration; import java.util.List; import java.util.Optional; -import java.util.concurrent.TimeUnit; import javax.mail.Flags; @@ -983,7 +983,7 @@ public abstract class MailboxManagerTest { ConcurrentTestRunner.builder() .operation((a, b) -> mailboxManager.createMailbox(MailboxPath.forUser(USER_1, mailboxName + a), session)) .threadCount(10) - .runSuccessfullyWithin(1, TimeUnit.MINUTES); + .runSuccessfullyWithin(Duration.ofMinutes(1)); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/99329eec/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java index 997dcf5..5055960 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java @@ -21,8 +21,8 @@ package org.apache.james.mailbox.cassandra.mail; import static org.assertj.core.api.Assertions.assertThat; +import java.time.Duration; import java.util.List; -import java.util.concurrent.TimeUnit; import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.backends.cassandra.CassandraClusterExtension; @@ -65,7 +65,7 @@ class CassandraMailboxMapperConcurrencyTest { .operation((a, b) -> testee.save(new SimpleMailbox(MAILBOX_PATH, UID_VALIDITY))) .threadCount(THREAD_COUNT) .operationCount(OPERATION_COUNT) - .runSuccessfullyWithin(1, TimeUnit.MINUTES); + .runSuccessfullyWithin(Duration.ofMinutes(1)); assertThat(testee.list()).hasSize(1); } @@ -81,7 +81,7 @@ class CassandraMailboxMapperConcurrencyTest { .operation((a, b) -> testee.save(mailbox)) .threadCount(THREAD_COUNT) .operationCount(OPERATION_COUNT) - .runSuccessfullyWithin(1, TimeUnit.MINUTES); + .runSuccessfullyWithin(Duration.ofMinutes(1)); List<Mailbox> list = testee.list(); assertThat(list).hasSize(1); http://git-wip-us.apache.org/repos/asf/james-project/blob/99329eec/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdMailingIntegrationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdMailingIntegrationTest.java b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdMailingIntegrationTest.java index 7a825e5..0409a45 100644 --- a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdMailingIntegrationTest.java +++ b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdMailingIntegrationTest.java @@ -35,7 +35,7 @@ import static org.apache.james.mailbox.quota.model.QuotaThresholdFixture._80; import static org.apache.james.mailbox.quota.model.QuotaThresholdFixture.mailetContext; import static org.assertj.core.api.Assertions.assertThat; -import java.util.concurrent.TimeUnit; +import java.time.Duration; import org.apache.james.eventsourcing.eventstore.EventStore; import org.apache.james.mailbox.MailboxListener.QuotaUsageUpdatedEvent; @@ -214,7 +214,7 @@ public interface QuotaThresholdMailingIntegrationTest { ConcurrentTestRunner.builder() .operation((threadNb, step) -> testee.event(new QuotaUsageUpdatedEvent(BOB_SESSION, QUOTAROOT, Counts._40_PERCENT, Sizes._55_PERCENT, NOW))) .threadCount(10) - .runSuccessfullyWithin(1, TimeUnit.MINUTES); + .runSuccessfullyWithin(Duration.ofMinutes(1)); assertThat(mailetContext.getSentMails()) .hasSize(1); http://git-wip-us.apache.org/repos/asf/james-project/blob/99329eec/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java index 32e8766..9fa5fe2 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java @@ -21,10 +21,10 @@ package org.apache.james.mailbox.store.mail.model; import static org.assertj.core.api.Assertions.assertThat; +import java.time.Duration; import java.util.Date; import java.util.List; import java.util.Map; -import java.util.concurrent.TimeUnit; import javax.mail.Flags; import javax.mail.Flags.Flag; @@ -684,7 +684,7 @@ public abstract class MessageIdMapperTest { FlagsUpdateMode.ADD)) .threadCount(threadCount) .operationCount(updateCount) - .runSuccessfullyWithin(1, TimeUnit.MINUTES); + .runSuccessfullyWithin(Duration.ofMinutes(1)); List<MailboxMessage> messages = sut.find(ImmutableList.of(message1.getMessageId()), MessageMapper.FetchType.Body); assertThat(messages).hasSize(1); @@ -716,7 +716,7 @@ public abstract class MessageIdMapperTest { }) .threadCount(threadCount) .operationCount(updateCount) - .runSuccessfullyWithin(1, TimeUnit.MINUTES); + .runSuccessfullyWithin(Duration.ofMinutes(1)); List<MailboxMessage> messages = sut.find(ImmutableList.of(message1.getMessageId()), MessageMapper.FetchType.Body); assertThat(messages).hasSize(1); http://git-wip-us.apache.org/repos/asf/james-project/blob/99329eec/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java index 2bb2a8e..1f6bc64 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java @@ -25,11 +25,11 @@ import static org.apache.james.mailbox.store.mail.model.MessageAssert.assertThat import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; +import java.time.Duration; import java.util.Date; import java.util.Iterator; import java.util.Map; import java.util.Optional; -import java.util.concurrent.TimeUnit; import javax.mail.Flags; import javax.mail.Flags.Flag; @@ -802,7 +802,7 @@ public abstract class MessageMapperTest { MessageRange.one(message1.getUid()))) .threadCount(threadCount) .operationCount(updateCount) - .runSuccessfullyWithin(1, TimeUnit.MINUTES); + .runSuccessfullyWithin(Duration.ofMinutes(1)); Iterator<MailboxMessage> messages = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(message1.getUid()), FetchType.Metadata, 1); @@ -832,7 +832,7 @@ public abstract class MessageMapperTest { }) .threadCount(threadCount) .operationCount(updateCount) - .runSuccessfullyWithin(1, TimeUnit.MINUTES); + .runSuccessfullyWithin(Duration.ofMinutes(1)); Iterator<MailboxMessage> messages = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(message1.getUid()), FetchType.Metadata, 1); http://git-wip-us.apache.org/repos/asf/james-project/blob/99329eec/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/CachingTextExtractorTest.java ---------------------------------------------------------------------- diff --git a/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/CachingTextExtractorTest.java b/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/CachingTextExtractorTest.java index 2b0beb4..e7ee6d6 100644 --- a/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/CachingTextExtractorTest.java +++ b/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/CachingTextExtractorTest.java @@ -34,8 +34,8 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; +import java.time.Duration; import java.util.Optional; -import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.IntStream; @@ -188,7 +188,7 @@ public class CachingTextExtractorTest { ConcurrentTestRunner.builder() .operation((a, b) -> textExtractor.extractContent(INPUT_STREAM.get(), CONTENT_TYPE)) .threadCount(10) - .runSuccessfullyWithin(1, TimeUnit.MINUTES); + .runSuccessfullyWithin(Duration.ofMinutes(1)); verify(wrappedTextExtractor, times(1)).extractContent(any(), any()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/99329eec/protocols/imap/src/test/java/org/apache/james/imap/processor/base/UidMsnConverterTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/UidMsnConverterTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/UidMsnConverterTest.java index 44f82ea..aeccff3 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/UidMsnConverterTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/UidMsnConverterTest.java @@ -21,8 +21,8 @@ package org.apache.james.imap.processor.base; import static org.assertj.core.api.Assertions.assertThat; +import java.time.Duration; import java.util.Map; -import java.util.concurrent.TimeUnit; import org.apache.james.mailbox.MessageUid; import org.apache.james.util.concurrency.ConcurrentTestRunner; @@ -380,7 +380,7 @@ public class UidMsnConverterTest { }) .threadCount(2) .operationCount(initialCount) - .runSuccessfullyWithin(10, TimeUnit.SECONDS); + .runSuccessfullyWithin(Duration.ofSeconds(10)); ImmutableMap.Builder<Integer, MessageUid> resultBuilder = ImmutableMap.builder(); for (int i = 1; i <= initialCount; i++) { @@ -399,7 +399,7 @@ public class UidMsnConverterTest { .operation((threadNumber, step) -> testee.addUid(MessageUid.of((threadNumber * operationCount) + (step + 1)))) .threadCount(threadCount) .operationCount(operationCount) - .runSuccessfullyWithin(10, TimeUnit.SECONDS); + .runSuccessfullyWithin(Duration.ofSeconds(10)); ImmutableMap.Builder<Integer, MessageUid> resultBuilder = ImmutableMap.builder(); for (int i = 1; i <= threadCount * operationCount; i++) { @@ -421,7 +421,7 @@ public class UidMsnConverterTest { .operation((threadNumber, step) -> testee.remove(MessageUid.of((threadNumber * operationCount) + (step + 1)))) .threadCount(threadCount) .operationCount(operationCount) - .runSuccessfullyWithin(10, TimeUnit.SECONDS); + .runSuccessfullyWithin(Duration.ofSeconds(10)); ImmutableMap.Builder<Integer, MessageUid> resultBuilder = ImmutableMap.builder(); for (int i = 1; i <= operationCount; i++) { http://git-wip-us.apache.org/repos/asf/james-project/blob/99329eec/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java index d62cfea..40e4a88 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java @@ -26,6 +26,7 @@ import java.io.InputStreamReader; import java.net.InetSocketAddress; import java.net.SocketException; import java.nio.charset.StandardCharsets; +import java.time.Duration; import java.util.Arrays; import java.util.Iterator; import java.util.List; @@ -106,7 +107,7 @@ public abstract class AbstractSMTPServerTest { ConcurrentTestRunner.builder() .operation((threadNumber, step) -> send(finalServer, bindedAddress, mailContent)) .threadCount(4) - .runSuccessfullyWithin(1, TimeUnit.MINUTES); + .runSuccessfullyWithin(Duration.ofMinutes(1)); Iterator<MailEnvelope> queued = hook.getQueued().iterator(); assertThat(queued.hasNext()).isTrue(); http://git-wip-us.apache.org/repos/asf/james-project/blob/99329eec/server/container/util/src/main/java/org/apache/james/util/concurrency/ConcurrentTestRunner.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/concurrency/ConcurrentTestRunner.java b/server/container/util/src/main/java/org/apache/james/util/concurrency/ConcurrentTestRunner.java index b0d474e..9ceefbb 100644 --- a/server/container/util/src/main/java/org/apache/james/util/concurrency/ConcurrentTestRunner.java +++ b/server/container/util/src/main/java/org/apache/james/util/concurrency/ConcurrentTestRunner.java @@ -19,6 +19,7 @@ package org.apache.james.util.concurrency; +import java.time.Duration; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -75,9 +76,9 @@ public class ConcurrentTestRunner { operation); } - public ConcurrentTestRunner runSuccessfullyWithin(long time, TimeUnit unit) throws InterruptedException, ExecutionException { + public ConcurrentTestRunner runSuccessfullyWithin(Duration duration) throws InterruptedException, ExecutionException { return build() - .runSuccessfullyWithin(time, unit); + .runSuccessfullyWithin(duration); } } @@ -153,18 +154,18 @@ public class ConcurrentTestRunner { return this; } - public ConcurrentTestRunner awaitTermination(long time, TimeUnit unit) throws InterruptedException { + public ConcurrentTestRunner awaitTermination(Duration duration) throws InterruptedException { executorService.shutdown(); - boolean terminated = executorService.awaitTermination(time, unit); + boolean terminated = executorService.awaitTermination(duration.toMillis(), TimeUnit.MILLISECONDS); if (!terminated) { throw new NotTerminatedException(); } return this; } - public ConcurrentTestRunner runSuccessfullyWithin(long time, TimeUnit unit) throws InterruptedException, ExecutionException { + public ConcurrentTestRunner runSuccessfullyWithin(Duration duration) throws InterruptedException, ExecutionException { return run() - .awaitTermination(time, unit) + .awaitTermination(duration) .assertNoException(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/99329eec/server/container/util/src/test/java/org/apache/james/util/concurrency/ConcurrentTestRunnerTest.java ---------------------------------------------------------------------- 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 3e9902f..9789ba6 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 @@ -23,6 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import java.time.Duration; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; @@ -31,7 +32,7 @@ import org.junit.Test; public class ConcurrentTestRunnerTest { public static final ConcurrentTestRunner.ConcurrentOperation NOOP = (threadNumber, step) -> { }; - public static final int DEFAULT_AWAIT_TIME = 100; + public static final Duration DEFAULT_AWAIT_TIME = Duration.ofMillis(100); @Test public void constructorShouldThrowOnNegativeThreadCount() { @@ -39,7 +40,7 @@ public class ConcurrentTestRunnerTest { ConcurrentTestRunner.builder() .operation(NOOP) .threadCount(-1) - .runSuccessfullyWithin(1, TimeUnit.SECONDS)) + .runSuccessfullyWithin(DEFAULT_AWAIT_TIME)) .isInstanceOf(IllegalArgumentException.class); } @@ -59,7 +60,7 @@ public class ConcurrentTestRunnerTest { ConcurrentTestRunner.builder() .operation(NOOP) .threadCount(0) - .runSuccessfullyWithin(DEFAULT_AWAIT_TIME, TimeUnit.MILLISECONDS)) + .runSuccessfullyWithin(DEFAULT_AWAIT_TIME)) .isInstanceOf(IllegalArgumentException.class); } @@ -79,7 +80,7 @@ public class ConcurrentTestRunnerTest { ConcurrentTestRunner.builder() .operation(null) .threadCount(1) - .runSuccessfullyWithin(DEFAULT_AWAIT_TIME, TimeUnit.MILLISECONDS)) + .runSuccessfullyWithin(DEFAULT_AWAIT_TIME)) .isInstanceOf(NullPointerException.class); } @@ -88,7 +89,7 @@ public class ConcurrentTestRunnerTest { assertThatCode(() -> ConcurrentTestRunner.builder() .operation(NOOP) .threadCount(1) - .runSuccessfullyWithin(DEFAULT_AWAIT_TIME, TimeUnit.MILLISECONDS)) + .runSuccessfullyWithin(DEFAULT_AWAIT_TIME)) .doesNotThrowAnyException(); } @@ -97,7 +98,7 @@ public class ConcurrentTestRunnerTest { assertThatThrownBy(() -> ConcurrentTestRunner.builder() .operation((threadNumber, step) -> Thread.sleep(50)) .threadCount(1) - .runSuccessfullyWithin(25, TimeUnit.MILLISECONDS)) + .runSuccessfullyWithin(Duration.ofMillis(25))) .isInstanceOf(ConcurrentTestRunner.NotTerminatedException.class); } @@ -109,7 +110,7 @@ public class ConcurrentTestRunnerTest { .operation((threadNumber, step) -> queue.add(threadNumber + ":" + step)) .threadCount(2) .operationCount(2) - .runSuccessfullyWithin(DEFAULT_AWAIT_TIME, TimeUnit.MILLISECONDS)) + .runSuccessfullyWithin(DEFAULT_AWAIT_TIME)) .doesNotThrowAnyException(); assertThat(queue).containsOnly("0:0", "0:1", "1:0", "1:1"); @@ -122,7 +123,7 @@ public class ConcurrentTestRunnerTest { assertThatCode(() -> ConcurrentTestRunner.builder() .operation((threadNumber, step) -> queue.add(threadNumber + ":" + step)) .threadCount(2) - .runSuccessfullyWithin(DEFAULT_AWAIT_TIME, TimeUnit.MILLISECONDS)) + .runSuccessfullyWithin(DEFAULT_AWAIT_TIME)) .doesNotThrowAnyException(); } @@ -134,7 +135,7 @@ public class ConcurrentTestRunnerTest { }) .threadCount(2) .operationCount(2) - .runSuccessfullyWithin(DEFAULT_AWAIT_TIME, TimeUnit.MILLISECONDS)) + .runSuccessfullyWithin(DEFAULT_AWAIT_TIME)) .doesNotThrowAnyException(); } @@ -144,7 +145,7 @@ public class ConcurrentTestRunnerTest { .operation(NOOP) .threadCount(2) .operationCount(2) - .runSuccessfullyWithin(DEFAULT_AWAIT_TIME, TimeUnit.MILLISECONDS) + .runSuccessfullyWithin(DEFAULT_AWAIT_TIME) .assertNoException(); } @@ -157,7 +158,7 @@ public class ConcurrentTestRunnerTest { }) .threadCount(2) .operationCount(2) - .runSuccessfullyWithin(DEFAULT_AWAIT_TIME, TimeUnit.MILLISECONDS) + .runSuccessfullyWithin(DEFAULT_AWAIT_TIME) .assertNoException()) .isInstanceOf(ExecutionException.class); } @@ -173,7 +174,7 @@ public class ConcurrentTestRunnerTest { }) .threadCount(2) .operationCount(2) - .runSuccessfullyWithin(DEFAULT_AWAIT_TIME, TimeUnit.MILLISECONDS)) + .runSuccessfullyWithin(DEFAULT_AWAIT_TIME)) .doesNotThrowAnyException(); assertThat(queue).containsOnly("0:0", "0:1", "1:0", "1:1"); @@ -192,7 +193,7 @@ public class ConcurrentTestRunnerTest { }) .threadCount(2) .operationCount(2) - .runSuccessfullyWithin(DEFAULT_AWAIT_TIME, TimeUnit.MILLISECONDS)) + .runSuccessfullyWithin(DEFAULT_AWAIT_TIME)) .doesNotThrowAnyException(); assertThat(queue).containsOnly("0:0", "0:1", "1:0", "1:1"); http://git-wip-us.apache.org/repos/asf/james-project/blob/99329eec/server/data/data-api/src/test/java/org/apache/james/mailrepository/api/MailRepositoryUrlStoreContract.java ---------------------------------------------------------------------- diff --git a/server/data/data-api/src/test/java/org/apache/james/mailrepository/api/MailRepositoryUrlStoreContract.java b/server/data/data-api/src/test/java/org/apache/james/mailrepository/api/MailRepositoryUrlStoreContract.java index a476e20..89fce77 100644 --- a/server/data/data-api/src/test/java/org/apache/james/mailrepository/api/MailRepositoryUrlStoreContract.java +++ b/server/data/data-api/src/test/java/org/apache/james/mailrepository/api/MailRepositoryUrlStoreContract.java @@ -21,7 +21,7 @@ package org.apache.james.mailrepository.api; import static org.assertj.core.api.Assertions.assertThat; -import java.util.concurrent.TimeUnit; +import java.time.Duration; import org.apache.james.util.concurrency.ConcurrentTestRunner; import org.junit.jupiter.api.Test; @@ -79,7 +79,7 @@ public interface MailRepositoryUrlStoreContract { .operation((a, b) -> store.add(MailRepositoryUrl.from("proto://" + a + "/" + b))) .threadCount(threadCount) .operationCount(operationCount) - .runSuccessfullyWithin(1, TimeUnit.MINUTES); + .runSuccessfullyWithin(Duration.ofMinutes(1)); assertThat(store.listDistinct()).hasSize(threadCount * operationCount); } @@ -92,7 +92,7 @@ public interface MailRepositoryUrlStoreContract { .operation((a, b) -> store.add(MailRepositoryUrl.from("proto://" + b))) .threadCount(10) .operationCount(operationCount) - .runSuccessfullyWithin(1, TimeUnit.MINUTES); + .runSuccessfullyWithin(Duration.ofMinutes(1)); assertThat(store.listDistinct()).hasSize(operationCount); } http://git-wip-us.apache.org/repos/asf/james-project/blob/99329eec/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MemoryMailRepositoryStoreTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MemoryMailRepositoryStoreTest.java b/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MemoryMailRepositoryStoreTest.java index 5bbd308..f92c93e 100644 --- a/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MemoryMailRepositoryStoreTest.java +++ b/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MemoryMailRepositoryStoreTest.java @@ -22,7 +22,7 @@ package org.apache.james.mailrepository.memory; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import java.util.concurrent.TimeUnit; +import java.time.Duration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; @@ -239,7 +239,7 @@ public class MemoryMailRepositoryStoreTest { .setText("Any body")) .build())) .threadCount(10) - .runSuccessfullyWithin(1, TimeUnit.MINUTES); + .runSuccessfullyWithin(Duration.ofMinutes(1)); long actualSize = repositoryStore.get(url).get().size(); http://git-wip-us.apache.org/repos/asf/james-project/blob/99329eec/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java index ae56e62..2d016b1 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java @@ -22,7 +22,7 @@ package org.apache.james.transport.mailets.delivery; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import java.util.concurrent.TimeUnit; +import java.time.Duration; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; @@ -130,6 +130,6 @@ public class MailboxAppenderTest { ConcurrentTestRunner.builder() .operation((a, b) -> testee.append(mimeMessage, USER, FOLDER + "/any")) .threadCount(100) - .runSuccessfullyWithin(1, TimeUnit.MINUTES); + .runSuccessfullyWithin(Duration.ofMinutes(1)); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/99329eec/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/MailRepositoryContract.java ---------------------------------------------------------------------- diff --git a/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/MailRepositoryContract.java b/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/MailRepositoryContract.java index 20b0884..4de1de8 100644 --- a/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/MailRepositoryContract.java +++ b/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/MailRepositoryContract.java @@ -23,11 +23,11 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.SoftAssertions.assertSoftly; import java.nio.charset.StandardCharsets; +import java.time.Duration; import java.util.Date; import java.util.List; import java.util.Random; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.TimeUnit; import java.util.stream.IntStream; import javax.mail.MessagingException; @@ -455,7 +455,7 @@ public interface MailRepositoryContract { .operation((a, b) -> distribution.sample().run()) .threadCount(10) .operationCount(10) - .runSuccessfullyWithin(1, TimeUnit.MINUTES); + .runSuccessfullyWithin(Duration.ofMinutes(1)); assertThat(testee.list()).containsOnlyElementsOf(expectedResult); } http://git-wip-us.apache.org/repos/asf/james-project/blob/99329eec/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java index e2f3f74..d977042 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.hasSize; import java.io.IOException; -import java.util.concurrent.TimeUnit; +import java.time.Duration; import org.apache.james.GuiceJamesServer; import org.apache.james.mailbox.DefaultMailboxes; @@ -84,7 +84,7 @@ public abstract class ProvisioningTest { .body("[[\"getMailboxes\", {}, \"#0\"]]") .post("/jmap")) .threadCount(10) - .runSuccessfullyWithin(1, TimeUnit.MINUTES); + .runSuccessfullyWithin(Duration.ofMinutes(1)); given() .header("Authorization", token) http://git-wip-us.apache.org/repos/asf/james-project/blob/99329eec/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterTest.java index 6db411a..ab88f63 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterTest.java @@ -20,7 +20,7 @@ package org.apache.james.jmap; import static org.assertj.core.api.Assertions.assertThat; -import java.util.concurrent.TimeUnit; +import java.time.Duration; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.MailboxSession; @@ -92,7 +92,7 @@ public class DefaultMailboxesProvisioningFilterTest { ConcurrentTestRunner.builder() .operation((threadNumber, step) -> testee.createMailboxesIfNeeded(session)) .threadCount(10) - .runSuccessfullyWithin(10, TimeUnit.SECONDS); + .runSuccessfullyWithin(Duration.ofSeconds(10)); assertThat(mailboxManager.list(session)) .containsOnlyElementsOf(DefaultMailboxes.DEFAULT_MAILBOXES http://git-wip-us.apache.org/repos/asf/james-project/blob/99329eec/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java index 90f1350..46f2ef1 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import java.time.Duration; import java.util.Optional; -import java.util.concurrent.TimeUnit; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; @@ -68,6 +68,6 @@ public class DefaultMailboxesProvisioningFilterThreadTest { .builder() .operation((threadNumber, step) -> sut.createMailboxesIfNeeded(session)) .threadCount(2) - .runSuccessfullyWithin(1, TimeUnit.MINUTES); + .runSuccessfullyWithin(Duration.ofMinutes(1)); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/99329eec/server/protocols/jmap/src/test/java/org/apache/james/jmap/UserProvisioningFilterThreadTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/UserProvisioningFilterThreadTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/UserProvisioningFilterThreadTest.java index f41515c..19389e8 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/UserProvisioningFilterThreadTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/UserProvisioningFilterThreadTest.java @@ -18,8 +18,8 @@ ****************************************************************/ package org.apache.james.jmap; +import java.time.Duration; import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.mock.MockMailboxSession; @@ -48,7 +48,7 @@ public class UserProvisioningFilterThreadTest { .builder() .operation((threadNumber, step) -> sut.createAccountIfNeeded(session)) .threadCount(2) - .runSuccessfullyWithin(1, TimeUnit.MINUTES); + .runSuccessfullyWithin(Duration.ofMinutes(1)); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/99329eec/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueContract.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueContract.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueContract.java index d55a986..a2b6405 100644 --- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueContract.java +++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueContract.java @@ -29,6 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.io.Serializable; +import java.time.Duration; import java.util.Date; import java.util.Objects; import java.util.concurrent.ConcurrentLinkedDeque; @@ -368,7 +369,7 @@ public interface MailQueueContract { }) .threadCount(threadCount) .operationCount(operationCount) - .runSuccessfullyWithin(1, TimeUnit.MINUTES); + .runSuccessfullyWithin(Duration.ofMinutes(1)); assertThat( dequeuedMails.stream() --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
