Rename people in tests to make it easier to read
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/02ed3ab8 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/02ed3ab8 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/02ed3ab8 Branch: refs/heads/master Commit: 02ed3ab83ec5afb11ffb530b25b803078b7e2cdc Parents: 336d1f9 Author: Matthieu Baechler <matth...@apache.org> Authored: Tue Mar 20 16:35:19 2018 +0100 Committer: Matthieu Baechler <matth...@apache.org> Committed: Mon Mar 26 14:57:23 2018 +0200 ---------------------------------------------------------------------- .../methods/integration/SendMDNMethodTest.java | 100 +++++++++---------- 1 file changed, 50 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/02ed3ab8/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 c1a586b..8d595eb 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 @@ -69,8 +69,8 @@ public abstract class SendMDNMethodTest { private static final String NAME = "[0][0]"; private static final String ARGUMENTS = "[0][1]"; private static final String USERS_DOMAIN = "domain.tld"; - private static final String USERNAME = "username@" + USERS_DOMAIN; - private static final String BOB = "bob@" + USERS_DOMAIN; + private static final String HOMER = "homer@" + USERS_DOMAIN; + private static final String BART = "bart@" + USERS_DOMAIN; private static final String PASSWORD = "password"; private static final String BOB_PASSWORD = "bobPassword"; @@ -78,8 +78,8 @@ public abstract class SendMDNMethodTest { protected abstract MessageId randomMessageId(); - private AccessToken accessToken; - private AccessToken bobAccessToken; + private AccessToken homerAccessToken; + private AccessToken bartAccessToken; private GuiceJamesServer jmapServer; @Before @@ -98,24 +98,24 @@ public abstract class SendMDNMethodTest { RestAssured.defaultParser = Parser.JSON; dataProbe.addDomain(USERS_DOMAIN); - dataProbe.addUser(USERNAME, PASSWORD); - dataProbe.addUser(BOB, BOB_PASSWORD); - mailboxProbe.createMailbox("#private", USERNAME, DefaultMailboxes.INBOX); - accessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), USERNAME, PASSWORD); - bobAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), BOB, BOB_PASSWORD); + dataProbe.addUser(HOMER, PASSWORD); + dataProbe.addUser(BART, BOB_PASSWORD); + mailboxProbe.createMailbox("#private", HOMER, DefaultMailboxes.INBOX); + homerAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), HOMER, PASSWORD); + bartAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), BART, BOB_PASSWORD); } private void sendAnInitialMessage() { String messageCreationId = "creationId"; - String outboxId = getOutboxId(bobAccessToken); + String outboxId = getOutboxId(bartAccessToken); String requestBody = "[" + " [" + " \"setMessages\"," + " {" + " \"create\": { \"" + messageCreationId + "\" : {" + - " \"headers\":{\"Disposition-Notification-To\":\"" + BOB + "\"}," + - " \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB + "\"}," + - " \"to\": [{ \"name\": \"User\", \"email\": \"" + USERNAME + "\"}]," + + " \"headers\":{\"Disposition-Notification-To\":\"" + BART + "\"}," + + " \"from\": { \"name\": \"Bob\", \"email\": \"" + BART + "\"}," + + " \"to\": [{ \"name\": \"User\", \"email\": \"" + HOMER + "\"}]," + " \"subject\": \"Message with an attachment\"," + " \"textBody\": \"Test body, plain text version\"," + " \"htmlBody\": \"Test <b>body</b>, HTML version\"," + @@ -127,7 +127,7 @@ public abstract class SendMDNMethodTest { "]"; with() - .header("Authorization", bobAccessToken.serialize()) + .header("Authorization", bartAccessToken.serialize()) .body(requestBody) .post("/jmap") .then() @@ -135,19 +135,19 @@ public abstract class SendMDNMethodTest { .body() .path(ARGUMENTS + ".created." + messageCreationId + ".id"); - calmlyAwait.until(() -> !getMessageIdListForAccount(accessToken.serialize()).isEmpty()); + calmlyAwait.until(() -> !getMessageIdListForAccount(homerAccessToken.serialize()).isEmpty()); } private void sendAWrongInitialMessage() { String messageCreationId = "creationId"; - String outboxId = getOutboxId(bobAccessToken); + String outboxId = getOutboxId(bartAccessToken); String requestBody = "[" + " [" + " \"setMessages\"," + " {" + " \"create\": { \"" + messageCreationId + "\" : {" + - " \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB + "\"}," + - " \"to\": [{ \"name\": \"User\", \"email\": \"" + USERNAME + "\"}]," + + " \"from\": { \"name\": \"Bob\", \"email\": \"" + BART + "\"}," + + " \"to\": [{ \"name\": \"User\", \"email\": \"" + HOMER + "\"}]," + " \"subject\": \"Message with an attachment\"," + " \"textBody\": \"Test body, plain text version\"," + " \"htmlBody\": \"Test <b>body</b>, HTML version\"," + @@ -159,7 +159,7 @@ public abstract class SendMDNMethodTest { "]"; with() - .header("Authorization", bobAccessToken.serialize()) + .header("Authorization", bartAccessToken.serialize()) .body(requestBody) .post("/jmap") .then() @@ -167,7 +167,7 @@ public abstract class SendMDNMethodTest { .body() .path(ARGUMENTS + ".created." + messageCreationId + ".id"); - calmlyAwait.until(() -> !getMessageIdListForAccount(accessToken.serialize()).isEmpty()); + calmlyAwait.until(() -> !getMessageIdListForAccount(homerAccessToken.serialize()).isEmpty()); } private URIBuilder baseUri() { @@ -188,11 +188,11 @@ public abstract class SendMDNMethodTest { public void sendMDNShouldReturnCreatedMessageId() { sendAnInitialMessage(); - List<String> messageIds = getMessageIdListForAccount(accessToken.serialize()); + List<String> messageIds = getMessageIdListForAccount(homerAccessToken.serialize()); String creationId = "creation-1"; given() - .header("Authorization", accessToken.serialize()) + .header("Authorization", homerAccessToken.serialize()) .body("[[\"setMessages\", {\"sendMDN\": {" + "\"" + creationId + "\":{" + " \"messageId\":\"" + messageIds.get(0) + "\"," + @@ -222,7 +222,7 @@ public abstract class SendMDNMethodTest { String creationId = "creation-1"; String randomMessageId = randomMessageId().serialize(); given() - .header("Authorization", accessToken.serialize()) + .header("Authorization", homerAccessToken.serialize()) .body("[[\"setMessages\", {\"sendMDN\": {" + "\"" + creationId + "\":{" + " \"messageId\":\"" + randomMessageId + "\"," + @@ -253,12 +253,12 @@ public abstract class SendMDNMethodTest { @Test public void sendMDNShouldFailOnInvalidMessages() { sendAWrongInitialMessage(); - List<String> messageIds = getMessageIdListForAccount(accessToken.serialize()); + List<String> messageIds = getMessageIdListForAccount(homerAccessToken.serialize()); String creationId = "creation-1"; given() - .header("Authorization", accessToken.serialize()) + .header("Authorization", homerAccessToken.serialize()) .body("[[\"setMessages\", {\"sendMDN\": {" + "\"" + creationId + "\":{" + " \"messageId\":\"" + messageIds.get(0) + "\"," + @@ -292,12 +292,12 @@ public abstract class SendMDNMethodTest { public void sendMDNShouldSendAMDNBackToTheOriginalMessageAuthor() { sendAnInitialMessage(); - List<String> messageIds = getMessageIdListForAccount(accessToken.serialize()); + List<String> messageIds = getMessageIdListForAccount(homerAccessToken.serialize()); - // USER sends a MDN back to BOB + // HOMER sends a MDN back to BART String creationId = "creation-1"; with() - .header("Authorization", accessToken.serialize()) + .header("Authorization", homerAccessToken.serialize()) .body("[[\"setMessages\", {\"sendMDN\": {" + "\"" + creationId + "\":{" + " \"messageId\":\"" + messageIds.get(0) + "\"," + @@ -313,19 +313,19 @@ public abstract class SendMDNMethodTest { "}}, \"#0\"]]") .post("/jmap"); - // BOB should have received it - calmlyAwait.until(() -> !listMessagesInMailbox(bobAccessToken, getInboxId(bobAccessToken)).isEmpty()); - List<String> bobInboxMessageIds = listMessagesInMailbox(bobAccessToken, getInboxId(bobAccessToken)); + // BART should have received it + calmlyAwait.until(() -> !listMessagesInMailbox(bartAccessToken, getInboxId(bartAccessToken)).isEmpty()); + List<String> bobInboxMessageIds = listMessagesInMailbox(bartAccessToken, getInboxId(bartAccessToken)); given() - .header("Authorization", bobAccessToken.serialize()) + .header("Authorization", bartAccessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + bobInboxMessageIds.get(0) + "\"]}, \"#0\"]]") .when() .post("/jmap") .then() .statusCode(200) - .body(ARGUMENTS + ".list[0].from.email", is(USERNAME)) - .body(ARGUMENTS + ".list[0].to.email", contains(BOB)) + .body(ARGUMENTS + ".list[0].from.email", is(HOMER)) + .body(ARGUMENTS + ".list[0].to.email", contains(BART)) .body(ARGUMENTS + ".list[0].hasAttachment", is(true)) .body(ARGUMENTS + ".list[0].textBody", is("Read confirmation")) .body(ARGUMENTS + ".list[0].subject", is("subject")) @@ -337,12 +337,12 @@ public abstract class SendMDNMethodTest { public void sendMDNShouldPositionTheReportAsAnAttachment() { sendAnInitialMessage(); - List<String> messageIds = getMessageIdListForAccount(accessToken.serialize()); + List<String> messageIds = getMessageIdListForAccount(homerAccessToken.serialize()); - // USER sends a MDN back to BOB + // USER sends a MDN back to BART String creationId = "creation-1"; with() - .header("Authorization", accessToken.serialize()) + .header("Authorization", homerAccessToken.serialize()) .body("[[\"setMessages\", {\"sendMDN\": {" + "\"" + creationId + "\":{" + " \"messageId\":\"" + messageIds.get(0) + "\"," + @@ -358,12 +358,12 @@ public abstract class SendMDNMethodTest { "}}, \"#0\"]]") .post("/jmap"); - // BOB should have received it - calmlyAwait.until(() -> !listMessagesInMailbox(bobAccessToken, getInboxId(bobAccessToken)).isEmpty()); - List<String> bobInboxMessageIds = listMessagesInMailbox(bobAccessToken, getInboxId(bobAccessToken)); + // BART should have received it + calmlyAwait.until(() -> !listMessagesInMailbox(bartAccessToken, getInboxId(bartAccessToken)).isEmpty()); + List<String> bobInboxMessageIds = listMessagesInMailbox(bartAccessToken, getInboxId(bartAccessToken)); String blobId = with() - .header("Authorization", bobAccessToken.serialize()) + .header("Authorization", bartAccessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + bobInboxMessageIds.get(0) + "\"]}, \"#0\"]]") .post("/jmap") .then() @@ -372,13 +372,13 @@ public abstract class SendMDNMethodTest { .path(ARGUMENTS + ".list[0].attachments[0].blobId"); given() - .header("Authorization", bobAccessToken.serialize()) + .header("Authorization", bartAccessToken.serialize()) .when() .get("/download/" + blobId) .then() .statusCode(200) .body(containsString("Reporting-UA: reportingUA;")) - .body(containsString("Final-Recipient: rfc822; usern...@domain.tld")) + .body(containsString("Final-Recipient: rfc822; ho...@domain.tld")) .body(containsString("Original-Message-ID: ")) .body(containsString("Disposition: automatic-action/MDN-sent-automatically;processed")); } @@ -388,7 +388,7 @@ public abstract class SendMDNMethodTest { String creationId = "creation-1"; // Missing subject given() - .header("Authorization", accessToken.serialize()) + .header("Authorization", homerAccessToken.serialize()) .body("[[\"setMessages\", {\"sendMDN\": {" + "\"" + creationId + "\":{" + " \"messageId\":\"" + randomMessageId().serialize() + "\"," + @@ -415,17 +415,17 @@ public abstract class SendMDNMethodTest { public void sendMDNShouldReturnMaxQuotaReachedWhenUserReachedHisQuota() throws MailboxException { sendAnInitialMessage(); - List<String> messageIds = getMessageIdListForAccount(accessToken.serialize()); + List<String> messageIds = getMessageIdListForAccount(homerAccessToken.serialize()); QuotaProbe quotaProbe = jmapServer.getProbe(QuotaProbesImpl.class); - String inboxQuotaRoot = quotaProbe.getQuotaRoot("#private", USERNAME, DefaultMailboxes.INBOX); + String inboxQuotaRoot = quotaProbe.getQuotaRoot("#private", HOMER, DefaultMailboxes.INBOX); quotaProbe.setMaxStorage(inboxQuotaRoot, SerializableQuotaValue.valueOf(Optional.of(QuotaSize.size(100)))); - MessageAppender.fillMailbox(jmapServer.getProbe(MailboxProbeImpl.class), USERNAME, MailboxConstants.INBOX); + MessageAppender.fillMailbox(jmapServer.getProbe(MailboxProbeImpl.class), HOMER, MailboxConstants.INBOX); String creationId = "creation-1"; given() - .header("Authorization", accessToken.serialize()) + .header("Authorization", homerAccessToken.serialize()) .body("[[\"setMessages\", {\"sendMDN\": {" + "\"" + creationId + "\":{" + " \"messageId\":\"" + messageIds.get(0) + "\"," + @@ -455,7 +455,7 @@ public abstract class SendMDNMethodTest { String creationId = "creation-1"; // Missing actionMode given() - .header("Authorization", accessToken.serialize()) + .header("Authorization", homerAccessToken.serialize()) .body("[[\"setMessages\", {\"sendMDN\": {" + "\"" + creationId + "\":{" + " \"messageId\":\"" + randomMessageId().serialize() + "\"," + @@ -482,7 +482,7 @@ public abstract class SendMDNMethodTest { public void invalidEnumValuesInMDNShouldBeReported() { String creationId = "creation-1"; given() - .header("Authorization", accessToken.serialize()) + .header("Authorization", homerAccessToken.serialize()) .body("[[\"setMessages\", {\"sendMDN\": {" + "\"" + creationId + "\":{" + " \"messageId\":\"" + randomMessageId().serialize() + "\"," + --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
