MAILBOX-367 EventBusContract should use real event pojo To avoid scala serialization error happens on mock event while running rabbitmq eventbus
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a15bd705 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a15bd705 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a15bd705 Branch: refs/heads/master Commit: a15bd7053d351ff3210ca3fee6a155a4a4c1ae01 Parents: 0502ae1 Author: datph <dphamho...@linagora.com> Authored: Mon Jan 7 10:24:59 2019 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Tue Jan 8 14:47:47 2019 +0700 ---------------------------------------------------------------------- .../james/mailbox/events/EventBusContract.java | 51 +++++++++++--------- 1 file changed, 28 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/a15bd705/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusContract.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusContract.java b/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusContract.java index 236ee75..23743a5 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusContract.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusContract.java @@ -38,6 +38,7 @@ import java.util.concurrent.CountDownLatch; import org.apache.james.core.User; import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.TestId; @@ -47,7 +48,11 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; public interface EventBusContract { - MailboxListener.MailboxEvent event = mock(MailboxListener.MailboxEvent.class); + MailboxListener.MailboxEvent EVENT = new MailboxListener.MailboxAdded( + MailboxSession.SessionId.of(42), + User.fromUsername("user"), + new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", "mailboxName"), + TestId.of(18)); class GroupA extends Group {} @@ -73,7 +78,7 @@ public interface EventBusContract { eventBus().register(listener, new GroupA()); - eventBus().dispatch(event, NO_KEYS).block(); + eventBus().dispatch(EVENT, NO_KEYS).block(); verify(listener, times(1)).event(any()); } @@ -109,7 +114,7 @@ public interface EventBusContract { eventBus().register(listener, new GroupA()); - assertThatCode(() -> eventBus().dispatch(event, NO_KEYS).block()) + assertThatCode(() -> eventBus().dispatch(EVENT, NO_KEYS).block()) .doesNotThrowAnyException(); } @@ -120,7 +125,7 @@ public interface EventBusContract { eventBus().register(listener, KEY_1); - assertThatCode(() -> eventBus().dispatch(event, NO_KEYS).block()) + assertThatCode(() -> eventBus().dispatch(EVENT, NO_KEYS).block()) .doesNotThrowAnyException(); } @@ -131,7 +136,7 @@ public interface EventBusContract { eventBus().register(listener, new GroupA()); eventBus().register(listener2, new GroupB()); - eventBus().dispatch(event, NO_KEYS).block(); + eventBus().dispatch(EVENT, NO_KEYS).block(); verify(listener, times(1)).event(any()); verify(listener2, times(1)).event(any()); @@ -144,7 +149,7 @@ public interface EventBusContract { registration.unregister(); - eventBus().dispatch(event, NO_KEYS).block(); + eventBus().dispatch(EVENT, NO_KEYS).block(); verifyZeroInteractions(listener); } @@ -188,7 +193,7 @@ public interface EventBusContract { eventBus().register(listener, new GroupA()).unregister(); eventBus().register(listener, new GroupA()); - eventBus().dispatch(event, NO_KEYS).block(); + eventBus().dispatch(EVENT, NO_KEYS).block(); verify(listener, times(1)).event(any()); } @@ -198,7 +203,7 @@ public interface EventBusContract { MailboxListener listener = newListener(); eventBus().register(listener, KEY_1); - eventBus().dispatch(event, NO_KEYS).block(); + eventBus().dispatch(EVENT, NO_KEYS).block(); verifyZeroInteractions(listener); } @@ -208,7 +213,7 @@ public interface EventBusContract { MailboxListener listener = newListener(); eventBus().register(listener, KEY_1); - eventBus().dispatch(event, ImmutableSet.of(KEY_2)).block(); + eventBus().dispatch(EVENT, ImmutableSet.of(KEY_2)).block(); verifyZeroInteractions(listener); } @@ -218,7 +223,7 @@ public interface EventBusContract { MailboxListener listener = newListener(); eventBus().register(listener, KEY_1); - eventBus().dispatch(event, ImmutableSet.of(KEY_1)).block(); + eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block(); verify(listener, times(1)).event(any()); } @@ -230,7 +235,7 @@ public interface EventBusContract { eventBus().register(listener, KEY_1); eventBus().register(listener2, KEY_2); - eventBus().dispatch(event, ImmutableSet.of(KEY_1)).block(); + eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block(); verify(listener, times(1)).event(any()); verifyZeroInteractions(listener2); @@ -243,7 +248,7 @@ public interface EventBusContract { eventBus().register(listener, KEY_1); eventBus().register(listener2, KEY_1); - eventBus().dispatch(event, ImmutableSet.of(KEY_1)).block(); + eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block(); verify(listener, times(1)).event(any()); verify(listener2, times(1)).event(any()); @@ -255,7 +260,7 @@ public interface EventBusContract { eventBus().register(listener, KEY_1); eventBus().register(listener, KEY_1); - eventBus().dispatch(event, ImmutableSet.of(KEY_1)).block(); + eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block(); verify(listener, times(1)).event(any()); } @@ -266,7 +271,7 @@ public interface EventBusContract { eventBus().register(listener, KEY_1); eventBus().register(listener, KEY_1).unregister(); - eventBus().dispatch(event, ImmutableSet.of(KEY_1)).block(); + eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block(); verifyZeroInteractions(listener); } @@ -278,7 +283,7 @@ public interface EventBusContract { eventBus().register(listener, KEY_1).unregister(); registration.unregister(); - eventBus().dispatch(event, ImmutableSet.of(KEY_1)).block(); + eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block(); verifyZeroInteractions(listener); } @@ -289,7 +294,7 @@ public interface EventBusContract { eventBus().register(listener, KEY_1); eventBus().register(listener, KEY_2).unregister(); - eventBus().dispatch(event, ImmutableSet.of(KEY_1)).block(); + eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block(); verify(listener, times(1)).event(any()); } @@ -310,7 +315,7 @@ public interface EventBusContract { MailboxListener listener = newListener(); eventBus().register(listener, KEY_1); - eventBus().dispatch(event, ImmutableSet.of(KEY_1, KEY_2)).block(); + eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1, KEY_2)).block(); verify(listener, times(1)).event(any()); } @@ -321,7 +326,7 @@ public interface EventBusContract { eventBus().register(listener, KEY_1); eventBus().register(listener, KEY_2); - eventBus().dispatch(event, ImmutableSet.of(KEY_1, KEY_2)).block(); + eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1, KEY_2)).block(); verify(listener, times(1)).event(any()); } @@ -331,7 +336,7 @@ public interface EventBusContract { MailboxListener listener = newListener(); eventBus().register(listener, KEY_1).unregister(); - eventBus().dispatch(event, ImmutableSet.of(KEY_1)).block(); + eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block(); verifyZeroInteractions(listener); } @@ -342,7 +347,7 @@ public interface EventBusContract { eventBus().register(listener, new GroupA()); - eventBus().dispatch(event, NO_KEYS).block(); + eventBus().dispatch(EVENT, NO_KEYS).block(); verify(listener, times(1)).event(any()); } @@ -355,12 +360,12 @@ public interface EventBusContract { doAnswer(invocation -> { latch.await(); return null; - }).when(listener).event(event); + }).when(listener).event(EVENT); assertTimeout(Duration.ofSeconds(2), () -> { - eventBus().dispatch(event, NO_KEYS).block(); + eventBus().dispatch(EVENT, NO_KEYS).block(); latch.countDown(); }); } -} +} \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
