JAMES-2361 pass AccessToken instead of String and serialize when needed
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d16c5340 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d16c5340 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d16c5340 Branch: refs/heads/master Commit: d16c5340795baee78b46efac68c1e39daa2f2da6 Parents: dcf7934 Author: Matthieu Baechler <matth...@apache.org> Authored: Tue Mar 20 17:20:01 2018 +0100 Committer: Matthieu Baechler <matth...@apache.org> Committed: Mon Mar 26 14:57:23 2018 +0200 ---------------------------------------------------------------------- .../methods/integration/SendMDNMethodTest.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/d16c5340/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java index ac5a42e..a33b64a 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java @@ -135,7 +135,7 @@ public abstract class SendMDNMethodTest { .body() .path(ARGUMENTS + ".created." + messageCreationId + ".id"); - calmlyAwait.until(() -> !getMessageIdListForAccount(homerAccessToken.serialize()).isEmpty()); + calmlyAwait.until(() -> !getMessageIdListForAccount(homerAccessToken).isEmpty()); } private void sendAWrongInitialMessage() { @@ -167,7 +167,7 @@ public abstract class SendMDNMethodTest { .body() .path(ARGUMENTS + ".created." + messageCreationId + ".id"); - calmlyAwait.until(() -> !getMessageIdListForAccount(homerAccessToken.serialize()).isEmpty()); + calmlyAwait.until(() -> !getMessageIdListForAccount(homerAccessToken).isEmpty()); } private URIBuilder baseUri() { @@ -188,7 +188,7 @@ public abstract class SendMDNMethodTest { public void sendMDNShouldReturnCreatedMessageId() { bartSendMessageToHomer(); - List<String> messageIds = getMessageIdListForAccount(homerAccessToken.serialize()); + List<String> messageIds = getMessageIdListForAccount(homerAccessToken); String creationId = "creation-1"; given() @@ -253,7 +253,7 @@ public abstract class SendMDNMethodTest { @Test public void sendMDNShouldFailOnInvalidMessages() { sendAWrongInitialMessage(); - List<String> messageIds = getMessageIdListForAccount(homerAccessToken.serialize()); + List<String> messageIds = getMessageIdListForAccount(homerAccessToken); String creationId = "creation-1"; @@ -292,7 +292,7 @@ public abstract class SendMDNMethodTest { public void sendMDNShouldSendAMDNBackToTheOriginalMessageAuthor() { bartSendMessageToHomer(); - List<String> messageIds = getMessageIdListForAccount(homerAccessToken.serialize()); + List<String> messageIds = getMessageIdListForAccount(homerAccessToken); // HOMER sends a MDN back to BART String creationId = "creation-1"; @@ -337,7 +337,7 @@ public abstract class SendMDNMethodTest { public void sendMDNShouldPositionTheReportAsAnAttachment() { bartSendMessageToHomer(); - List<String> messageIds = getMessageIdListForAccount(homerAccessToken.serialize()); + List<String> messageIds = getMessageIdListForAccount(homerAccessToken); // USER sends a MDN back to BART String creationId = "creation-1"; @@ -415,7 +415,7 @@ public abstract class SendMDNMethodTest { public void sendMDNShouldReturnMaxQuotaReachedWhenUserReachedHisQuota() throws MailboxException { bartSendMessageToHomer(); - List<String> messageIds = getMessageIdListForAccount(homerAccessToken.serialize()); + List<String> messageIds = getMessageIdListForAccount(homerAccessToken); QuotaProbe quotaProbe = jmapServer.getProbe(QuotaProbesImpl.class); String inboxQuotaRoot = quotaProbe.getQuotaRoot("#private", HOMER, DefaultMailboxes.INBOX); @@ -532,9 +532,9 @@ public abstract class SendMDNMethodTest { .getList(ARGUMENTS + ".list"); } - private List<String> getMessageIdListForAccount(String accessToken) { + private List<String> getMessageIdListForAccount(AccessToken accessToken) { return with() - .header("Authorization", accessToken) + .header("Authorization", accessToken.serialize()) .body("[[\"getMessageList\", {}, \"#0\"]]") .post("/jmap") .then() --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
