This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit a6cb61e6567841ca753c480ba6f7011025d9c45c
Author: Rene Cordier <rcord...@linagora.com>
AuthorDate: Tue Jan 14 16:20:23 2020 +0700
JAMES-2993 Refine the assertions on exceptions in MailboxManagerTest
---
.../apache/james/mailbox/MailboxManagerTest.java | 36 ++++++++++++----------
1 file changed, 19 insertions(+), 17 deletions(-)
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 8ef3425..9fc5c73 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
@@ -53,7 +53,9 @@ import org.apache.james.mailbox.events.MessageMoveEvent;
import org.apache.james.mailbox.exception.AnnotationException;
import
org.apache.james.mailbox.exception.HasEmptyMailboxNameInHierarchyException;
import org.apache.james.mailbox.exception.InboxAlreadyCreated;
+import org.apache.james.mailbox.exception.InsufficientRightsException;
import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MailboxExistsException;
import org.apache.james.mailbox.exception.MailboxNotFoundException;
import org.apache.james.mailbox.exception.TooLongMailboxNameException;
import org.apache.james.mailbox.extension.PreDeletionHook;
@@ -555,7 +557,7 @@ public abstract class MailboxManagerTest<T extends
MailboxManager> {
MailboxPath inbox = MailboxPath.inbox(session);
assertThatThrownBy(() -> mailboxManager.updateAnnotations(inbox,
session, ImmutableList.of(privateAnnotation)))
- .isInstanceOf(MailboxException.class);
+ .isInstanceOf(MailboxNotFoundException.class);
}
@Test
@@ -587,7 +589,7 @@ public abstract class MailboxManagerTest<T extends
MailboxManager> {
MailboxPath inbox = MailboxPath.inbox(session);
assertThatThrownBy(() -> mailboxManager.getAllAnnotations(inbox,
session))
- .isInstanceOf(MailboxException.class);
+ .isInstanceOf(MailboxNotFoundException.class);
}
@Test
@@ -610,7 +612,7 @@ public abstract class MailboxManagerTest<T extends
MailboxManager> {
MailboxPath inbox = MailboxPath.inbox(session);
assertThatThrownBy(() ->
mailboxManager.getAnnotationsByKeys(inbox, session,
ImmutableSet.of(privateKey)))
- .isInstanceOf(MailboxException.class);
+ .isInstanceOf(MailboxNotFoundException.class);
}
@Test
@@ -633,7 +635,7 @@ public abstract class MailboxManagerTest<T extends
MailboxManager> {
MailboxPath inbox = MailboxPath.inbox(session);
assertThatThrownBy(() ->
mailboxManager.getAnnotationsByKeysWithAllDepth(inbox, session,
ImmutableSet.of(privateKey)))
- .isInstanceOf(MailboxException.class);
+ .isInstanceOf(MailboxNotFoundException.class);
}
@Test
@@ -1574,7 +1576,7 @@ public abstract class MailboxManagerTest<T extends
MailboxManager> {
mailboxManager.createMailbox(mailboxPath1, sessionUser1);
assertThatThrownBy(() ->
mailboxManager.renameMailbox(mailboxPath1, mailboxPath2, sessionUser2))
- .isInstanceOf(MailboxException.class);
+ .isInstanceOf(MailboxNotFoundException.class);
}
@Test
@@ -1587,7 +1589,7 @@ public abstract class MailboxManagerTest<T extends
MailboxManager> {
Optional<MailboxId> mailboxId =
mailboxManager.createMailbox(mailboxPath1, sessionUser1);
assertThatThrownBy(() ->
mailboxManager.renameMailbox(mailboxId.get(), mailboxPath2, sessionUser2))
- .isInstanceOf(MailboxException.class);
+ .isInstanceOf(MailboxNotFoundException.class);
}
@Test
@@ -1650,7 +1652,7 @@ public abstract class MailboxManagerTest<T extends
MailboxManager> {
mailboxManager.createMailbox(inbox, session);
assertThatThrownBy(() -> mailboxManager.createMailbox(inbox,
session))
- .isInstanceOf(MailboxException.class);
+ .isInstanceOf(MailboxExistsException.class);
}
@Test
@@ -1719,7 +1721,7 @@ public abstract class MailboxManagerTest<T extends
MailboxManager> {
mailboxManager.createMailbox(inbox, sessionUser1);
assertThatThrownBy(() -> mailboxManager.deleteMailbox(inbox,
sessionUser2))
- .isInstanceOf(MailboxException.class);
+ .isInstanceOf(MailboxNotFoundException.class);
}
@@ -1732,7 +1734,7 @@ public abstract class MailboxManagerTest<T extends
MailboxManager> {
MailboxId inboxId = mailboxManager.createMailbox(inbox,
sessionUser1).get();
assertThatThrownBy(() -> mailboxManager.deleteMailbox(inboxId,
sessionUser2))
- .isInstanceOf(MailboxException.class);
+ .isInstanceOf(MailboxNotFoundException.class);
}
@Test
@@ -1912,7 +1914,7 @@ public abstract class MailboxManagerTest<T extends
MailboxManager> {
.appendMessage(AppendCommand.from(message), sessionUser1);
assertThatThrownBy(() ->
mailboxManager.moveMessages(MessageRange.all(), inbox1, inbox2, sessionUser2))
- .isInstanceOf(MailboxException.class);
+ .isInstanceOf(MailboxNotFoundException.class);
}
@Test
@@ -1932,7 +1934,7 @@ public abstract class MailboxManagerTest<T extends
MailboxManager> {
.appendMessage(AppendCommand.from(message), sessionUser1);
assertThatThrownBy(() ->
mailboxManager.moveMessages(MessageRange.all(), inbox1, inbox2, sessionUser1))
- .isInstanceOf(MailboxException.class);
+ .isInstanceOf(MailboxNotFoundException.class);
}
@Test
@@ -2042,7 +2044,7 @@ public abstract class MailboxManagerTest<T extends
MailboxManager> {
.appendMessage(AppendCommand.from(message), sessionUser1);
assertThatThrownBy(() ->
mailboxManager.copyMessages(MessageRange.all(), inbox1, inbox2, sessionUser2))
- .isInstanceOf(MailboxException.class);
+ .isInstanceOf(MailboxNotFoundException.class);
}
@Test
@@ -2062,7 +2064,7 @@ public abstract class MailboxManagerTest<T extends
MailboxManager> {
.appendMessage(AppendCommand.from(message), sessionUser1);
assertThatThrownBy(() ->
mailboxManager.copyMessages(MessageRange.all(), inbox1, inbox2, sessionUser1))
- .isInstanceOf(MailboxException.class);
+ .isInstanceOf(MailboxNotFoundException.class);
}
@Test
@@ -2080,7 +2082,7 @@ public abstract class MailboxManagerTest<T extends
MailboxManager> {
assertThatThrownBy(() -> mailboxManager
.createMailbox(MailboxPath.forUser(USER_2, "mailboxName"),
session))
- .isInstanceOf(MailboxException.class);
+ .isInstanceOf(InsufficientRightsException.class);
}
@Test
@@ -2088,7 +2090,7 @@ public abstract class MailboxManagerTest<T extends
MailboxManager> {
session = mailboxManager.createSystemSession(USER_1);
assertThatThrownBy(() ->
mailboxManager.getMailbox(MailboxPath.forUser(USER_1, "mailboxName"), session))
- .isInstanceOf(MailboxException.class);
+ .isInstanceOf(MailboxNotFoundException.class);
}
@Test
@@ -2122,7 +2124,7 @@ public abstract class MailboxManagerTest<T extends
MailboxManager> {
mailboxManager.createMailbox(mailboxPath, sessionUser1);
assertThatThrownBy(() -> mailboxManager.getMailbox(mailboxPath,
sessionUser2))
- .isInstanceOf(MailboxException.class);
+ .isInstanceOf(MailboxNotFoundException.class);
}
@Test
@@ -2134,7 +2136,7 @@ public abstract class MailboxManagerTest<T extends
MailboxManager> {
Optional<MailboxId> mailboxId =
mailboxManager.createMailbox(mailboxPath, sessionUser1);
assertThatThrownBy(() ->
mailboxManager.getMailbox(mailboxId.get(), sessionUser2))
- .isInstanceOf(MailboxException.class);
+ .isInstanceOf(MailboxNotFoundException.class);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
