JAMES-1779 use RestAssured.requestSpecification to prevent content-type repetition
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c7e3d662 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c7e3d662 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c7e3d662 Branch: refs/heads/master Commit: c7e3d662f756f0ada1dbbc3533b830723a830007 Parents: 7488022 Author: Matthieu Baechler <matthieu.baech...@linagora.com> Authored: Sun Jun 26 23:35:33 2016 +0200 Committer: Antoine Duprat <adup...@linagora.com> Committed: Tue Jun 28 09:44:23 2016 +0200 ---------------------------------------------------------------------- .../apache/james/mpt/smtp/ForwardSmtpTest.java | 18 +-- .../apache/james/AbstractJamesServerTest.java | 11 +- .../james/jmap/JMAPAuthenticationTest.java | 8 +- .../apache/james/jmap/JmapAuthentication.java | 6 - .../james/jmap/VacationIntegrationTest.java | 26 ++--- .../integration/GetMailboxesMethodTest.java | 42 ++----- .../integration/GetMessageListMethodTest.java | 59 ++-------- .../integration/GetMessagesMethodTest.java | 48 ++------ .../integration/GetVacationResponseTest.java | 19 ++-- .../integration/SetMailboxesMethodTest.java | 112 ++----------------- .../integration/SetMessagesMethodTest.java | 107 ++---------------- .../integration/SetVacationResponseTest.java | 23 ++-- .../integration/cucumber/DownloadStepdefs.java | 24 +--- .../integration/cucumber/MainStepdefs.java | 11 +- .../cucumber/SetMailboxesMethodStepdefs.java | 6 - .../org/apache/james/jmap/JMAPServletTest.java | 15 ++- .../WebAdminServerIntegrationTest.java | 17 ++- .../james/webadmin/routes/DomainRoutesTest.java | 15 ++- .../routes/UserMailboxesRoutesTest.java | 14 ++- .../james/webadmin/routes/UsersRoutesTest.java | 14 ++- 20 files changed, 145 insertions(+), 450 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/c7e3d662/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java index 8b8776b..46214b2 100644 --- a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java +++ b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.mpt.smtp; -import static com.jayway.restassured.RestAssured.given; +import static com.jayway.restassured.RestAssured.when; import static com.jayway.restassured.config.EncoderConfig.encoderConfig; import static com.jayway.restassured.config.RestAssuredConfig.newConfig; import static org.hamcrest.Matchers.equalTo; @@ -41,6 +41,7 @@ import com.google.common.base.Charsets; import com.google.common.collect.ImmutableList; import com.google.common.net.InetAddresses; import com.jayway.restassured.RestAssured; +import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; public class ForwardSmtpTest extends AbstractSimpleScriptedTestProtocol { @@ -72,19 +73,20 @@ public class ForwardSmtpTest extends AbstractSimpleScriptedTestProtocol { .registerRecord("yopmail.com", new InetAddress[]{containerIp}, ImmutableList.of("yopmail.com"), ImmutableList.of()); hostSystem.addAddressMapping(USER, DOMAIN, "r...@yopmail.com"); - RestAssured.port = 80; - RestAssured.baseURI = "http://"; + containerIp.getHostAddress(); - RestAssured.config = newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8)); + RestAssured.requestSpecification = new RequestSpecBuilder() + .setContentType(ContentType.JSON) + .setAccept(ContentType.JSON) + .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8))) + .setPort(80) + .setBaseUri("http://"; + containerIp.getHostAddress()) + .build(); } @Test public void forwardingAnEmailShouldWork() throws Exception { scriptTest("helo", Locale.US); - given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) - .when() + when() .get("/api/email") .then() .statusCode(200) http://git-wip-us.apache.org/repos/asf/james-project/blob/c7e3d662/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java index ad525e8..6529ef4 100644 --- a/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java +++ b/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java @@ -36,6 +36,7 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.jayway.restassured.RestAssured; +import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; public abstract class AbstractJamesServerTest { @@ -55,8 +56,12 @@ public abstract class AbstractJamesServerTest { socketChannel = SocketChannel.open(); server.start(); - RestAssured.port = server.getJmapPort(); - RestAssured.config = newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8)); + RestAssured.requestSpecification = new RequestSpecBuilder() + .setContentType(ContentType.JSON) + .setAccept(ContentType.JSON) + .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8))) + .setPort(server.getJmapPort()) + .build(); } protected abstract GuiceJamesServer createJamesServer(); @@ -118,8 +123,6 @@ public abstract class AbstractJamesServerTest { @Test public void connectJMAPServerShouldRespondBadRequest() throws Exception { given() - .contentType(ContentType.JSON) - .accept(ContentType.JSON) .body("{\"badAttributeName\": \"value\"}") .when() .post("/authentication") http://git-wip-us.apache.org/repos/asf/james-project/blob/c7e3d662/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java index c6d71b3..60ccaf9 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java @@ -40,6 +40,7 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.jayway.restassured.RestAssured; +import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; public abstract class JMAPAuthenticationTest { @@ -60,9 +61,10 @@ public abstract class JMAPAuthenticationTest { zonedDateTimeProvider.setFixedDateTime(oldDate); jmapServer = createJmapServer(zonedDateTimeProvider); jmapServer.start(); - RestAssured.port = jmapServer.getJmapPort(); - RestAssured.config = newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8)); - + RestAssured.requestSpecification = new RequestSpecBuilder() + .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8))) + .setPort(jmapServer.getJmapPort()) + .build(); userCredentials = UserCredentials.builder() .username("u...@domain.tld") http://git-wip-us.apache.org/repos/asf/james-project/blob/c7e3d662/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapAuthentication.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapAuthentication.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapAuthentication.java index b9fa503..2341efa 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapAuthentication.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapAuthentication.java @@ -23,8 +23,6 @@ import static com.jayway.restassured.RestAssured.with; import org.apache.james.jmap.api.access.AccessToken; -import com.jayway.restassured.http.ContentType; - public class JmapAuthentication { public static AccessToken authenticateJamesUser(String username, String password) { @@ -32,8 +30,6 @@ public class JmapAuthentication { return AccessToken.fromString( with() - .contentType(ContentType.JSON) - .accept(ContentType.JSON) .body("{\"token\": \"" + continuationToken + "\", \"method\": \"password\", \"password\": \"" + password + "\"}") .post("/authentication") .body() @@ -44,8 +40,6 @@ public class JmapAuthentication { private static String getContinuationToken(String username) { return with() - .contentType(ContentType.JSON) - .accept(ContentType.JSON) .body("{\"username\": \"" + username + "\", \"clientName\": \"Mozilla Thunderbird\", \"clientVersion\": \"42.0\", \"deviceName\": \"Joe Bloggâs iPhone\"}") .post("/authentication") .body() http://git-wip-us.apache.org/repos/asf/james-project/blob/c7e3d662/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java index 50df787..19a3f2b 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java @@ -43,6 +43,7 @@ import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; import com.jayway.awaitility.core.ConditionFactory; import com.jayway.restassured.RestAssured; +import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; public abstract class VacationIntegrationTest { @@ -80,9 +81,12 @@ public abstract class VacationIntegrationTest { guiceJamesServer.serverProbe().createMailbox(MailboxConstants.USER_NAMESPACE, USER_2, "INBOX"); await(); - - RestAssured.port = guiceJamesServer.getJmapPort(); - RestAssured.config = newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8)); + RestAssured.requestSpecification = new RequestSpecBuilder() + .setContentType(ContentType.JSON) + .setAccept(ContentType.JSON) + .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8))) + .setPort(guiceJamesServer.getJmapPort()) + .build(); Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await(); @@ -164,8 +168,6 @@ public abstract class VacationIntegrationTest { // User 2 should not receive a notification Thread.sleep(1000L); with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", user2AccessToken.serialize()) .body("[[\"getMessageList\", " + "{" + @@ -260,8 +262,6 @@ public abstract class VacationIntegrationTest { "}, \"#0\"" + "]]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", user1AccessToken.serialize()) .body(bodyRequest) .when() @@ -284,8 +284,6 @@ public abstract class VacationIntegrationTest { "}, \"#0\"" + "]]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", user1AccessToken.serialize()) .body(bodyRequest) .when() @@ -311,8 +309,6 @@ public abstract class VacationIntegrationTest { " ]" + "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", user2AccessToken.serialize()) .body(requestBody) .when() @@ -322,8 +318,6 @@ public abstract class VacationIntegrationTest { private boolean areTwoTextMessageReceived(AccessToken recipientToken, String mailboxId) { try { with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", recipientToken.serialize()) .body("[[\"getMessageList\", " + "{" + @@ -354,8 +348,6 @@ public abstract class VacationIntegrationTest { private void assertOneMessageReceived(AccessToken recipientToken, String mailboxId, String expectedTextBody, String expectedFrom, String expectedTo) { with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", recipientToken.serialize()) .body("[[\"getMessageList\", " + "{" + @@ -379,8 +371,6 @@ public abstract class VacationIntegrationTest { private boolean assertOneMessageWithHtmlBodyReceived(AccessToken recipientToken, String mailboxId, String expectedHtmlBody, String expectedFrom, String expectedTo) { try { with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", recipientToken.serialize()) .body("[[\"getMessageList\", " + "{" + @@ -423,8 +413,6 @@ public abstract class VacationIntegrationTest { private List<Map<String, String>> getAllMailboxesIds(AccessToken accessToken) { return with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMailboxes\", {\"properties\": [\"role\", \"id\"]}, \"#0\"]]") .post("/jmap") http://git-wip-us.apache.org/repos/asf/james-project/blob/c7e3d662/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java index 9ea515b..3c74002 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java @@ -47,6 +47,7 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.jayway.restassured.RestAssured; +import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; public abstract class GetMailboxesMethodTest { @@ -63,8 +64,13 @@ public abstract class GetMailboxesMethodTest { public void setup() throws Throwable { jmapServer = createJmapServer(); jmapServer.start(); - RestAssured.port = jmapServer.getJmapPort(); - RestAssured.config = newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8)); + + RestAssured.requestSpecification = new RequestSpecBuilder() + .setContentType(ContentType.JSON) + .setAccept(ContentType.JSON) + .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8))) + .setPort(jmapServer.getJmapPort()) + .build(); String domain = "domain.tld"; username = "username@" + domain; @@ -82,8 +88,6 @@ public abstract class GetMailboxesMethodTest { @Test public void getMailboxesShouldErrorNotSupportedWhenRequestContainsNonNullAccountId() throws Exception { given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMailboxes\", {\"accountId\": \"1\"}, \"#0\"]]") .when() @@ -99,8 +103,6 @@ public abstract class GetMailboxesMethodTest { jmapServer.serverProbe().createMailbox(MailboxConstants.USER_NAMESPACE, username, "name"); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMailboxes\", {\"ids\": [\"notAMailboxId\"]}, \"#0\"]]") .when() @@ -123,8 +125,6 @@ public abstract class GetMailboxesMethodTest { String mailboxId2 = mailbox2.getMailboxId().serialize(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId + "\", \"" + mailboxId2 + "\"]}, \"#0\"]]") .when() @@ -147,8 +147,6 @@ public abstract class GetMailboxesMethodTest { String mailboxId = mailbox.getMailboxId().serialize(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId + "\"]}, \"#0\"]]") .when() @@ -165,8 +163,6 @@ public abstract class GetMailboxesMethodTest { jmapServer.serverProbe().createMailbox(MailboxConstants.USER_NAMESPACE, username, "INBOX"); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMailboxes\", {\"ids\": []}, \"#0\"]]") .when() @@ -189,8 +185,6 @@ public abstract class GetMailboxesMethodTest { String mailboxId2 = mailbox2.getMailboxId().serialize(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMailboxes\", {\"ids\": null}, \"#0\"]]") .when() @@ -206,8 +200,6 @@ public abstract class GetMailboxesMethodTest { @Test public void getMailboxesShouldErrorInvalidArgumentsWhenRequestIsInvalid() throws Exception { given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMailboxes\", {\"ids\": true}, \"#0\"]]") .when() @@ -223,8 +215,6 @@ public abstract class GetMailboxesMethodTest { @Test public void getMailboxesShouldReturnEmptyListWhenNoMailboxes() throws Exception { given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMailboxes\", {}, \"#0\"]]") .when() @@ -245,8 +235,6 @@ public abstract class GetMailboxesMethodTest { + "2RJTBsIo6flJT-MchaEvTYBvuV_wlCCQYjI1g7mdeD6aXfw"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", "Bearer " + token) .body("[[\"getMailboxes\", {}, \"#0\"]]") .when() @@ -268,8 +256,6 @@ public abstract class GetMailboxesMethodTest { "qNOR8Q31ydinyqzXvCSzVJOf6T60-w"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", "Bearer " + badAuthToken) .body("[[\"getMailboxes\", {}, \"#0\"]]") .when() @@ -286,8 +272,6 @@ public abstract class GetMailboxesMethodTest { new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags()); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMailboxes\", {}, \"#0\"]]") .when() @@ -316,8 +300,6 @@ public abstract class GetMailboxesMethodTest { jmapServer.serverProbe().createMailbox(MailboxConstants.USER_NAMESPACE, username, "name"); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMailboxes\", {\"properties\" : [\"unreadMessages\", \"sortOrder\"]}, \"#0\"]]") .when() @@ -347,8 +329,6 @@ public abstract class GetMailboxesMethodTest { jmapServer.serverProbe().createMailbox(MailboxConstants.USER_NAMESPACE, username, "name"); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMailboxes\", {\"properties\" : []}, \"#0\"]]") .when() @@ -365,8 +345,6 @@ public abstract class GetMailboxesMethodTest { jmapServer.serverProbe().createMailbox(MailboxConstants.USER_NAMESPACE, username, "name"); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMailboxes\", {\"properties\" : [\"unknown\"]}, \"#0\"]]") .when() @@ -384,8 +362,6 @@ public abstract class GetMailboxesMethodTest { jmapServer.serverProbe().createMailbox(MailboxConstants.USER_NAMESPACE, username, "trash"); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMailboxes\", {}, \"#0\"]]") .when() @@ -405,8 +381,6 @@ public abstract class GetMailboxesMethodTest { jmapServer.serverProbe().createMailbox(MailboxConstants.USER_NAMESPACE, username, "outbox"); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMailboxes\", {}, \"#0\"]]") .when() http://git-wip-us.apache.org/repos/asf/james-project/blob/c7e3d662/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java index 336af25..3ade45f 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java @@ -48,6 +48,7 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.jayway.restassured.RestAssured; +import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; public abstract class GetMessageListMethodTest { @@ -67,8 +68,12 @@ public abstract class GetMessageListMethodTest { public void setup() throws Throwable { jmapServer = createJmapServer(); jmapServer.start(); - RestAssured.port = jmapServer.getJmapPort(); - RestAssured.config = newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8)); + RestAssured.requestSpecification = new RequestSpecBuilder() + .setContentType(ContentType.JSON) + .setAccept(ContentType.JSON) + .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8))) + .setPort(jmapServer.getJmapPort()) + .build(); this.domain = "domain.tld"; this.username = "username@" + domain; @@ -86,8 +91,6 @@ public abstract class GetMessageListMethodTest { @Test public void getMessageListShouldErrorInvalidArgumentsWhenRequestIsInvalid() throws Exception { given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessageList\", {\"filter\": true}, \"#0\"]]") .when() @@ -111,8 +114,6 @@ public abstract class GetMessageListMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessageList\", {}, \"#0\"]]") .when() @@ -135,8 +136,6 @@ public abstract class GetMessageListMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessageList\", {}, \"#0\"]]") .when() @@ -168,8 +167,6 @@ public abstract class GetMessageListMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessageList\", {}, \"#0\"]]") .when() @@ -189,16 +186,12 @@ public abstract class GetMessageListMethodTest { String mailboxId = with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMailboxes\", {}, \"#0\"]]") .post("/jmap") .path("[0][1].list[0].id"); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + mailboxId + "\"]}}, \"#0\"]]") .when() @@ -220,16 +213,12 @@ public abstract class GetMessageListMethodTest { List<String> mailboxIds = with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMailboxes\", {}, \"#0\"]]") .post("/jmap") .path("[0][1].list.id"); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(String.format("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"%s\", \"%s\"]}}, \"#0\"]]", mailboxIds.get(0), mailboxIds.get(1))) .when() @@ -251,8 +240,6 @@ public abstract class GetMessageListMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(String.format("[[\"getMessageList\", {\"filter\":{\"notInMailboxes\":[\"%s\"]}}, \"#0\"]]", mailboxId.serialize())) .when() @@ -277,8 +264,6 @@ public abstract class GetMessageListMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(String.format("[[\"getMessageList\", {\"filter\":{\"notInMailboxes\":[\"%s\", \"%s\"]}}, \"#0\"]]", mailboxId.serialize(), mailbox2Id.serialize())) .when() @@ -298,8 +283,6 @@ public abstract class GetMessageListMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(String.format("[[\"getMessageList\", {\"filter\":{\"notInMailboxes\":[\"%s\"], \"inMailboxes\":[\"%s\"]}}, \"#0\"]]", mailboxId.serialize(), mailboxId.serialize())) .when() @@ -321,8 +304,6 @@ public abstract class GetMessageListMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(String.format("[[\"getMessageList\", {\"filter\":{\"notInMailboxes\":[\"%s\"]}}, \"#0\"]]", mailbox2Id.serialize())) .when() @@ -343,8 +324,6 @@ public abstract class GetMessageListMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(String.format("[[\"getMessageList\", {\"filter\":{\"notInMailboxes\":[]}}, \"#0\"]]")) .when() @@ -364,8 +343,6 @@ public abstract class GetMessageListMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"mailbox2\"]}}, \"#0\"]]") .when() @@ -387,8 +364,6 @@ public abstract class GetMessageListMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessageList\", {\"sort\":[\"date\"]}, \"#0\"]]") .when() @@ -411,8 +386,6 @@ public abstract class GetMessageListMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessageList\", {\"sort\":[\"date asc\"]}, \"#0\"]]") .when() @@ -435,8 +408,6 @@ public abstract class GetMessageListMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessageList\", {\"sort\":[\"date desc\"]}, \"#0\"]]") .when() @@ -450,8 +421,6 @@ public abstract class GetMessageListMethodTest { @Test public void getMessageListShouldWorkWhenCollapseThreadIsFalse() { given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessageList\", {\"collapseThreads\":false}, \"#0\"]]") .when() @@ -464,8 +433,6 @@ public abstract class GetMessageListMethodTest { @Test public void getMessageListShouldWorkWhenCollapseThreadIsTrue() { given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessageList\", {\"collapseThreads\":true}, \"#0\"]]") .when() @@ -487,8 +454,6 @@ public abstract class GetMessageListMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessageList\", {}, \"#0\"]]") .when() @@ -511,8 +476,6 @@ public abstract class GetMessageListMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessageList\", {\"position\":1}, \"#0\"]]") .when() @@ -535,8 +498,6 @@ public abstract class GetMessageListMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessageList\", {}, \"#0\"]]") .when() @@ -559,8 +520,6 @@ public abstract class GetMessageListMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessageList\", {\"limit\":1}, \"#0\"]]") .when() @@ -587,8 +546,6 @@ public abstract class GetMessageListMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessageList\", {}, \"#0\"]]") .when() @@ -609,8 +566,6 @@ public abstract class GetMessageListMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessageList\", {\"fetchMessages\":true}, \"#0\"]]") .when() http://git-wip-us.apache.org/repos/asf/james-project/blob/c7e3d662/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessagesMethodTest.java index 09ab9dc..9382091 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessagesMethodTest.java @@ -46,6 +46,8 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.collect.ImmutableMap; import com.jayway.restassured.RestAssured; +import com.jayway.restassured.builder.RequestSpecBuilder; +import com.jayway.restassured.filter.log.LogDetail; import com.jayway.restassured.http.ContentType; public abstract class GetMessagesMethodTest { @@ -68,8 +70,14 @@ public abstract class GetMessagesMethodTest { public void setup() throws Throwable { jmapServer = createJmapServer(); jmapServer.start(); - RestAssured.port = jmapServer.getJmapPort(); - RestAssured.config = newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8)); + + RestAssured.requestSpecification = new RequestSpecBuilder() + .setContentType(ContentType.JSON) + .setAccept(ContentType.JSON) + .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8))) + .setPort(jmapServer.getJmapPort()) + .build(); + RestAssured.enableLoggingOfRequestAndResponseIfValidationFails(); String domain = "domain.tld"; @@ -89,8 +97,6 @@ public abstract class GetMessagesMethodTest { @Test public void getMessagesShouldErrorNotSupportedWhenRequestContainsNonNullAccountId() throws Exception { given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"accountId\": \"1\"}, \"#0\"]]") .when() @@ -104,8 +110,6 @@ public abstract class GetMessagesMethodTest { @Test public void getMessagesShouldIgnoreUnknownArguments() throws Exception { given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"WAT\": true}, \"#0\"]]") .when() @@ -119,8 +123,6 @@ public abstract class GetMessagesMethodTest { @Test public void getMessagesShouldErrorInvalidArgumentsWhenRequestContainsInvalidArgument() throws Exception { given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": null}, \"#0\"]]") .when() @@ -135,8 +137,6 @@ public abstract class GetMessagesMethodTest { @Test public void getMessagesShouldReturnEmptyListWhenNoMessage() throws Exception { given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": []}, \"#0\"]]") .when() @@ -150,8 +150,6 @@ public abstract class GetMessagesMethodTest { @Test public void getMessagesShouldReturnNoFoundIndicesWhenMessageNotFound() throws Exception { given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"username|inbox|12\"]}, \"#0\"]]") .when() @@ -173,8 +171,6 @@ public abstract class GetMessagesMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + username + "|inbox|1\"]}, \"#0\"]]") .when() @@ -206,8 +202,6 @@ public abstract class GetMessagesMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + username + "|inbox|1\"]}, \"#0\"]]") .when() @@ -237,8 +231,6 @@ public abstract class GetMessagesMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + username + "|inbox|1\"]}, \"#0\"]]") .when() @@ -268,8 +260,6 @@ public abstract class GetMessagesMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + username + "|inbox|1\"]}, \"#0\"]]") .when() @@ -292,8 +282,6 @@ public abstract class GetMessagesMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + username + "|inbox|1\"]}, \"#0\"]]") .when() @@ -323,8 +311,6 @@ public abstract class GetMessagesMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + username + "|inbox|1\"], \"properties\": [\"id\", \"subject\"]}, \"#0\"]]") .when() @@ -358,8 +344,6 @@ public abstract class GetMessagesMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + username + "|inbox|1\"], \"properties\": [\"headers.from\", \"headers.heADER2\"]}, \"#0\"]]") .when() @@ -388,8 +372,6 @@ public abstract class GetMessagesMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"username|inbox|1\"]}, \"#0\"]]") .when() @@ -411,8 +393,6 @@ public abstract class GetMessagesMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + username + "|mailbox|1\"], \"properties\": [\"subject\"]}, \"#0\"]]") .when() @@ -436,8 +416,6 @@ public abstract class GetMessagesMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + username + "|inbox|1\"]}, \"#0\"]]") .when() @@ -465,8 +443,6 @@ public abstract class GetMessagesMethodTest { ClassLoader.getSystemResourceAsStream("twoAttachments.eml"), Date.from(dateTime.toInstant()), false, new Flags()); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + username + "|inbox|1\"]}, \"#0\"]]") .when() @@ -491,8 +467,6 @@ public abstract class GetMessagesMethodTest { ClassLoader.getSystemResourceAsStream("twoAttachmentsTextPlain.eml"), Date.from(dateTime.toInstant()), false, new Flags()); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + username + "|inbox|1\"]}, \"#0\"]]") .when() @@ -517,8 +491,6 @@ public abstract class GetMessagesMethodTest { ClassLoader.getSystemResourceAsStream("htmlAndTextMultipartWithOneAttachment.eml"), Date.from(dateTime.toInstant()), false, new Flags()); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + username + "|inbox|1\"]}, \"#0\"]]") .when() http://git-wip-us.apache.org/repos/asf/james-project/blob/c7e3d662/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java index fe6023c..a9e7460 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java @@ -42,6 +42,7 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.jayway.restassured.RestAssured; +import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; public abstract class GetVacationResponseTest { @@ -65,8 +66,14 @@ public abstract class GetVacationResponseTest { public void setup() throws Throwable { jmapServer = createJmapServer(new FixedDateZonedDateTimeProvider(ZONED_DATE_TIME_2014)); jmapServer.start(); - RestAssured.port = jmapServer.getJmapPort(); - RestAssured.config = newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8)); + + RestAssured.requestSpecification = new RequestSpecBuilder() + .setContentType(ContentType.JSON) + .setAccept(ContentType.JSON) + .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8))) + .setPort(jmapServer.getJmapPort()) + .build(); + jmapServer.serverProbe().addDomain(USERS_DOMAIN); jmapServer.serverProbe().addUser(USER, PASSWORD); @@ -83,8 +90,6 @@ public abstract class GetVacationResponseTest { @Test public void getVacationResponseShouldReturnDefaultValue() { given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[" + "\"getVacationResponse\", " + @@ -120,8 +125,6 @@ public abstract class GetVacationResponseTest { .build()); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[" + "\"getVacationResponse\", " + @@ -155,8 +158,6 @@ public abstract class GetVacationResponseTest { .build()); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[" + "\"getVacationResponse\", " + @@ -188,8 +189,6 @@ public abstract class GetVacationResponseTest { .build()); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[" + "\"getVacationResponse\", " + http://git-wip-us.apache.org/repos/asf/james-project/blob/c7e3d662/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java index fe24252..a1046a8 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java @@ -47,6 +47,7 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.jayway.restassured.RestAssured; +import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; public abstract class SetMailboxesMethodTest { @@ -67,8 +68,13 @@ public abstract class SetMailboxesMethodTest { public void setup() throws Throwable { jmapServer = createJmapServer(); jmapServer.start(); - RestAssured.port = jmapServer.getJmapPort(); - RestAssured.config = newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8)); + + RestAssured.requestSpecification = new RequestSpecBuilder() + .setContentType(ContentType.JSON) + .setAccept(ContentType.JSON) + .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8))) + .setPort(jmapServer.getJmapPort()) + .build(); RestAssured.enableLoggingOfRequestAndResponseIfValidationFails(); username = "username@" + USERS_DOMAIN; @@ -104,8 +110,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -134,8 +138,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -163,8 +165,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -192,16 +192,12 @@ public abstract class SetMailboxesMethodTest { "]"; with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .then() .post("/jmap"); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body("[[\"getMailboxes\", {}, \"#0\"]]") .when() @@ -217,8 +213,6 @@ public abstract class SetMailboxesMethodTest { public void setMailboxesShouldReturnCreatedMailboxWhenChildOfInboxMailbox() { String inboxId = with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body("[[\"getMailboxes\", {}, \"#0\"]]") .when() @@ -244,8 +238,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -263,8 +255,6 @@ public abstract class SetMailboxesMethodTest { public void setMailboxesShouldCreateMailboxWhenChildOfInboxMailbox() { String inboxId = with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body("[[\"getMailboxes\", {}, \"#0\"]]") .when() @@ -290,16 +280,12 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() .post("/jmap"); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body("[[\"getMailboxes\", {}, \"#0\"]]") .when() @@ -329,8 +315,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -365,8 +349,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -404,8 +386,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -440,8 +420,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -477,8 +455,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -514,8 +490,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -546,8 +520,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -573,8 +545,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -583,8 +553,6 @@ public abstract class SetMailboxesMethodTest { .statusCode(200); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body("[[\"getMailboxes\", {}, \"#0\"]]") .when() @@ -608,8 +576,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -640,8 +606,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -670,8 +634,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -704,8 +666,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -735,8 +695,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -764,8 +722,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -797,8 +753,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -829,8 +783,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -861,15 +813,11 @@ public abstract class SetMailboxesMethodTest { "]"; with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .post("/jmap"); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId + "\"]}, \"#0\"]]") .when() @@ -906,8 +854,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -943,15 +889,11 @@ public abstract class SetMailboxesMethodTest { "]"; with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .post("/jmap"); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId + "\"]}, \"#0\"]]") .when() @@ -990,8 +932,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -1029,15 +969,11 @@ public abstract class SetMailboxesMethodTest { "]"; with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .post("/jmap"); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId + "\"]}, \"#0\"]]") .when() @@ -1072,8 +1008,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -1107,15 +1041,11 @@ public abstract class SetMailboxesMethodTest { "]"; with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .post("/jmap"); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId + "\"]}, \"#0\"]]") .when() @@ -1155,8 +1085,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -1195,15 +1123,11 @@ public abstract class SetMailboxesMethodTest { "]"; with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .post("/jmap"); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId + "\"]}, \"#0\"]]") .when() @@ -1236,8 +1160,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -1270,8 +1192,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -1314,8 +1234,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -1351,8 +1269,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -1388,8 +1304,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -1423,15 +1337,11 @@ public abstract class SetMailboxesMethodTest { "]"; with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .post("/jmap"); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId + "\"]}, \"#0\"]]") .when() @@ -1464,8 +1374,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -1500,8 +1408,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() @@ -1543,8 +1449,6 @@ public abstract class SetMailboxesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) .when() http://git-wip-us.apache.org/repos/asf/james-project/blob/c7e3d662/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 5680057..e93ba7a 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 @@ -60,6 +60,7 @@ import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; import com.jayway.awaitility.core.ConditionFactory; import com.jayway.restassured.RestAssured; +import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.builder.ResponseSpecBuilder; import com.jayway.restassured.http.ContentType; import com.jayway.restassured.specification.ResponseSpecification; @@ -86,9 +87,13 @@ public abstract class SetMessagesMethodTest { public void setup() throws Throwable { jmapServer = createJmapServer(); jmapServer.start(); - RestAssured.port = jmapServer.getJmapPort(); - RestAssured.config = newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8)); - + RestAssured.requestSpecification = new RequestSpecBuilder() + .setContentType(ContentType.JSON) + .setAccept(ContentType.JSON) + .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8))) + .setPort(jmapServer.getJmapPort()) + .build(); + username = "username@" + USERS_DOMAIN; String password = "password"; jmapServer.serverProbe().addDomain(USERS_DOMAIN); @@ -118,8 +123,6 @@ public abstract class SetMessagesMethodTest { private List<Map<String, String>> getAllMailboxesIds(AccessToken accessToken) { return with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMailboxes\", {\"properties\": [\"role\", \"id\"]}, \"#0\"]]") .post("/jmap") @@ -132,8 +135,6 @@ public abstract class SetMessagesMethodTest { @Test public void setMessagesShouldReturnErrorNotSupportedWhenRequestContainsNonNullAccountId() throws Exception { given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"setMessages\", {\"accountId\": \"1\"}, \"#0\"]]") .when() @@ -147,8 +148,6 @@ public abstract class SetMessagesMethodTest { @Test public void setMessagesShouldReturnErrorNotSupportedWhenRequestContainsNonNullIfInState() throws Exception { given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"setMessages\", {\"ifInState\": \"1\"}, \"#0\"]]") .when() @@ -164,8 +163,6 @@ public abstract class SetMessagesMethodTest { String unknownMailboxMessageId = username + "|unknown|12345"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"setMessages\", {\"destroy\": [\"" + unknownMailboxMessageId + "\"]}, \"#0\"]]") .when() @@ -188,8 +185,6 @@ public abstract class SetMessagesMethodTest { String messageId = username + "|mailbox|12345"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"setMessages\", {\"destroy\": [\"" + messageId + "\"]}, \"#0\"]]") .when() @@ -216,8 +211,6 @@ public abstract class SetMessagesMethodTest { await(); given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"setMessages\", {\"destroy\": [\"" + username + "|mailbox|1\"]}, \"#0\"]]") .when() @@ -241,8 +234,6 @@ public abstract class SetMessagesMethodTest { // When given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"setMessages\", {\"destroy\": [\"" + username + "|mailbox|1\"]}, \"#0\"]]") .when() @@ -252,8 +243,6 @@ public abstract class SetMessagesMethodTest { // Then given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + username + "|mailbox|1\"]}, \"#0\"]]") .when() @@ -280,8 +269,6 @@ public abstract class SetMessagesMethodTest { String missingMessageId = username + "|mailbox|4"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"setMessages\", {\"destroy\": [\"" + username + "|mailbox|1\", \"" + missingMessageId + "\", \"" + username + "|mailbox|3\"]}, \"#0\"]]") .when() @@ -315,8 +302,6 @@ public abstract class SetMessagesMethodTest { // When given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"setMessages\", {\"destroy\": [\"" + username + "|mailbox|1\", \"" + username + "|mailbox|4\", \"" + username + "|mailbox|3\"]}, \"#0\"]]") .when() @@ -326,8 +311,6 @@ public abstract class SetMessagesMethodTest { // Then given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + username + "|mailbox|1\", \"" + username + "|mailbox|2\", \"" + username + "|mailbox|3\"]}, \"#0\"]]") .when() @@ -351,8 +334,6 @@ public abstract class SetMessagesMethodTest { // When given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isUnread\" : false } } }, \"#0\"]]", presumedMessageId)) .when() @@ -385,8 +366,6 @@ public abstract class SetMessagesMethodTest { String presumedMessageId = username + "|mailbox|1"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isUnread\" : false } } }, \"#0\"]]", presumedMessageId)) // When @@ -394,8 +373,6 @@ public abstract class SetMessagesMethodTest { .post("/jmap"); // Then with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + presumedMessageId + "\"]}, \"#0\"]]") .post("/jmap") @@ -418,8 +395,6 @@ public abstract class SetMessagesMethodTest { String presumedMessageId = username + "|mailbox|1"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isUnread\" : true } } }, \"#0\"]]", presumedMessageId)) // When @@ -442,8 +417,6 @@ public abstract class SetMessagesMethodTest { String presumedMessageId = username + "|mailbox|1"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isUnread\" : true } } }, \"#0\"]]", presumedMessageId)) // When @@ -451,8 +424,6 @@ public abstract class SetMessagesMethodTest { .post("/jmap"); // Then with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + presumedMessageId + "\"]}, \"#0\"]]") .post("/jmap") @@ -475,8 +446,6 @@ public abstract class SetMessagesMethodTest { String presumedMessageId = username + "|mailbox|1"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isFlagged\" : true } } }, \"#0\"]]", presumedMessageId)) // When @@ -499,8 +468,6 @@ public abstract class SetMessagesMethodTest { String presumedMessageId = username + "|mailbox|1"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isFlagged\" : true } } }, \"#0\"]]", presumedMessageId)) // When @@ -508,8 +475,6 @@ public abstract class SetMessagesMethodTest { .post("/jmap"); // Then with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + presumedMessageId + "\"]}, \"#0\"]]") .post("/jmap") @@ -531,8 +496,6 @@ public abstract class SetMessagesMethodTest { String messageId = username + "|mailbox|1"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isUnread\" : \"123\" } } }, \"#0\"]]", messageId)) .when() @@ -561,8 +524,6 @@ public abstract class SetMessagesMethodTest { String messageId = username + "|mailbox|1"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isUnread\" : \"123\", \"isFlagged\" : 456 } } }, \"#0\"]]", messageId)) .when() @@ -591,8 +552,6 @@ public abstract class SetMessagesMethodTest { String presumedMessageId = username + "|mailbox|1"; // When given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isAnswered\" : true } } }, \"#0\"]]", presumedMessageId)) .when() @@ -614,8 +573,6 @@ public abstract class SetMessagesMethodTest { String presumedMessageId = username + "|mailbox|1"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isAnswered\" : true } } }, \"#0\"]]", presumedMessageId)) // When @@ -623,8 +580,6 @@ public abstract class SetMessagesMethodTest { .post("/jmap"); // Then with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + presumedMessageId + "\"]}, \"#0\"]]") .post("/jmap") @@ -642,8 +597,6 @@ public abstract class SetMessagesMethodTest { String nonExistingMessageId = username + "|mailbox|12345"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isUnread\" : true } } }, \"#0\"]]", nonExistingMessageId)) .when() @@ -679,8 +632,6 @@ public abstract class SetMessagesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(requestBody) .when() @@ -736,8 +687,6 @@ public abstract class SetMessagesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(requestBody) // When @@ -746,8 +695,6 @@ public abstract class SetMessagesMethodTest { // Then with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessages\", {\"ids\": [\"" + presumedMessageId + "\"]}, \"#0\"]]") .post("/jmap") @@ -788,8 +735,6 @@ public abstract class SetMessagesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(requestBody) // When @@ -803,8 +748,6 @@ public abstract class SetMessagesMethodTest { private boolean messageHasBeenMovedToSentBox(String sentMailboxId) { try { with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body("[[\"getMessageList\", {\"fetchMessages\":true, \"filter\":{\"inMailboxes\":[\"" + sentMailboxId + "\"]}}, \"#0\"]]") .when() @@ -841,8 +784,6 @@ public abstract class SetMessagesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(requestBody) .when() @@ -878,8 +819,6 @@ public abstract class SetMessagesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(requestBody) .when() @@ -918,8 +857,6 @@ public abstract class SetMessagesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(requestBody) .when() @@ -957,8 +894,6 @@ public abstract class SetMessagesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(requestBody) .when() @@ -1003,8 +938,6 @@ public abstract class SetMessagesMethodTest { // Given given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(requestBody) // When @@ -1036,8 +969,6 @@ public abstract class SetMessagesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(requestBody) .when() @@ -1075,8 +1006,6 @@ public abstract class SetMessagesMethodTest { "]"; given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", accessToken.serialize()) .body(requestBody) .when() @@ -1126,8 +1055,6 @@ public abstract class SetMessagesMethodTest { // Given given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) // When @@ -1172,8 +1099,6 @@ public abstract class SetMessagesMethodTest { // Given given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) // When @@ -1183,8 +1108,6 @@ public abstract class SetMessagesMethodTest { // Then calmlyAwait.atMost(30, TimeUnit.SECONDS).until( () -> isAnyMessageFoundInRecipientsMailboxes(recipientToken)); with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", recipientToken.serialize()) .body("[[\"getMessageList\", {\"fetchMessages\": true, \"fetchMessageProperties\": [\"bcc\"] }, \"#0\"]]") .when() @@ -1235,8 +1158,6 @@ public abstract class SetMessagesMethodTest { // Given given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) // When @@ -1246,8 +1167,6 @@ public abstract class SetMessagesMethodTest { // Then calmlyAwait.atMost(30, TimeUnit.SECONDS).until( () -> messageHasBeenMovedToSentBox(sentMailboxId)); with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body("[[\"getMessageList\", {\"fetchMessages\":true, \"fetchMessageProperties\": [\"bcc\"], \"filter\":{\"inMailboxes\":[\"" + sentMailboxId + "\"]}}, \"#0\"]]") .when() @@ -1299,8 +1218,6 @@ public abstract class SetMessagesMethodTest { // Given given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) // When @@ -1310,8 +1227,6 @@ public abstract class SetMessagesMethodTest { // Then calmlyAwait.atMost(30, TimeUnit.SECONDS).until( () -> isAnyMessageFoundInRecipientsMailboxes(bccToken)); with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", bccToken.serialize()) .body("[[\"getMessageList\", {\"fetchMessages\": true, \"fetchMessageProperties\": [\"bcc\"] }, \"#0\"]]") .when() @@ -1327,8 +1242,6 @@ public abstract class SetMessagesMethodTest { private boolean isAnyMessageFoundInRecipientsMailboxes(AccessToken recipientToken) { try { with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", recipientToken.serialize()) .body("[[\"getMessageList\", {}, \"#0\"]]") .when() @@ -1377,8 +1290,6 @@ public abstract class SetMessagesMethodTest { // Given given() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", this.accessToken.serialize()) .body(requestBody) // When @@ -1392,8 +1303,6 @@ public abstract class SetMessagesMethodTest { private boolean isHtmlMessageReceived(AccessToken recipientToken) { try { with() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) .header("Authorization", recipientToken.serialize()) .body("[[\"getMessageList\", {\"fetchMessages\": true, \"fetchMessageProperties\": [\"htmlBody\"]}, \"#0\"]]") .post("/jmap") --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
