MAILBOX-374 EventBusTestFixture should rely on java.time.Duration
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e255eaeb Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e255eaeb Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e255eaeb Branch: refs/heads/master Commit: e255eaeb02ee2974e1e72e7ed8141e67c81ef3fb Parents: aa452a1 Author: Benoit Tellier <btell...@linagora.com> Authored: Thu Jan 24 18:03:00 2019 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Fri Jan 25 10:33:25 2019 +0700 ---------------------------------------------------------------------- .../mailbox/events/EventBusTestFixture.java | 6 +-- .../james/mailbox/events/GroupContract.java | 30 ++++++------- .../james/mailbox/events/KeyContract.java | 46 ++++++++++---------- .../mailbox/events/RabbitMQEventBusTest.java | 16 +++---- 4 files changed, 49 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/e255eaeb/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusTestFixture.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusTestFixture.java b/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusTestFixture.java index d2f3097..e93c96c 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusTestFixture.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusTestFixture.java @@ -84,9 +84,9 @@ public interface EventBusTestFixture { MailboxListener.MailboxEvent EVENT = new MailboxListener.MailboxAdded(SESSION_ID, USER, MAILBOX_PATH, TEST_ID, EVENT_ID); MailboxListener.MailboxEvent EVENT_2 = new MailboxListener.MailboxAdded(SESSION_ID, USER, MAILBOX_PATH, TEST_ID, EVENT_ID_2); - int ONE_SECOND = 1000; - int THIRTY_SECONDS = 30 * ONE_SECOND; - int FIVE_HUNDRED_MS = 500; + java.time.Duration ONE_SECOND = java.time.Duration.ofSeconds(1); + java.time.Duration THIRTY_SECONDS = java.time.Duration.ofSeconds(30); + java.time.Duration FIVE_HUNDRED_MS = java.time.Duration.ofMillis(500); MailboxId ID_1 = TEST_ID; MailboxId ID_2 = TestId.of(24); MailboxId ID_3 = TestId.of(36); http://git-wip-us.apache.org/repos/asf/james-project/blob/e255eaeb/mailbox/api/src/test/java/org/apache/james/mailbox/events/GroupContract.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/events/GroupContract.java b/mailbox/api/src/test/java/org/apache/james/mailbox/events/GroupContract.java index aa500be..159094b 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/events/GroupContract.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/events/GroupContract.java @@ -80,7 +80,7 @@ public interface GroupContract { eventBus().register(listener, GROUP_A); - verify(listener, after(FIVE_HUNDRED_MS).never()) + verify(listener, after(FIVE_HUNDRED_MS.toMillis()).never()) .event(any()); } @@ -92,7 +92,7 @@ public interface GroupContract { eventBus().dispatch(EVENT, NO_KEYS).block(); - verify(listener, timeout(ONE_SECOND).times(1)).event(any()); + verify(listener, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); } @Test @@ -104,7 +104,7 @@ public interface GroupContract { MailboxListener.Added noopEvent = new MailboxListener.Added(MailboxSession.SessionId.of(18), User.fromUsername("bob"), MailboxPath.forUser("bob", "mailbox"), TestId.of(58), ImmutableSortedMap.of(), Event.EventId.random()); eventBus().dispatch(noopEvent, NO_KEYS).block(); - verify(listener, after(FIVE_HUNDRED_MS).never()) + verify(listener, after(FIVE_HUNDRED_MS.toMillis()).never()) .event(any()); } @@ -128,8 +128,8 @@ public interface GroupContract { eventBus().dispatch(EVENT, NO_KEYS).block(); - verify(listener, timeout(ONE_SECOND).times(1)).event(any()); - verify(listener2, timeout(ONE_SECOND).times(1)).event(any()); + verify(listener, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); + verify(listener2, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); } @Test @@ -140,7 +140,7 @@ public interface GroupContract { registration.unregister(); eventBus().dispatch(EVENT, NO_KEYS).block(); - verify(listener, after(FIVE_HUNDRED_MS).never()) + verify(listener, after(FIVE_HUNDRED_MS.toMillis()).never()) .event(any()); } @@ -186,7 +186,7 @@ public interface GroupContract { eventBus().dispatch(EVENT, NO_KEYS).block(); - verify(listener, timeout(ONE_SECOND).times(1)).event(any()); + verify(listener, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); } @Test @@ -197,7 +197,7 @@ public interface GroupContract { eventBus().dispatch(EVENT, NO_KEYS).block(); - verify(listener, timeout(ONE_SECOND).times(1)).event(any()); + verify(listener, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); } @Test @@ -225,7 +225,7 @@ public interface GroupContract { eventBus().dispatch(EVENT, NO_KEYS).block(); - verify(listener, timeout(ONE_SECOND).times(1)).event(any()); + verify(listener, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); } @Test @@ -238,8 +238,8 @@ public interface GroupContract { eventBus().dispatch(EVENT, NO_KEYS).block(); - verify(listener1, timeout(ONE_SECOND).times(1)).event(any()); - verify(listener2, timeout(ONE_SECOND).times(1)).event(any()); + verify(listener1, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); + verify(listener2, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); } } @@ -253,7 +253,7 @@ public interface GroupContract { eventBus2().dispatch(EVENT, NO_KEYS).block(); - verify(mailboxListener, timeout(ONE_SECOND).times(1)).event(any()); + verify(mailboxListener, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); } @Test @@ -265,7 +265,7 @@ public interface GroupContract { eventBus2().dispatch(EVENT, NO_KEYS).block(); - verify(mailboxListener, timeout(ONE_SECOND).times(1)).event(any()); + verify(mailboxListener, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); } @Test @@ -277,7 +277,7 @@ public interface GroupContract { eventBus2().dispatch(EVENT, NO_KEYS).block(); - verify(mailboxListener, after(FIVE_HUNDRED_MS).never()) + verify(mailboxListener, after(FIVE_HUNDRED_MS.toMillis()).never()) .event(any()); } @@ -289,7 +289,7 @@ public interface GroupContract { eventBus2().register(listener, GROUP_A); - verify(listener, after(FIVE_HUNDRED_MS).never()) + verify(listener, after(FIVE_HUNDRED_MS.toMillis()).never()) .event(any()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/e255eaeb/mailbox/api/src/test/java/org/apache/james/mailbox/events/KeyContract.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/events/KeyContract.java b/mailbox/api/src/test/java/org/apache/james/mailbox/events/KeyContract.java index 47090d0..26ece3b 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/events/KeyContract.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/events/KeyContract.java @@ -67,7 +67,7 @@ public interface KeyContract extends EventBusContract { MailboxListener.Added noopEvent = new MailboxListener.Added(MailboxSession.SessionId.of(18), User.fromUsername("bob"), MailboxPath.forUser("bob", "mailbox"), TestId.of(58), ImmutableSortedMap.of(), Event.EventId.random()); eventBus().dispatch(noopEvent, KEY_1).block(); - verify(listener, after(FIVE_HUNDRED_MS).never()) + verify(listener, after(FIVE_HUNDRED_MS.toMillis()).never()) .event(any()); } @@ -89,7 +89,7 @@ public interface KeyContract extends EventBusContract { eventBus().dispatch(EVENT, NO_KEYS).block(); - verify(listener, after(FIVE_HUNDRED_MS).never()) + verify(listener, after(FIVE_HUNDRED_MS.toMillis()).never()) .event(any()); } @@ -100,7 +100,7 @@ public interface KeyContract extends EventBusContract { eventBus().dispatch(EVENT, ImmutableSet.of(KEY_2)).block(); - verify(listener, after(FIVE_HUNDRED_MS).never()) + verify(listener, after(FIVE_HUNDRED_MS.toMillis()).never()) .event(any()); } @@ -111,7 +111,7 @@ public interface KeyContract extends EventBusContract { eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block(); - verify(listener, timeout(ONE_SECOND).times(1)).event(any()); + verify(listener, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); } @Test @@ -133,8 +133,8 @@ public interface KeyContract extends EventBusContract { eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block(); - verify(listener, timeout(ONE_SECOND).times(1)).event(any()); - verify(listener2, after(FIVE_HUNDRED_MS).never()) + verify(listener, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); + verify(listener2, after(FIVE_HUNDRED_MS.toMillis()).never()) .event(any()); } @@ -147,8 +147,8 @@ public interface KeyContract extends EventBusContract { eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block(); - verify(listener, timeout(ONE_SECOND).times(1)).event(any()); - verify(listener2, timeout(ONE_SECOND).times(1)).event(any()); + verify(listener, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); + verify(listener2, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); } @Test @@ -159,7 +159,7 @@ public interface KeyContract extends EventBusContract { eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block(); - verify(listener, timeout(ONE_SECOND).times(1)).event(any()); + verify(listener, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); } @Test @@ -170,7 +170,7 @@ public interface KeyContract extends EventBusContract { eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block(); - verify(listener, after(FIVE_HUNDRED_MS).never()) + verify(listener, after(FIVE_HUNDRED_MS.toMillis()).never()) .event(any()); } @@ -182,7 +182,7 @@ public interface KeyContract extends EventBusContract { eventBus().register(listener, KEY_1); - verify(listener, after(FIVE_HUNDRED_MS).never()) + verify(listener, after(FIVE_HUNDRED_MS.toMillis()).never()) .event(any()); } @@ -195,7 +195,7 @@ public interface KeyContract extends EventBusContract { eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block(); - verify(listener, after(FIVE_HUNDRED_MS).never()) + verify(listener, after(FIVE_HUNDRED_MS.toMillis()).never()) .event(any()); } @@ -207,7 +207,7 @@ public interface KeyContract extends EventBusContract { eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block(); - verify(listener, timeout(ONE_SECOND).times(1)).event(any()); + verify(listener, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); } @Test @@ -228,7 +228,7 @@ public interface KeyContract extends EventBusContract { eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1, KEY_2)).block(); - verify(listener, timeout(ONE_SECOND).times(1)).event(any()); + verify(listener, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); } @Test @@ -239,7 +239,7 @@ public interface KeyContract extends EventBusContract { eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1, KEY_2)).block(); - verify(listener, timeout(ONE_SECOND).times(1)).event(any()); + verify(listener, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); } @Test @@ -249,7 +249,7 @@ public interface KeyContract extends EventBusContract { eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block(); - verify(listener, after(FIVE_HUNDRED_MS).never()) + verify(listener, after(FIVE_HUNDRED_MS.toMillis()).never()) .event(any()); } @@ -295,7 +295,7 @@ public interface KeyContract extends EventBusContract { eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block(); - verify(listener, timeout(ONE_SECOND).times(1)).event(any()); + verify(listener, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); } } @@ -309,7 +309,7 @@ public interface KeyContract extends EventBusContract { eventBus2().dispatch(EVENT, KEY_1).block(); - verify(mailboxListener, timeout(ONE_SECOND).times(1)).event(any()); + verify(mailboxListener, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); } @Test @@ -320,7 +320,7 @@ public interface KeyContract extends EventBusContract { eventBus2().dispatch(EVENT, ImmutableSet.of(KEY_1)).block(); - verify(mailboxListener, after(FIVE_HUNDRED_MS).never()) + verify(mailboxListener, after(FIVE_HUNDRED_MS.toMillis()).never()) .event(any()); } @@ -334,8 +334,8 @@ public interface KeyContract extends EventBusContract { eventBus2().dispatch(EVENT, KEY_1).block(); - verify(mailboxListener1, timeout(ONE_SECOND).times(1)).event(any()); - verify(mailboxListener2, timeout(ONE_SECOND).times(1)).event(any()); + verify(mailboxListener1, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); + verify(mailboxListener2, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); } @Test @@ -346,7 +346,7 @@ public interface KeyContract extends EventBusContract { eventBus().register(listener, KEY_1); - verify(listener, after(FIVE_HUNDRED_MS).never()) + verify(listener, after(FIVE_HUNDRED_MS.toMillis()).never()) .event(any()); } @@ -361,7 +361,7 @@ public interface KeyContract extends EventBusContract { eventBus2().dispatch(EVENT, KEY_1).block(); verify(mailboxListener2, times(1)).event(any()); - verify(mailboxListener1, timeout(ONE_SECOND).times(1)).event(any()); + verify(mailboxListener1, timeout(ONE_SECOND.toMillis()).times(1)).event(any()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/e255eaeb/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/RabbitMQEventBusTest.java ---------------------------------------------------------------------- diff --git a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/RabbitMQEventBusTest.java b/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/RabbitMQEventBusTest.java index 38ca6c5..2d638b5 100644 --- a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/RabbitMQEventBusTest.java +++ b/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/RabbitMQEventBusTest.java @@ -320,7 +320,7 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract, rabbitMQExtension.getRabbitMQ().unpause(); eventBus.dispatch(EVENT, NO_KEYS).block(); - verify(listener, after(THIRTY_SECONDS).times(1)).event(EVENT); + verify(listener, after(THIRTY_SECONDS.toMillis()).times(1)).event(EVENT); } @Test @@ -332,7 +332,7 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract, rabbitMQExtension.getRabbitMQ().restart(); eventBus.dispatch(EVENT, NO_KEYS).block(); - verify(listener, after(THIRTY_SECONDS).times(1)).event(EVENT); + verify(listener, after(THIRTY_SECONDS.toMillis()).times(1)).event(EVENT); } @Test @@ -345,7 +345,7 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract, eventBus.register(listener, GROUP_A); eventBus.dispatch(EVENT, NO_KEYS).block(); - verify(listener, after(THIRTY_SECONDS).times(1)).event(EVENT); + verify(listener, after(THIRTY_SECONDS.toMillis()).times(1)).event(EVENT); } @Test @@ -357,7 +357,7 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract, rabbitMQExtension.getRabbitMQ().restart(); eventBus.dispatch(EVENT, KEY_1).block(); - verify(listener, after(THIRTY_SECONDS).times(1)).event(EVENT); + verify(listener, after(THIRTY_SECONDS.toMillis()).times(1)).event(EVENT); } @Test @@ -370,7 +370,7 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract, eventBus.register(listener, KEY_1); eventBus.dispatch(EVENT, KEY_1).block(); - verify(listener, after(THIRTY_SECONDS).times(1)).event(EVENT); + verify(listener, after(THIRTY_SECONDS.toMillis()).times(1)).event(EVENT); } @Test @@ -387,7 +387,7 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract, eventBus.register(listener, GROUP_A); eventBus.dispatch(EVENT, NO_KEYS).block(); - verify(listener, after(THIRTY_SECONDS).times(1)).event(EVENT); + verify(listener, after(THIRTY_SECONDS.toMillis()).times(1)).event(EVENT); } @Test @@ -405,7 +405,7 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract, rabbitMQExtension.getRabbitMQ().unpause(); eventBus.dispatch(EVENT, KEY_1).block(); - verify(listener, after(THIRTY_SECONDS).times(1)).event(EVENT); + verify(listener, after(THIRTY_SECONDS.toMillis()).times(1)).event(EVENT); } @Test @@ -423,7 +423,7 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract, eventBus.register(listener, KEY_1); eventBus.dispatch(EVENT, KEY_1).block(); - verify(listener, after(THIRTY_SECONDS).times(1)).event(EVENT); + verify(listener, after(THIRTY_SECONDS.toMillis()).times(1)).event(EVENT); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
