MAILBOX-359 Factorize tests for MailboxPath ser-deserialization
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/70a4fd59 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/70a4fd59 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/70a4fd59 Branch: refs/heads/master Commit: 70a4fd59c5220489f1c0adff2bdadae64d49d22b Parents: e64e8e1 Author: Benoit Tellier <btell...@linagora.com> Authored: Mon Dec 24 13:52:24 2018 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Tue Jan 8 14:37:57 2019 +0700 ---------------------------------------------------------------------- .../event/json/AddedSerializationTest.java | 267 +---------- .../event/json/ExpungedSerializationTest.java | 266 +---------- .../json/FlagsUpdatedSerializationTest.java | 286 ++---------- ...MailboxACLUpdatedEventSerializationTest.java | 211 +-------- .../json/MailboxAddedSerializationTest.java | 141 ------ .../json/MailboxDeletionSerializationTest.java | 176 +------ .../json/MailboxRenamedSerializationTest.java | 457 +------------------ .../james/event/json/dtos/MailboxPathTest.java | 177 +++++++ 8 files changed, 296 insertions(+), 1685 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/70a4fd59/mailbox/event/json/src/test/java/org/apache/james/event/json/AddedSerializationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/event/json/src/test/java/org/apache/james/event/json/AddedSerializationTest.java b/mailbox/event/json/src/test/java/org/apache/james/event/json/AddedSerializationTest.java index 3af5c28..d71b9e8 100644 --- a/mailbox/event/json/src/test/java/org/apache/james/event/json/AddedSerializationTest.java +++ b/mailbox/event/json/src/test/java/org/apache/james/event/json/AddedSerializationTest.java @@ -21,7 +21,6 @@ package org.apache.james.event.json; import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER; -import static org.apache.james.mailbox.model.MailboxConstants.USER_NAMESPACE; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -398,117 +397,6 @@ class AddedSerializationTest { } @Nested - class NullOrEmptyNameSpaceInMailboxPath { - - @Test - void addedShouldBeWellDeSerializedWhenNullNameSpace() { - assertThat(EVENT_SERIALIZER.fromJson( - "{" + - " \"Added\": {" + - " \"path\": {" + - " \"user\": \"user\"," + - " \"name\": \"mailboxName\"" + - " }," + - " \"mailboxId\": \"18\"," + - " \"added\": {" + - " \"123456\": {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"flags\": {" + - " \"systemFlags\":[\"Answered\",\"Draft\"], " + - " \"userFlags\":[\"User Custom Flag\"]}," + - " \"size\": 45, " + - " \"internalDate\": \"2018-12-14T09:41:51.541Z\"," + - " \"messageId\": \"42\"" + - " }" + - " }," + - " \"sessionId\": 42," + - " \"user\": \"user\"" + - " }" + - "}").get()) - .isEqualTo(DEFAULT_ADDED_EVENT); - } - - @Test - void addedShouldBeWellDeSerializedWhenEmptyNameSpace() { - assertThat(EVENT_SERIALIZER.fromJson( - "{" + - " \"Added\": {" + - " \"path\": {" + - " \"namespace\": \"\"," + - " \"user\": \"user\"," + - " \"name\": \"mailboxName\"" + - " }," + - " \"mailboxId\": \"18\"," + - " \"added\": {" + - " \"123456\": {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"flags\": {" + - " \"systemFlags\":[\"Answered\",\"Draft\"], " + - " \"userFlags\":[\"User Custom Flag\"]}," + - " \"size\": 45, " + - " \"internalDate\": \"2018-12-14T09:41:51.541Z\"," + - " \"messageId\": \"42\"" + - " }" + - " }," + - " \"sessionId\": 42," + - " \"user\": \"user\"" + - " }" + - "}").get()) - .isEqualTo(DEFAULT_ADDED_EVENT); - } - } - - @Nested - class NullUserInMailboxPath { - private final String nullUser = null; - private final MailboxListener.Added eventWithNullUserInPath = new MailboxListener.Added( - SESSION_ID, - USER, - new MailboxPath(USER_NAMESPACE, nullUser, MAILBOX_NAME), - MAILBOX_ID, - ADDED); - - private static final String EVENT_JSON_WITH_NULL_USER_IN_PATH = - "{" + - " \"Added\": {" + - " \"path\": {" + - " \"namespace\": \"#private\"," + - " \"name\": \"mailboxName\"" + - " }," + - " \"mailboxId\": \"18\"," + - " \"added\": {" + - " \"123456\": {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"flags\": {" + - " \"systemFlags\":[\"Answered\",\"Draft\"], " + - " \"userFlags\":[\"User Custom Flag\"]}," + - " \"size\": 45, " + - " \"internalDate\": \"2018-12-14T09:41:51.541Z\"," + - " \"messageId\": \"42\"" + - " }" + - " }," + - " \"sessionId\": 42," + - " \"user\": \"user\"" + - " }" + - "}"; - - @Test - void addedShouldBeWellSerialized() { - assertThatJson(EVENT_SERIALIZER.toJson(eventWithNullUserInPath)) - .isEqualTo(EVENT_JSON_WITH_NULL_USER_IN_PATH); - } - - @Test - void addedShouldBeWellDeSerialized() { - assertThat(EVENT_SERIALIZER.fromJson(EVENT_JSON_WITH_NULL_USER_IN_PATH).get()) - .isEqualTo(eventWithNullUserInPath); - } - } - - @Nested class DeserializationErrors { @Test void addedShouldThrowWhenMissingSessionId() { @@ -597,138 +485,29 @@ class AddedSerializationTest { .isInstanceOf(NoSuchElementException.class); } - @Nested - class DeserializationErrorOnMailboxPath { - - @Nested - class DeserializationErrorOnNameSpace { - @Test - void addedShouldThrowWhenNameSpaceIsNotAString() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"Added\": {" + - " \"path\": {" + - " \"namespace\": 48246," + - " \"user\": \"user\"," + - " \"name\": \"mailboxName\"" + - " }," + - " \"mailboxId\": \"18\"," + - " \"added\": {" + - " \"123456\": {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"flags\": {" + - " \"systemFlags\":[\"Answered\",\"Draft\"], " + - " \"userFlags\":[\"User Custom Flag\"]}," + - " \"size\": 45, " + - " \"internalDate\": \"2018-12-14T09:41:51.541Z\"," + - " \"messageId\": \"42\"" + - " }" + - " }," + - " \"sessionId\": 42," + - " \"user\": \"user\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - } - - @Nested - class DeserializationErrorOnUser { - @Test - void addedShouldThrowWhenUserIsNotAString() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"Added\": {" + - " \"path\": {" + - " \"namespace\": \"#private\"," + - " \"user\": 265412.64," + - " \"name\": \"mailboxName\"" + - " }," + - " \"mailboxId\": \"18\"," + - " \"added\": {" + - " \"123456\": {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"flags\": {" + - " \"systemFlags\":[\"Answered\",\"Draft\"], " + - " \"userFlags\":[\"User Custom Flag\"]}," + - " \"size\": 45, " + - " \"internalDate\": \"2018-12-14T09:41:51.541Z\"," + - " \"messageId\": \"42\"" + - " }" + - " }," + - " \"sessionId\": 42," + - " \"user\": \"user\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - } - - @Nested - class DeserializationErrorOnMailboxName { - - @Test - void addedShouldThrowWhenNullMailboxName() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"Added\": {" + - " \"path\": {" + - " \"namespace\": \"#private\"," + - " \"user\": \"user\"," + - " \"name\": null" + - " }," + - " \"mailboxId\": \"18\"," + - " \"added\": {" + - " \"123456\": {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"flags\": {" + - " \"systemFlags\":[\"Answered\",\"Draft\"], " + - " \"userFlags\":[\"User Custom Flag\"]}," + - " \"size\": 45, " + - " \"internalDate\": \"2018-12-14T09:41:51.541Z\"," + - " \"messageId\": \"42\"" + - " }" + - " }," + - " \"sessionId\": 42," + - " \"user\": \"user\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - - @Test - void addedShouldThrowWhenMailboxNameIdIsANumber() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"Added\": {" + - " \"path\": {" + - " \"namespace\": \"#private\"," + - " \"user\": \"user\"," + - " \"name\": 11861" + - " }," + - " \"mailboxId\": \"18\"," + - " \"added\": {" + - " \"123456\": {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"flags\": {" + - " \"systemFlags\":[\"Answered\",\"Draft\"], " + - " \"userFlags\":[\"User Custom Flag\"]}," + - " \"size\": 45, " + - " \"internalDate\": \"2018-12-14T09:41:51.541Z\"," + - " \"messageId\": \"42\"" + - " }" + - " }," + - " \"sessionId\": 42," + - " \"user\": \"user\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - } + @Test + void addedShouldThrowWhenMissingPath() { + assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( + "{" + + " \"Added\": {" + + " \"mailboxId\": \"18\"," + + " \"added\": {" + + " \"123456\": {" + + " \"uid\": 123456," + + " \"modSeq\": 35," + + " \"flags\": {" + + " \"systemFlags\":[\"Answered\",\"Draft\"], " + + " \"userFlags\":[\"User Custom Flag\"]}," + + " \"size\": 45, " + + " \"internalDate\": \"2018-12-14T09:41:51.541Z\"," + + " \"messageId\": \"42\"" + + " }" + + " }," + + " \"sessionId\": 42," + + " \"user\": \"user\"" + + " }" + + "}").get()) + .isInstanceOf(NoSuchElementException.class); } @Nested http://git-wip-us.apache.org/repos/asf/james-project/blob/70a4fd59/mailbox/event/json/src/test/java/org/apache/james/event/json/ExpungedSerializationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/event/json/src/test/java/org/apache/james/event/json/ExpungedSerializationTest.java b/mailbox/event/json/src/test/java/org/apache/james/event/json/ExpungedSerializationTest.java index 2aee596..40a7054 100644 --- a/mailbox/event/json/src/test/java/org/apache/james/event/json/ExpungedSerializationTest.java +++ b/mailbox/event/json/src/test/java/org/apache/james/event/json/ExpungedSerializationTest.java @@ -21,7 +21,6 @@ package org.apache.james.event.json; import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER; -import static org.apache.james.mailbox.model.MailboxConstants.USER_NAMESPACE; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -396,116 +395,6 @@ class ExpungedSerializationTest { .isEqualTo(eventRoundToMinute); } } - @Nested - class NullOrEmptyNameSpaceInMailboxPath { - - @Test - void expungedShouldBeWellDeSerializedWhenNullNameSpace() { - assertThat(EVENT_SERIALIZER.fromJson( - "{" + - " \"Expunged\": {" + - " \"path\": {" + - " \"user\": \"user\"," + - " \"name\": \"mailboxName\"" + - " }," + - " \"mailboxId\": \"18\"," + - " \"expunged\": {" + - " \"123456\": {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"flags\": {" + - " \"systemFlags\":[\"Answered\",\"Draft\"], " + - " \"userFlags\":[\"User Custom Flag\"]}," + - " \"size\": 45, " + - " \"internalDate\": \"2018-12-14T09:41:51.541Z\"," + - " \"messageId\": \"42\"" + - " }" + - " }," + - " \"sessionId\": 42," + - " \"user\": \"user\"" + - " }" + - "}").get()) - .isEqualTo(DEFAULT_EXPUNGED_EVENT); - } - - @Test - void expungedShouldBeWellDeSerializedWhenEmptyNameSpace() { - assertThat(EVENT_SERIALIZER.fromJson( - "{" + - " \"Expunged\": {" + - " \"path\": {" + - " \"namespace\": \"\"," + - " \"user\": \"user\"," + - " \"name\": \"mailboxName\"" + - " }," + - " \"mailboxId\": \"18\"," + - " \"expunged\": {" + - " \"123456\": {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"flags\": {" + - " \"systemFlags\":[\"Answered\",\"Draft\"], " + - " \"userFlags\":[\"User Custom Flag\"]}," + - " \"size\": 45, " + - " \"internalDate\": \"2018-12-14T09:41:51.541Z\"," + - " \"messageId\": \"42\"" + - " }" + - " }," + - " \"sessionId\": 42," + - " \"user\": \"user\"" + - " }" + - "}").get()) - .isEqualTo(DEFAULT_EXPUNGED_EVENT); - } - } - - @Nested - class NullUserInMailboxPath { - private final String nullUser = null; - private final MailboxListener.Expunged eventWithNullUserInPath = new MailboxListener.Expunged( - SESSION_ID, - USER, - new MailboxPath(USER_NAMESPACE, nullUser, MAILBOX_NAME), - MAILBOX_ID, - EXPUNGED); - - private static final String EVENT_JSON_WITH_NULL_USER_IN_PATH = - "{" + - " \"Expunged\": {" + - " \"path\": {" + - " \"namespace\": \"#private\"," + - " \"name\": \"mailboxName\"" + - " }," + - " \"mailboxId\": \"18\"," + - " \"expunged\": {" + - " \"123456\": {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"flags\": {" + - " \"systemFlags\":[\"Answered\",\"Draft\"], " + - " \"userFlags\":[\"User Custom Flag\"]}," + - " \"size\": 45, " + - " \"internalDate\": \"2018-12-14T09:41:51.541Z\"," + - " \"messageId\": \"42\"" + - " }" + - " }," + - " \"sessionId\": 42," + - " \"user\": \"user\"" + - " }" + - "}"; - - @Test - void expungedShouldBeWellSerialized() { - assertThatJson(EVENT_SERIALIZER.toJson(eventWithNullUserInPath)) - .isEqualTo(EVENT_JSON_WITH_NULL_USER_IN_PATH); - } - - @Test - void expungedShouldBeWellDeSerialized() { - assertThat(EVENT_SERIALIZER.fromJson(EVENT_JSON_WITH_NULL_USER_IN_PATH).get()) - .isEqualTo(eventWithNullUserInPath); - } - } @Nested class DeserializationErrors { @@ -596,138 +485,29 @@ class ExpungedSerializationTest { .isInstanceOf(NoSuchElementException.class); } - @Nested - class DeserializationErrorOnMailboxPath { - - @Nested - class DeserializationErrorOnNameSpace { - @Test - void expungedShouldThrowWhenNameSpaceIsNotAString() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"Expunged\": {" + - " \"path\": {" + - " \"namespace\": 48246," + - " \"user\": \"user\"," + - " \"name\": \"mailboxName\"" + - " }," + - " \"mailboxId\": \"18\"," + - " \"expunged\": {" + - " \"123456\": {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"flags\": {" + - " \"systemFlags\":[\"Answered\",\"Draft\"], " + - " \"userFlags\":[\"User Custom Flag\"]}," + - " \"size\": 45, " + - " \"internalDate\": \"2018-12-14T09:41:51.541Z\"," + - " \"messageId\": \"42\"" + - " }" + - " }," + - " \"sessionId\": 42," + - " \"user\": \"user\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - } - - @Nested - class DeserializationErrorOnUser { - @Test - void expungedShouldThrowWhenUserIsNotAString() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"Expunged\": {" + - " \"path\": {" + - " \"namespace\": \"#private\"," + - " \"user\": 265412.64," + - " \"name\": \"mailboxName\"" + - " }," + - " \"mailboxId\": \"18\"," + - " \"expunged\": {" + - " \"123456\": {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"flags\": {" + - " \"systemFlags\":[\"Answered\",\"Draft\"], " + - " \"userFlags\":[\"User Custom Flag\"]}," + - " \"size\": 45, " + - " \"internalDate\": \"2018-12-14T09:41:51.541Z\"," + - " \"messageId\": \"42\"" + - " }" + - " }," + - " \"sessionId\": 42," + - " \"user\": \"user\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - } - - @Nested - class DeserializationErrorOnMailboxName { - - @Test - void expungedShouldThrowWhenNullMailboxName() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"Expunged\": {" + - " \"path\": {" + - " \"namespace\": \"#private\"," + - " \"user\": \"user\"," + - " \"name\": null" + - " }," + - " \"mailboxId\": \"18\"," + - " \"expunged\": {" + - " \"123456\": {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"flags\": {" + - " \"systemFlags\":[\"Answered\",\"Draft\"], " + - " \"userFlags\":[\"User Custom Flag\"]}," + - " \"size\": 45, " + - " \"internalDate\": \"2018-12-14T09:41:51.541Z\"," + - " \"messageId\": \"42\"" + - " }" + - " }," + - " \"sessionId\": 42," + - " \"user\": \"user\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - - @Test - void expungedShouldThrowWhenMailboxNameIdIsANumber() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"Expunged\": {" + - " \"path\": {" + - " \"namespace\": \"#private\"," + - " \"user\": \"user\"," + - " \"name\": 11861" + - " }," + - " \"mailboxId\": \"18\"," + - " \"expunged\": {" + - " \"123456\": {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"flags\": {" + - " \"systemFlags\":[\"Answered\",\"Draft\"], " + - " \"userFlags\":[\"User Custom Flag\"]}," + - " \"size\": 45, " + - " \"internalDate\": \"2018-12-14T09:41:51.541Z\"," + - " \"messageId\": \"42\"" + - " }" + - " }," + - " \"sessionId\": 42," + - " \"user\": \"user\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - } + @Test + void expungedShouldThrowWhenMissingPath() { + assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( + "{" + + " \"Expunged\": {" + + " \"mailboxId\": \"18\"," + + " \"expunged\": {" + + " \"123456\": {" + + " \"uid\": 123456," + + " \"modSeq\": 35," + + " \"flags\": {" + + " \"systemFlags\":[\"Answered\",\"Draft\"], " + + " \"userFlags\":[\"User Custom Flag\"]}," + + " \"size\": 45, " + + " \"internalDate\": \"2018-12-14T09:41:51.541Z\"," + + " \"messageId\": \"42\"" + + " }" + + " }," + + " \"sessionId\": 42," + + " \"user\": \"user\"" + + " }" + + "}").get()) + .isInstanceOf(NoSuchElementException.class); } @Nested http://git-wip-us.apache.org/repos/asf/james-project/blob/70a4fd59/mailbox/event/json/src/test/java/org/apache/james/event/json/FlagsUpdatedSerializationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/event/json/src/test/java/org/apache/james/event/json/FlagsUpdatedSerializationTest.java b/mailbox/event/json/src/test/java/org/apache/james/event/json/FlagsUpdatedSerializationTest.java index abef4bd..90c0a01 100644 --- a/mailbox/event/json/src/test/java/org/apache/james/event/json/FlagsUpdatedSerializationTest.java +++ b/mailbox/event/json/src/test/java/org/apache/james/event/json/FlagsUpdatedSerializationTest.java @@ -136,122 +136,6 @@ class FlagsUpdatedSerializationTest { } @Nested - class NullOrEmptyNameSpaceInMailboxPath { - - @Test - void flagsUpdatedShouldBeWellDeSerializedWhenNullNameSpace() { - assertThat(EVENT_SERIALIZER.fromJson( - "{" + - " \"FlagsUpdated\": {" + - " \"path\": {" + - " \"namespace\": null," + - " \"user\": \"user\"," + - " \"name\": \"mailboxName\"" + - " }," + - " \"mailboxId\": \"18\"," + - " \"sessionId\": 42," + - " \"updatedFlags\": [" + - " {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"oldFlags\": {\"systemFlags\":[\"Deleted\",\"Seen\"],\"userFlags\":[\"Old Flag 1\"]}," + - " \"newFlags\": {\"systemFlags\":[\"Answered\",\"Draft\"],\"userFlags\":[\"New Flag 1\"]}" + - " }," + - " {" + - " \"uid\": 654321," + - " \"modSeq\": 36," + - " \"oldFlags\": {\"systemFlags\":[\"Flagged\",\"Recent\"],\"userFlags\":[\"Old Flag 2\"]}," + - " \"newFlags\": {\"systemFlags\":[\"Answered\",\"Seen\"],\"userFlags\":[\"New Flag 2\"]}" + - " }" + - " ]," + - " \"user\": \"user\"" + - " }" + - "}").get()) - .isEqualTo(DEFAULT_EVENT); - } - - @Test - void flagsUpdatedShouldBeWellDeSerializedWhenEmptyNameSpace() { - assertThat(EVENT_SERIALIZER.fromJson( - "{" + - " \"FlagsUpdated\": {" + - " \"path\": {" + - " \"namespace\": \"\"," + - " \"user\": \"user\"," + - " \"name\": \"mailboxName\"" + - " }," + - " \"mailboxId\": \"18\"," + - " \"sessionId\": 42," + - " \"updatedFlags\": [" + - " {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"oldFlags\": {\"systemFlags\":[\"Deleted\",\"Seen\"],\"userFlags\":[\"Old Flag 1\"]}," + - " \"newFlags\": {\"systemFlags\":[\"Answered\",\"Draft\"],\"userFlags\":[\"New Flag 1\"]}" + - " }," + - " {" + - " \"uid\": 654321," + - " \"modSeq\": 36," + - " \"oldFlags\": {\"systemFlags\":[\"Flagged\",\"Recent\"],\"userFlags\":[\"Old Flag 2\"]}," + - " \"newFlags\": {\"systemFlags\":[\"Answered\",\"Seen\"],\"userFlags\":[\"New Flag 2\"]}" + - " }" + - " ]," + - " \"user\": \"user\"" + - " }" + - "}").get()) - .isEqualTo(DEFAULT_EVENT); - } - } - - @Nested - class NullUserInMailboxPath { - private final String nullUser = null; - private final MailboxListener.FlagsUpdated nullUserEvent = new MailboxListener.FlagsUpdated(SESSION_ID, USER, - new MailboxPath(MailboxConstants.USER_NAMESPACE, nullUser, MAILBOX_NAME), - MAILBOX_ID, UPDATED_FLAGS_LIST); - - private static final String EVENT_JSON_WITH_NULL_USER_IN_PATH = - "{" + - " \"FlagsUpdated\": {" + - " \"path\": {" + - " \"namespace\": \"#private\"," + - " \"name\": \"mailboxName\"" + - " }," + - " \"mailboxId\": \"18\"," + - " \"sessionId\": 42," + - " \"updatedFlags\": [" + - " {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"oldFlags\": {\"systemFlags\":[\"Deleted\",\"Seen\"],\"userFlags\":[\"Old Flag 1\"]}," + - " \"newFlags\": {\"systemFlags\":[\"Answered\",\"Draft\"],\"userFlags\":[\"New Flag 1\"]}" + - " }," + - " {" + - " \"uid\": 654321," + - " \"modSeq\": 36," + - " \"oldFlags\": {\"systemFlags\":[\"Flagged\",\"Recent\"],\"userFlags\":[\"Old Flag 2\"]}," + - " \"newFlags\": {\"systemFlags\":[\"Answered\",\"Seen\"],\"userFlags\":[\"New Flag 2\"]}" + - " }" + - " ]," + - " \"user\": \"user\"" + - " }" + - "}"; - - @Test - void flagsUpdatedShouldBeWellSerialized() { - assertThatJson(EVENT_SERIALIZER.toJson(nullUserEvent)) - .when(Option.IGNORING_ARRAY_ORDER) - .isEqualTo(EVENT_JSON_WITH_NULL_USER_IN_PATH); - } - - @Test - void flagsUpdatedShouldBeWellDeSerialized() { - assertThat(EVENT_SERIALIZER.fromJson(EVENT_JSON_WITH_NULL_USER_IN_PATH).get()) - .isEqualTo(nullUserEvent); - } - } - - @Nested class WithUpdatedFlags { @Nested @@ -526,146 +410,36 @@ class FlagsUpdatedSerializationTest { .isInstanceOf(NoSuchElementException.class); } - @Nested - class DeserializationErrorOnMailboxPath { - - @Nested - class DeserializationErrorOnNameSpace { - @Test - void flagsUpdatedShouldThrowWhenNameSpaceIsNotAString() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"FlagsUpdated\": {" + - " \"path\": {" + - " \"namespace\": 482," + - " \"user\": \"user\"," + - " \"name\": \"mailboxName\"" + - " }," + - " \"mailboxId\": \"18\"," + - " \"sessionId\": 42," + - " \"updatedFlags\": [" + - " {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"oldFlags\": {\"systemFlags\":[\"Deleted\",\"Seen\"],\"userFlags\":[\"Old Flag 1\"]}," + - " \"newFlags\": {\"systemFlags\":[\"Answered\",\"Draft\"],\"userFlags\":[\"New Flag 1\"]}" + - " }," + - " {" + - " \"uid\": 654321," + - " \"modSeq\": 36," + - " \"oldFlags\": {\"systemFlags\":[\"Flagged\",\"Recent\"],\"userFlags\":[\"Old Flag 2\"]}," + - " \"newFlags\": {\"systemFlags\":[\"Answered\",\"Seen\"],\"userFlags\":[\"New Flag 2\"]}" + - " }" + - " ]," + - " \"user\": \"user\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - } - - @Nested - class DeserializationErrorOnUser { - @Test - void flagsUpdatedShouldThrowWhenUserIsNotAString() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"FlagsUpdated\": {" + - " \"path\": {" + - " \"namespace\": \"#private\"," + - " \"user\": 682695," + - " \"name\": \"mailboxName\"" + - " }," + - " \"mailboxId\": \"18\"," + - " \"sessionId\": 42," + - " \"updatedFlags\": [" + - " {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"oldFlags\": {\"systemFlags\":[\"Deleted\",\"Seen\"],\"userFlags\":[\"Old Flag 1\"]}," + - " \"newFlags\": {\"systemFlags\":[\"Answered\",\"Draft\"],\"userFlags\":[\"New Flag 1\"]}" + - " }," + - " {" + - " \"uid\": 654321," + - " \"modSeq\": 36," + - " \"oldFlags\": {\"systemFlags\":[\"Flagged\",\"Recent\"],\"userFlags\":[\"Old Flag 2\"]}," + - " \"newFlags\": {\"systemFlags\":[\"Answered\",\"Seen\"],\"userFlags\":[\"New Flag 2\"]}" + - " }" + - " ]," + - " \"user\": \"user\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - } - - @Nested - class DeserializationErrorOnMailboxName { - - @Test - void flagsUpdatedShouldThrowWhenNullMailboxName() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"FlagsUpdated\": {" + - " \"path\": {" + - " \"namespace\": \"#private\"," + - " \"user\": \"user\"," + - " \"name\": null" + - " }," + - " \"mailboxId\": \"18\"," + - " \"sessionId\": 42," + - " \"updatedFlags\": [" + - " {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"oldFlags\": {\"systemFlags\":[\"Deleted\",\"Seen\"],\"userFlags\":[\"Old Flag 1\"]}," + - " \"newFlags\": {\"systemFlags\":[\"Answered\",\"Draft\"],\"userFlags\":[\"New Flag 1\"]}" + - " }," + - " {" + - " \"uid\": 654321," + - " \"modSeq\": 36," + - " \"oldFlags\": {\"systemFlags\":[\"Flagged\",\"Recent\"],\"userFlags\":[\"Old Flag 2\"]}," + - " \"newFlags\": {\"systemFlags\":[\"Answered\",\"Seen\"],\"userFlags\":[\"New Flag 2\"]}" + - " }" + - " ]," + - " \"user\": \"user\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - - @Test - void flagsUpdatedShouldThrowWhenMailboxNameIsANumber() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"FlagsUpdated\": {" + - " \"path\": {" + - " \"namespace\": \"#private\"," + - " \"user\": \"user\"," + - " \"name\": 156.88541" + - " }," + - " \"mailboxId\": \"18\"," + - " \"sessionId\": 42," + - " \"updatedFlags\": [" + - " {" + - " \"uid\": 123456," + - " \"modSeq\": 35," + - " \"oldFlags\": {\"systemFlags\":[\"Deleted\",\"Seen\"],\"userFlags\":[\"Old Flag 1\"]}," + - " \"newFlags\": {\"systemFlags\":[\"Answered\",\"Draft\"],\"userFlags\":[\"New Flag 1\"]}" + - " }," + - " {" + - " \"uid\": 654321," + - " \"modSeq\": 36," + - " \"oldFlags\": {\"systemFlags\":[\"Flagged\",\"Recent\"],\"userFlags\":[\"Old Flag 2\"]}," + - " \"newFlags\": {\"systemFlags\":[\"Answered\",\"Seen\"],\"userFlags\":[\"New Flag 2\"]}" + - " }" + - " ]," + - " \"user\": \"user\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - } + @Test + void flagsUpdatedShouldThrowWhenMissingMailboxPath() { + assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( + "{" + + " \"FlagsUpdated\": {" + + " \"path\": {" + + " \"namespace\": 482," + + " \"user\": \"user\"," + + " \"name\": \"mailboxName\"" + + " }," + + " \"mailboxId\": \"18\"," + + " \"sessionId\": 42," + + " \"updatedFlags\": [" + + " {" + + " \"uid\": 123456," + + " \"modSeq\": 35," + + " \"oldFlags\": {\"systemFlags\":[\"Deleted\",\"Seen\"],\"userFlags\":[\"Old Flag 1\"]}," + + " \"newFlags\": {\"systemFlags\":[\"Answered\",\"Draft\"],\"userFlags\":[\"New Flag 1\"]}" + + " }," + + " {" + + " \"uid\": 654321," + + " \"modSeq\": 36," + + " \"oldFlags\": {\"systemFlags\":[\"Flagged\",\"Recent\"],\"userFlags\":[\"Old Flag 2\"]}," + + " \"newFlags\": {\"systemFlags\":[\"Answered\",\"Seen\"],\"userFlags\":[\"New Flag 2\"]}" + + " }" + + " ]," + + " \"user\": \"user\"" + + " }" + + "}").get()) + .isInstanceOf(NoSuchElementException.class); } @Nested http://git-wip-us.apache.org/repos/asf/james-project/blob/70a4fd59/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxACLUpdatedEventSerializationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxACLUpdatedEventSerializationTest.java b/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxACLUpdatedEventSerializationTest.java index 0855c64..7176c91 100644 --- a/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxACLUpdatedEventSerializationTest.java +++ b/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxACLUpdatedEventSerializationTest.java @@ -87,102 +87,6 @@ class MailboxACLUpdatedEventSerializationTest { } @Nested - class NullUserInMailboxPath { - private final String NULL_USER = null; - private static final String JSON_2 = "{" + - " \"MailboxACLUpdated\":{" + - " \"mailboxPath\":{" + - " \"namespace\":\"#private\"," + - " \"name\":\"mailboxName\"" + - " }," + - " \"aclDiff\":{" + - " \"oldACL\":{}," + - " \"newACL\":{\"$any\":\"ar\"}}," + - " \"mailboxId\":\"23\"," + - " \"sessionId\":6," + - " \"user\":\"user\"" + - " }" + - "}"; - - private final MailboxACL MAILBOX_ACL= new MailboxACL( - new MailboxACL.Entry(ENTRY_KEY, RIGHTS)); - - private final MailboxListener.MailboxACLUpdated UPDATED_EVENT = new MailboxListener.MailboxACLUpdated( - MailboxSession.SessionId.of(6), - USER, - new MailboxPath(MailboxConstants.USER_NAMESPACE, NULL_USER, "mailboxName"), - ACLDiff.computeDiff(MailboxACL.EMPTY, MAILBOX_ACL), - TestId.of(23)); - - @Test - void mailboxACLUpdatedShouldBeWellSerializedWithNullUser() { - assertThatJson(EVENT_SERIALIZER.toJson(UPDATED_EVENT)) - .isEqualTo(JSON_2); - } - - @Test - void mailboxACLUpdatedShouldBeWellDeSerializedWithNullUser() { - assertThat(EVENT_SERIALIZER.fromJson(JSON_2).get()) - .isEqualTo(UPDATED_EVENT); - } - } - - @Nested - class NullNameSpaceInMailboxPath { - - private final MailboxACL MAILBOX_ACL = new MailboxACL( - new MailboxACL.Entry(ENTRY_KEY, RIGHTS)); - - private final MailboxListener.MailboxACLUpdated UPDATED_EVENT = new MailboxListener.MailboxACLUpdated( - MailboxSession.SessionId.of(6), - USER, - new MailboxPath(MailboxConstants.USER_NAMESPACE, "bob", "mailboxName"), - ACLDiff.computeDiff(MailboxACL.EMPTY, MAILBOX_ACL), - TestId.of(23)); - - @Test - void mailboxAddedShouldBeWellDeSerializedWhenMissingNameSpace() { - assertThat(EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxACLUpdated\":{" + - " \"mailboxPath\":{" + - " \"user\": \"bob\"," + - " \"name\":\"mailboxName\"" + - " }," + - " \"aclDiff\":{" + - " \"oldACL\":{}," + - " \"newACL\":{\"$any\":\"ar\"}}," + - " \"mailboxId\":\"23\"," + - " \"sessionId\":6," + - " \"user\":\"user\"" + - " }" + - "}").get()) - .isEqualTo(UPDATED_EVENT); - } - - @Test - void mailboxAddedShouldBeWellDeSerializedWhenNullNameSpace() { - assertThat(EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxACLUpdated\":{" + - " \"mailboxPath\":{" + - " \"namespace\":null," + - " \"user\": \"bob\"," + - " \"name\":\"mailboxName\"" + - " }," + - " \"aclDiff\":{" + - " \"oldACL\":{}," + - " \"newACL\":{\"$any\":\"ar\"}}," + - " \"mailboxId\":\"23\"," + - " \"sessionId\":6," + - " \"user\":\"user\"" + - " }" + - "}").get()) - .isEqualTo(UPDATED_EVENT); - } - } - - @Nested class EmptyRightInMailboxACL { private final String jsonNullRight = @@ -745,102 +649,25 @@ class MailboxACLUpdatedEventSerializationTest { .isInstanceOf(NoSuchElementException.class); } - @Nested - class DeserializationErrorOnMailboxPath { - - @Nested - class DeserializationErrorOnNameSpace { - @Test - void mailboxACLUpdatedShouldThrowWhenNameSpaceIsNotAString() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxACLUpdated\":{" + - " \"mailboxPath\":{" + - " \"namespace\":230192.06," + - " \"user\":\"bob\"," + - " \"name\":\"mailboxName\"" + - " }," + - " \"aclDiff\":{" + - " \"oldACL\":{}," + - " \"newACL\":{\"$any\":\"ar\"}}," + - " \"mailboxId\":\"123\"," + - " \"sessionId\":6," + - " \"user\":\"user\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - } - - @Nested - class DeserializationErrorOnUser { - @Test - void mailboxACLUpdatedShouldThrowWhenUserIsNotAString() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxACLUpdated\":{" + - " \"mailboxPath\":{" + - " \"namespace\":230192.06," + - " \"user\":180806," + - " \"name\":\"mailboxName\"" + - " }," + - " \"aclDiff\":{" + - " \"oldACL\":{}," + - " \"newACL\":{\"$any\":\"ar\"}}," + - " \"mailboxId\":\"123\"," + - " \"sessionId\":6," + - " \"user\":\"user\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - } - - @Nested - class DeserializationErrorOnMailboxName { - - @Test - void mailboxACLUpdatedShouldThrowWhenNullMailboxName() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxACLUpdated\":{" + - " \"mailboxPath\":{" + - " \"namespace\":230192.06," + - " \"user\":180806," + - " \"name\":null" + - " }," + - " \"aclDiff\":{" + - " \"oldACL\":{}," + - " \"newACL\":{\"$any\":\"ar\"}}," + - " \"mailboxId\":\"123\"," + - " \"sessionId\":6," + - " \"user\":\"user\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - - @Test - void mailboxACLUpdatedShouldThrowWhenMailboxNameIdIsANumber() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxACLUpdated\":{" + - " \"mailboxPath\":{" + - " \"namespace\":230192.06," + - " \"user\":\"bob\"," + - " \"name\":160205" + - " }," + - " \"aclDiff\":{" + - " \"oldACL\":{}," + - " \"newACL\":{\"$any\":\"ar\"}}," + - " \"mailboxId\":\"123\"," + - " \"sessionId\":6," + - " \"user\":\"user\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - } + @Test + void mailboxACLUpdatedShouldThrowWhenMissingMailboxPath() { + assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( + "{" + + " \"MailboxACLUpdated\":{" + + " \"mailboxPath\":{" + + " \"namespace\":230192.06," + + " \"user\":\"bob\"," + + " \"name\":\"mailboxName\"" + + " }," + + " \"aclDiff\":{" + + " \"oldACL\":{}," + + " \"newACL\":{\"$any\":\"ar\"}}," + + " \"mailboxId\":\"123\"," + + " \"sessionId\":6," + + " \"user\":\"user\"" + + " }" + + "}").get()) + .isInstanceOf(NoSuchElementException.class); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/70a4fd59/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxAddedSerializationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxAddedSerializationTest.java b/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxAddedSerializationTest.java index 4ee0db7..51c87e7 100644 --- a/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxAddedSerializationTest.java +++ b/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxAddedSerializationTest.java @@ -73,79 +73,6 @@ class MailboxAddedSerializationTest { } @Nested - class NullUserInMailboxPath { - private final String NULL_USER = null; - private final MailboxListener.MailboxAdded EVENT_2 = new MailboxListener.MailboxAdded( - MailboxSession.SessionId.of(42), - USER, - new MailboxPath(MailboxConstants.USER_NAMESPACE, NULL_USER, "mailboxName"), - TestId.of(18)); - - private static final String JSON_2 = "{" + - " \"MailboxAdded\":{" + - " \"mailboxPath\":{" + - " \"namespace\":\"#private\"," + - " \"name\":\"mailboxName\"" + - " }," + - " \"mailboxId\":\"18\"," + - " \"user\":\"user\"," + - " \"sessionId\":42" + - " }" + - "}"; - - @Test - void mailboxAddedShouldBeWellSerializedWithNullUser() { - assertThatJson(EVENT_SERIALIZER.toJson(EVENT_2)) - .isEqualTo(JSON_2); - } - - @Test - void mailboxAddedShouldBeWellDeSerializedWithNullUser() { - assertThat(EVENT_SERIALIZER.fromJson(JSON_2).get()) - .isEqualTo(EVENT_2); - } - } - - @Nested - class NullNameSpaceInMailboxPath { - @Test - void mailboxAddedShouldBeWellDeSerializedWhenMissingNameSpace() { - assertThat(EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxAdded\":{" + - " \"mailboxPath\":{" + - " \"user\":\"bob\"," + - " \"name\":\"mailboxName\"" + - " }," + - " \"mailboxId\":\"18\"," + - " \"user\":\"user\"," + - " \"sessionId\":42" + - " }" + - "}").get()) - .isEqualTo(EVENT_1); - } - - - @Test - void mailboxAddedShouldBeWellDeSerializedWhenNullNameSpace() { - assertThat(EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxAdded\":{" + - " \"mailboxPath\":{" + - " \"namespace\":null," + - " \"user\":\"bob\"," + - " \"name\":\"mailboxName\"" + - " }," + - " \"mailboxId\":\"18\"," + - " \"user\":\"user\"," + - " \"sessionId\":42" + - " }" + - "}").get()) - .isEqualTo(EVENT_1); - } - } - - @Nested class DeserializationErrors { @Test @@ -207,73 +134,5 @@ class MailboxAddedSerializationTest { "}").get()) .isInstanceOf(NoSuchElementException.class); } - - @Test - void fromJsonShouldRejectLongNamespace() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson("{" + - " \"MailboxAdded\":{" + - " \"mailboxPath\":{" + - " \"namespace\":12," + - " \"user\":\"bob\"," + - " \"name\":\"mailboxName\"" + - " }," + - " \"mailboxId\":\"18\"," + - " \"user\":\"user\"," + - " \"sessionId\":18" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - - @Test - void fromJsonShouldRejectLongUserInMailboxPath() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson("{" + - " \"MailboxAdded\":{" + - " \"mailboxPath\":{" + - " \"namespace\":\"#private\"," + - " \"user\":12," + - " \"name\":\"mailboxName\"" + - " }," + - " \"mailboxId\":\"18\"," + - " \"user\":\"user\"," + - " \"sessionId\":18" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - - @Test - void fromJsonShouldRejectLongName() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson("{" + - " \"MailboxAdded\":{" + - " \"mailboxPath\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"bob\"," + - " \"name\":1" + - " }," + - " \"mailboxId\":\"18\"," + - " \"user\":\"user\"," + - " \"sessionId\":18" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - - @Test - void fromJsonShouldRejectNullName() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson("{" + - " \"MailboxAdded\":{" + - " \"mailboxPath\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"bob\"," + - " \"name\":null" + - " }," + - " \"mailboxId\":\"18\"," + - " \"user\":\"user\"," + - " \"sessionId\":18" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/70a4fd59/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxDeletionSerializationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxDeletionSerializationTest.java b/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxDeletionSerializationTest.java index fc7a708..f0f9f66 100644 --- a/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxDeletionSerializationTest.java +++ b/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxDeletionSerializationTest.java @@ -90,72 +90,6 @@ class MailboxDeletionSerializationTest { } @Nested - class NullOrEmptyNameSpaceInMailboxPath { - - @Test - void mailboxAddedShouldBeWellDeSerializedWhenEmptyNameSpace() { - assertThat(EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxDeletion\":{" + - " \"sessionId\":3652," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"namespace\":\"\"," + - " \"user\":\"user\"," + - " \"name\":\"mailboxName\"" + - " }," + - " \"quotaRoot\":\"user@domain\"," + - " \"deletedMessageCount\":60," + - " \"totalDeletedSize\":100," + - " \"mailboxId\":\"789\"" + - " }" + - "}").get()) - .isEqualTo(DEFAULT_MAILBOX_DELETION_EVENT); - } - } - - @Nested - class NullUserInMailboxPath { - - private final String nulUser = null; - private final MailboxListener.MailboxDeletion nullUserInMailboxPathEvent = new MailboxListener.MailboxDeletion( - SESSION_ID, - USER, - new MailboxPath(USER_NAMESPACE, nulUser, "mailboxName"), - QUOTA_ROOT, - DELETED_MESSAGE_COUNT, - TOTAL_DELETED_SIZE, - MAILBOX_ID); - private final String nullUserMailboxEventJson = - "{" + - " \"MailboxDeletion\":{" + - " \"sessionId\":3652," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"namespace\":\"#private\"," + - " \"name\":\"mailboxName\"" + - " }," + - " \"quotaRoot\":\"user@domain\"," + - " \"deletedMessageCount\":60," + - " \"totalDeletedSize\":100," + - " \"mailboxId\":\"789\"" + - " }" + - "}"; - - @Test - void mailboxAddedShouldBeWellSerializedWhenNullUserInMailboxPath() { - assertThatJson(EVENT_SERIALIZER.toJson(nullUserInMailboxPathEvent)) - .isEqualTo(nullUserMailboxEventJson); - } - - @Test - void mailboxAddedShouldBeWellDeSerializedWhenNullUserInMailboxPath() { - assertThat(EVENT_SERIALIZER.fromJson(nullUserMailboxEventJson).get()) - .isEqualTo(nullUserInMailboxPathEvent); - } - } - - @Nested class EmptyQuotaRoot { private final MailboxListener.MailboxDeletion emptyQuotaRootEvent = new MailboxListener.MailboxDeletion( SESSION_ID, @@ -490,102 +424,20 @@ class MailboxDeletionSerializationTest { .isInstanceOf(NoSuchElementException.class); } - @Nested - class DeserializationErrorOnMailboxPath { - - @Nested - class DeserializationErrorOnNameSpace { - @Test - void mailboxAddedShouldThrowWhenNameSpaceIsNotAString() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxDeletion\":{" + - " \"sessionId\":3652," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"namespace\":4268.548," + - " \"user\":\"user\"," + - " \"name\":\"mailBoxName\"" + - " }," + - " \"quotaRoot\":\"user@domain\"," + - " \"deletedMessageCount\":60," + - " \"totalDeletedSize\":100," + - " \"mailboxId\":\"789\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - } - - @Nested - class DeserializationErrorOnUser { - @Test - void mailboxAddedShouldThrowWhenUserIsNotAString() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxDeletion\":{" + - " \"sessionId\":3652," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"namespace\":\"#private\"," + - " \"user\":153274," + - " \"name\":\"mailBoxName\"" + - " }," + - " \"quotaRoot\":\"user@domain\"," + - " \"deletedMessageCount\":60," + - " \"totalDeletedSize\":100," + - " \"mailboxId\":\"789\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - } - - @Nested - class DeserializationErrorOnMailboxName { - - @Test - void mailboxAddedShouldThrowWhenNullMailboxName() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxDeletion\":{" + - " \"sessionId\":3652," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"user\"," + - " \"name\":null" + - " }," + - " \"quotaRoot\":\"user@domain\"," + - " \"deletedMessageCount\":60," + - " \"totalDeletedSize\":100," + - " \"mailboxId\":\"789\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - - @Test - void mailboxAddedShouldThrowWhenMailboxNameIdIsANumber() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxDeletion\":{" + - " \"sessionId\":3652," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"user\"," + - " \"name\":4578" + - " }," + - " \"quotaRoot\":\"user@domain\"," + - " \"deletedMessageCount\":60," + - " \"totalDeletedSize\":100," + - " \"mailboxId\":\"789\"" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - } + @Test + void mailboxAddedShouldThrowWhenMissingPath() { + assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( + "{" + + " \"MailboxDeletion\":{" + + " \"sessionId\":3652," + + " \"user\":\"user\"," + + " \"quotaRoot\":\"user@domain\"," + + " \"deletedMessageCount\":60," + + " \"totalDeletedSize\":100," + + " \"mailboxId\":\"789\"" + + " }" + + "}").get()) + .isInstanceOf(NoSuchElementException.class); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/70a4fd59/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxRenamedSerializationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxRenamedSerializationTest.java b/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxRenamedSerializationTest.java index 7ef472d..1989186 100644 --- a/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxRenamedSerializationTest.java +++ b/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxRenamedSerializationTest.java @@ -86,203 +86,6 @@ class MailboxRenamedSerializationTest { } @Nested - class NullUserInMailboxPath { - - @Nested - class NullUserInOldPath { - private final String nullUser = null; - private final MailboxListener.MailboxRenamed eventWithNullUserOldPath = new MailboxListener.MailboxRenamed( - DEFAULT_SESSION_ID, - DEFAULT_USER, - new MailboxPath(USER_NAMESPACE, nullUser, OLD_MAILBOX_NAME), - DEFAULT_MAILBOX_ID, - DEFAULT_NEW_MAILBOX_PATH); - - private static final String EVENT_JSON_WITH_NULL_USER_OLD_PATH = "{" + - " \"MailboxRenamed\":{" + - " \"sessionId\":123456789," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"namespace\":\"#private\"," + - " \"name\":\"oldMailboxName\"" + - " }," + - " \"mailboxId\":\"123456\"," + - " \"newPath\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"user\"," + - " \"name\":\"newMailboxName\"" + - " }" + - " }" + - "}"; - - @Test - void mailboxRenamedShouldBeWellSerialized() { - assertThatJson(EVENT_SERIALIZER.toJson(eventWithNullUserOldPath)) - .isEqualTo(EVENT_JSON_WITH_NULL_USER_OLD_PATH); - } - - @Test - void mailboxRenamedShouldBeWellDeSerialized() { - assertThat(EVENT_SERIALIZER.fromJson(EVENT_JSON_WITH_NULL_USER_OLD_PATH).get()) - .isEqualTo(eventWithNullUserOldPath); - } - } - - @Nested - class NullUserInNewPath { - private final String nullUser = null; - private final MailboxListener.MailboxRenamed eventWithNullUserNewPath = new MailboxListener.MailboxRenamed( - DEFAULT_SESSION_ID, - DEFAULT_USER, - DEFAULT_OLD_MAILBOX_PATH, - DEFAULT_MAILBOX_ID, - new MailboxPath(USER_NAMESPACE, nullUser, NEW_MAILBOX_NAME)); - - private static final String EVENT_JSON_WITH_NULL_USER_NEW_PATH = "{" + - " \"MailboxRenamed\":{" + - " \"sessionId\":123456789," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"user\"," + - " \"name\":\"oldMailboxName\"" + - " }," + - " \"mailboxId\":\"123456\"," + - " \"newPath\":{" + - " \"namespace\":\"#private\"," + - " \"name\":\"newMailboxName\"" + - " }" + - " }" + - "}"; - - @Test - void mailboxRenamedShouldBeWellSerialized() { - assertThatJson(EVENT_SERIALIZER.toJson(eventWithNullUserNewPath)) - .isEqualTo(EVENT_JSON_WITH_NULL_USER_NEW_PATH); - } - - @Test - void mailboxRenamedShouldBeWellDeSerialized() { - assertThat(EVENT_SERIALIZER.fromJson(EVENT_JSON_WITH_NULL_USER_NEW_PATH).get()) - .isEqualTo(eventWithNullUserNewPath); - } - } - - @Nested - class NullUserInOldPathAndNewPath { - private final String nullUser = null; - private final MailboxListener.MailboxRenamed eventWithNullUserBothPath = new MailboxListener.MailboxRenamed( - DEFAULT_SESSION_ID, - DEFAULT_USER, - new MailboxPath(USER_NAMESPACE, nullUser, OLD_MAILBOX_NAME), - DEFAULT_MAILBOX_ID, - new MailboxPath(USER_NAMESPACE, nullUser, NEW_MAILBOX_NAME)); - - private static final String EVENT_JSON_WITH_NULL_USER_BOTH_PATH = - "{" + - " \"MailboxRenamed\":{" + - " \"sessionId\":123456789," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"namespace\":\"#private\"," + - " \"name\":\"oldMailboxName\"" + - " }," + - " \"mailboxId\":\"123456\"," + - " \"newPath\":{" + - " \"namespace\":\"#private\"," + - " \"name\":\"newMailboxName\"" + - " }" + - " }" + - "}"; - - @Test - void mailboxRenamedShouldBeWellSerialized() { - assertThatJson(EVENT_SERIALIZER.toJson(eventWithNullUserBothPath)) - .isEqualTo(EVENT_JSON_WITH_NULL_USER_BOTH_PATH); - } - - @Test - void mailboxRenamedShouldBeWellDeSerialized() { - assertThat(EVENT_SERIALIZER.fromJson(EVENT_JSON_WITH_NULL_USER_BOTH_PATH).get()) - .isEqualTo(eventWithNullUserBothPath); - } - } - } - - @Nested - class EmptyNameSpaceInMailboxPath { - - @Test - void mailboxRenamedShouldBeWellDeSerializedWhenEmptyNameSpaceOldPath() { - assertThat(EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxRenamed\":{" + - " \"sessionId\":123456789," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"user\":\"user\"," + - " \"namespace\":\"\"," + - " \"name\":\"oldMailboxName\"" + - " }," + - " \"mailboxId\":\"123456\"," + - " \"newPath\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"user\"," + - " \"name\":\"newMailboxName\"" + - " }" + - " }" + - "}").get()) - .isEqualTo(DEFAULT_MAILBOX_RENAMED_EVENT); - } - - @Test - void mailboxRenamedShouldBeWellDeSerializedWhenEmptyNameSpaceNewPath() { - assertThat(EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxRenamed\":{" + - " \"sessionId\":123456789," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"user\":\"user\"," + - " \"namespace\":\"#private\"," + - " \"name\":\"oldMailboxName\"" + - " }," + - " \"mailboxId\":\"123456\"," + - " \"newPath\":{" + - " \"namespace\":\"\"," + - " \"user\":\"user\"," + - " \"name\":\"newMailboxName\"" + - " }" + - " }" + - "}").get()) - .isEqualTo(DEFAULT_MAILBOX_RENAMED_EVENT); - } - - @Test - void mailboxRenamedShouldBeWellDeSerializedWhenEmptyNameSpaceBothPath() { - assertThat(EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxRenamed\":{" + - " \"sessionId\":123456789," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"user\":\"user\"," + - " \"namespace\":\"\"," + - " \"name\":\"oldMailboxName\"" + - " }," + - " \"mailboxId\":\"123456\"," + - " \"newPath\":{" + - " \"namespace\":\"\"," + - " \"user\":\"user\"," + - " \"name\":\"newMailboxName\"" + - " }" + - " }" + - "}").get()) - .isEqualTo(DEFAULT_MAILBOX_RENAMED_EVENT); - } - } - - @Nested class DeserializationErrors { @Test void mailboxRenamedDeSerializeShouldThrowWhenMissingUser() { @@ -341,7 +144,6 @@ class MailboxRenamedSerializationTest { " \"user\":\"user\"," + " \"name\":\"oldMailboxName\"" + " }," + - " \"mailboxId\":123456," + " \"newPath\":{" + " \"namespace\":\"#private\"," + " \"user\":\"user\"," + @@ -352,216 +154,28 @@ class MailboxRenamedSerializationTest { .isInstanceOf(NoSuchElementException.class); } - @Nested - class DeserializationErrorOnOldMailboxPath { - - @Test - void mailboxRenamedDeSerializeShouldThrowWhenMissingOldPathNameSpace() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxRenamed\":{" + - " \"sessionId\":123456789," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"user\":\"user\"," + - " \"name\":\"oldMailboxName\"" + - " }," + - " \"mailboxId\":123456," + - " \"newPath\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"user\"," + - " \"name\":\"newMailboxName\"" + - " }" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - - @Test - void mailboxRenamedDeSerializeShouldThrowWhenOldPathNameSpaceNotString() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxRenamed\":{" + - " \"sessionId\":123456789," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"namespace\":999," + - " \"user\":\"user\"," + - " \"name\":\"oldMailboxName\"" + - " }," + - " \"mailboxId\":123456," + - " \"newPath\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"user\"," + - " \"name\":\"newMailboxName\"" + - " }" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - - @Test - void mailboxRenamedDeSerializeShouldThrowWhenMissingOldPathUser() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxRenamed\":{" + - " \"sessionId\":123456789," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"namespace\":\"#private\"," + - " \"name\":\"oldMailboxName\"" + - " }," + - " \"mailboxId\":123456," + - " \"newPath\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"user\"," + - " \"name\":\"newMailboxName\"" + - " }" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - - @Test - void mailboxRenamedDeSerializeShouldThrowWhenNotStringOldPathUser() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxRenamed\":{" + - " \"sessionId\":123456789," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"namespace\":\"#private\"," + - " \"user\":666," + - " \"name\":\"oldMailboxName\"" + - " }," + - " \"mailboxId\":123456," + - " \"newPath\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"user\"," + - " \"name\":\"newMailboxName\"" + - " }" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - - @Test - void mailboxRenamedDeSerializeShouldThrowWhenMissingOldPathName() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxRenamed\":{" + - " \"sessionId\":123456789," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"user\"" + - " }," + - " \"mailboxId\":123456," + - " \"newPath\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"user\"," + - " \"name\":\"newMailboxName\"" + - " }" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - - @Test - void mailboxRenamedDeSerializeShouldThrowWhenNotStringOldPathName() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxRenamed\":{" + - " \"sessionId\":123456789," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"user\"," + - " \"name\":1456" + - " }," + - " \"mailboxId\":123456," + - " \"newPath\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"user\"," + - " \"name\":\"newMailboxName\"" + - " }" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - - @Test - void mailboxRenamedDeSerializeShouldThrowWhenMissingNewPathNameSpace() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxRenamed\":{" + - " \"sessionId\":123456789," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"user\"," + - " \"name\":\"oldMailboxName\"" + - " }," + - " \"mailboxId\":123456," + - " \"newPath\":{" + - " \"user\":\"user\"," + - " \"name\":\"newMailboxName\"" + - " }" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - - @Test - void mailboxRenamedDeSerializeShouldThrowWhenNewPathNameSpaceNotString() { - String eventWithNumberMailboxId = - "{" + + @Test + void mailboxRenamedDeSerializeShouldThrowWhenMissingOldPath() { + assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( + "{" + " \"MailboxRenamed\":{" + " \"sessionId\":123456789," + " \"user\":\"user\"," + - " \"path\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"user\"," + - " \"name\":\"oldMailboxName\"" + - " }," + " \"mailboxId\":123456," + " \"newPath\":{" + - " \"namespace\":999," + - " \"user\":\"user\"," + - " \"name\":\"newMailboxName\"" + - " }" + - " }" + - "}"; - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson(eventWithNumberMailboxId).get()) - .isInstanceOf(NoSuchElementException.class); - } - - @Test - void mailboxRenamedDeSerializeShouldThrowWhenMissingNewPathUser() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxRenamed\":{" + - " \"sessionId\":123456789," + - " \"user\":\"user\"," + - " \"path\":{" + " \"namespace\":\"#private\"," + " \"user\":\"user\"," + - " \"name\":\"oldMailboxName\"" + - " }," + - " \"mailboxId\":123456," + - " \"newPath\":{" + - " \"namespace\":\"#private\"," + " \"name\":\"newMailboxName\"" + " }" + " }" + "}").get()) .isInstanceOf(NoSuchElementException.class); - } + } - @Test - void mailboxRenamedDeSerializeShouldThrowWhenNotStringNewPathUser() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + + @Test + void mailboxRenamedDeSerializeShouldThrowWhenMissingNewPath() { + assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( + "{" + " \"MailboxRenamed\":{" + " \"sessionId\":123456789," + " \"user\":\"user\"," + @@ -570,61 +184,10 @@ class MailboxRenamedSerializationTest { " \"user\":\"user\"," + " \"name\":\"oldMailboxName\"" + " }," + - " \"mailboxId\":123456," + - " \"newPath\":{" + - " \"namespace\":\"#private\"," + - " \"user\":4569," + - " \"name\":\"newMailboxName\"" + - " }" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - - @Test - void mailboxRenamedDeSerializeShouldThrowWhenMissingNewPathName() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxRenamed\":{" + - " \"sessionId\":123456789," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"user\"," + - " \"name\":\"newMailboxName\"" + - " }," + - " \"mailboxId\":123456," + - " \"newPath\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"user\"" + - " }" + - " }" + - "}").get()) - .isInstanceOf(NoSuchElementException.class); - } - - @Test - void mailboxRenamedDeSerializeShouldThrowWhenNotStringNewPathName() { - assertThatThrownBy(() -> EVENT_SERIALIZER.fromJson( - "{" + - " \"MailboxRenamed\":{" + - " \"sessionId\":123456789," + - " \"user\":\"user\"," + - " \"path\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"user\"," + - " \"name\":\"newMailboxName\"" + - " }," + - " \"mailboxId\":123456," + - " \"newPath\":{" + - " \"namespace\":\"#private\"," + - " \"user\":\"user\"," + - " \"name\":7529" + - " }" + + " \"mailboxId\":123456" + " }" + "}").get()) .isInstanceOf(NoSuchElementException.class); - } } } } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org