This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit c61f77052bd0b041176ae18b8f9d8e1654b2c37b Author: Rene Cordier <[email protected]> AuthorDate: Wed May 8 15:58:14 2019 +0700 JAMES-2712 Extract concatenation of message ids into a proper method --- .../test/java/org/apache/james/jmap/JmapCommonRequests.java | 10 +++++++--- .../james/jmap/methods/integration/QuotaMailingTest.java | 10 +++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java index fec460e..85e241f 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java @@ -154,13 +154,17 @@ public class JmapCommonRequests { } public static void deleteMessages(AccessToken accessToken, List<String> idsToDestroy) { - String idString = idsToDestroy.stream() - .map(id -> "\"" + id + "\"") - .collect(Collectors.joining(",")); + String idString = concatMessageIds(idsToDestroy); with() .header("Authorization", accessToken.serialize()) .body("[[\"setMessages\", {\"destroy\": [" + idString + "]}, \"#0\"]]") .post("/jmap"); } + + public static String concatMessageIds(List<String> ids) { + return ids.stream() + .map(id -> "\"" + id + "\"") + .collect(Collectors.joining(",")); + } } diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java index 036435f..cad0367 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java @@ -22,6 +22,7 @@ package org.apache.james.jmap.methods.integration; import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.with; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; +import static org.apache.james.jmap.JmapCommonRequests.concatMessageIds; import static org.apache.james.jmap.JmapCommonRequests.getOutboxId; import static org.apache.james.jmap.JmapCommonRequests.listMessageIdsForAccount; import static org.apache.james.jmap.JmapURIBuilder.baseUri; @@ -34,7 +35,6 @@ import static org.hamcrest.Matchers.hasItem; import java.io.IOException; import java.util.List; -import java.util.stream.Collectors; import org.apache.james.GuiceJamesServer; import org.apache.james.core.quota.QuotaSize; @@ -112,9 +112,7 @@ public abstract class QuotaMailingTest { WAIT_TWO_MINUTES.until(() -> listMessageIdsForAccount(homerAccessToken).size() == 2); List<String> ids = listMessageIdsForAccount(homerAccessToken); - String idString = ids.stream() - .map(id -> "\"" + id + "\"") - .collect(Collectors.joining(",")); + String idString = concatMessageIds(ids); given() .header("Authorization", homerAccessToken.serialize()) @@ -143,9 +141,7 @@ public abstract class QuotaMailingTest { WAIT_TWO_MINUTES.until(() -> listMessageIdsForAccount(homerAccessToken).size() == 4); List<String> ids = listMessageIdsForAccount(homerAccessToken); - String idString = ids.stream() - .map(id -> "\"" + id + "\"") - .collect(Collectors.joining(",")); + String idString = concatMessageIds(ids); given() .header("Authorization", homerAccessToken.serialize()) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
