JAMES-2469 MAILBOX provisioning is no more needed in SetMessagesMethodTest
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fe846d55 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fe846d55 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fe846d55 Branch: refs/heads/master Commit: fe846d55419c4bb545c92f173576ab7bda3df477 Parents: a35e4b2 Author: benwa <[email protected]> Authored: Sat Jul 14 09:59:29 2018 +0700 Committer: benwa <[email protected]> Committed: Wed Jul 25 09:35:37 2018 +0700 ---------------------------------------------------------------------- .../methods/integration/SetMessagesMethodTest.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/fe846d55/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java index 22ca5f8..faf69fd 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java @@ -176,10 +176,6 @@ public abstract class SetMessagesMethodTest { accessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), USERNAME, PASSWORD); bobAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), BOB, BOB_PASSWORD); - mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.OUTBOX); - mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.TRASH); - mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.DRAFTS); - mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.SENT); await(); } @@ -1986,8 +1982,8 @@ public abstract class SetMessagesMethodTest { public void setMessagesShouldNotAllowDraftCreationInADelegatedMailbox() throws Exception { String messageCreationId = "creationId1337"; - jmapServer.getProbe(ACLProbeImpl.class) - .addRights( + mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.DRAFTS); + aclProbe.addRights( MailboxPath.forUser(USERNAME, DefaultMailboxes.DRAFTS), BOB, MailboxACL.FULL_RIGHTS); @@ -3210,7 +3206,6 @@ public abstract class SetMessagesMethodTest { @Test public void mailboxIdsShouldBeInDestinationWhenUsingForMoveWithoutTrashFolder() throws Exception { - mailboxProbe.deleteMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.TRASH); String newMailboxName = "heartFolder"; String heartFolderId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, newMailboxName).serialize(); @@ -3530,7 +3525,7 @@ public abstract class SetMessagesMethodTest { @Test public void setMessagesShouldWorkForMoveToTrash() throws Exception { - String trashId = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.TRASH).getMailboxId().serialize(); + String trashId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.TRASH).serialize(); ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z"); ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, MailboxPath.forUser(USERNAME, MailboxConstants.INBOX), @@ -3566,7 +3561,7 @@ public abstract class SetMessagesMethodTest { public void copyToTrashShouldWork() throws Exception { String newMailboxName = "heartFolder"; mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, newMailboxName); - String trashId = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.TRASH).getMailboxId().serialize(); + String trashId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.TRASH).serialize(); ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z"); ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, MailboxPath.forUser(USERNAME, MailboxConstants.INBOX), --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
