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 dc1fff513cf96668df17c4bafa7e48f53c6bf2d2 Author: Rene Cordier <rcord...@linagora.com> AuthorDate: Thu May 2 11:07:27 2019 +0700 JAMES-2712 Extract deleteMessages to JMAP common requests --- .../test/java/org/apache/james/jmap/JmapCommonRequests.java | 12 ++++++++++++ .../jmap/methods/integration/DeletedMessagesVaultTest.java | 13 +------------ .../LinshareBlobExportMechanismIntegrationTest.java | 13 +------------ 3 files changed, 14 insertions(+), 24 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 fe3f84d..fec460e 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 @@ -29,6 +29,7 @@ import static org.hamcrest.Matchers.not; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.mailbox.Role; @@ -151,4 +152,15 @@ public class JmapCommonRequests { .expectBody(NOT_UPDATED, not(hasKey(messageId))); return builder.build(); } + + public static void deleteMessages(AccessToken accessToken, List<String> idsToDestroy) { + String idString = idsToDestroy.stream() + .map(id -> "\"" + id + "\"") + .collect(Collectors.joining(",")); + + with() + .header("Authorization", accessToken.serialize()) + .body("[[\"setMessages\", {\"destroy\": [" + idString + "]}, \"#0\"]]") + .post("/jmap"); + } } diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java index a979a5e..f8cc0f6 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java @@ -23,6 +23,7 @@ import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.with; import static io.restassured.config.ParamConfig.UpdateStrategy.REPLACE; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; +import static org.apache.james.jmap.JmapCommonRequests.deleteMessages; import static org.apache.james.jmap.JmapCommonRequests.getLastMessageId; import static org.apache.james.jmap.JmapCommonRequests.getOutboxId; import static org.apache.james.jmap.JmapCommonRequests.listMessageIdsForAccount; @@ -44,7 +45,6 @@ import java.time.Clock; import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.List; -import java.util.stream.Collectors; import org.apache.james.GuiceJamesServer; import org.apache.james.filesystem.api.FileSystem; @@ -809,17 +809,6 @@ public abstract class DeletedMessagesVaultTest { deleteMessages(bartAccessToken, idsToDestroy); } - private void deleteMessages(AccessToken accessToken, List<String> idsToDestroy) { - String idString = idsToDestroy.stream() - .map(id -> "\"" + id + "\"") - .collect(Collectors.joining(",")); - - with() - .header("Authorization", accessToken.serialize()) - .body("[[\"setMessages\", {\"destroy\": [" + idString + "]}, \"#0\"]]") - .post("/jmap"); - } - private void restoreAllMessagesOfHomer() { restoreMessagesFor(HOMER); } diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/LinshareBlobExportMechanismIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/LinshareBlobExportMechanismIntegrationTest.java index 66e31bd..58be63e 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/LinshareBlobExportMechanismIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/LinshareBlobExportMechanismIntegrationTest.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.deleteMessages; import static org.apache.james.jmap.JmapCommonRequests.getOutboxId; import static org.apache.james.jmap.JmapCommonRequests.listMessageIdsForAccount; import static org.apache.james.jmap.JmapURIBuilder.baseUri; @@ -38,7 +39,6 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; import java.util.List; -import java.util.stream.Collectors; import org.apache.james.GuiceJamesServer; import org.apache.james.jmap.ExportRequest; @@ -245,17 +245,6 @@ public abstract class LinshareBlobExportMechanismIntegrationTest { deleteMessages(homerAccessToken, idsToDestroy); } - private void deleteMessages(AccessToken accessToken, List<String> idsToDestroy) { - String idString = idsToDestroy.stream() - .map(id -> "\"" + id + "\"") - .collect(Collectors.joining(",")); - - with() - .header("Authorization", accessToken.serialize()) - .body("[[\"setMessages\", {\"destroy\": [" + idString + "]}, \"#0\"]]") - .post("/jmap"); - } - private void exportVaultContent(ExportRequest exportRequest) { String taskId = webAdminApi.with() --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org