JAMES-2366 Factorize some common JSON path constants in JMAP integration tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e229cb23 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e229cb23 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e229cb23 Branch: refs/heads/master Commit: e229cb2397a2dc2650a4057d01a0351e97d61c72 Parents: 7be706d Author: benwa <btell...@linagora.com> Authored: Thu Apr 5 17:08:43 2018 +0700 Committer: Antoine Duprat <adup...@linagora.com> Committed: Fri Apr 6 15:04:49 2018 +0200 ---------------------------------------------------------------------- .../test/java/org/apache/james/jmap/TestingConstants.java | 7 +++++++ .../java/org/apache/james/jmap/VacationIntegrationTest.java | 6 +++--- .../jmap/methods/integration/ForwardIntegrationTest.java | 4 ++-- .../jmap/methods/integration/GetMailboxesMethodTest.java | 9 ++++----- .../jmap/methods/integration/GetMessageListMethodTest.java | 4 ++-- .../jmap/methods/integration/GetVacationResponseTest.java | 5 ++--- .../james/jmap/methods/integration/SendMDNMethodTest.java | 4 ++-- .../jmap/methods/integration/SetMailboxesMethodTest.java | 6 +++--- .../jmap/methods/integration/SetMessagesMethodTest.java | 8 ++++---- .../jmap/methods/integration/SetVacationResponseTest.java | 4 ++-- .../jmap/methods/integration/SpamAssassinContract.java | 4 ++-- .../integration/cucumber/GetMailboxesMethodStepdefs.java | 5 ++--- .../integration/cucumber/GetMessageListMethodStepdefs.java | 2 +- .../integration/cucumber/GetMessagesMethodStepdefs.java | 4 ++-- .../integration/cucumber/SetMailboxesMethodStepdefs.java | 5 ++--- 15 files changed, 40 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java index 9cd1141..aa1da2f 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java @@ -44,4 +44,11 @@ public interface TestingConstants { .setAccept(ContentType.JSON) .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8))); + String NAME = "[0][0]"; + String ARGUMENTS = "[0][1]"; + String FIRST_MAILBOX = ARGUMENTS + ".list[0]"; + String SECOND_MAILBOX = ARGUMENTS + ".list[1]"; + String SECOND_NAME = "[1][0]"; + String SECOND_ARGUMENTS = "[1][1]"; + } http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/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 ffed249..5afcdec 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 @@ -23,6 +23,9 @@ import static com.jayway.restassured.RestAssured.given; import static com.jayway.restassured.RestAssured.with; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; import static org.apache.james.jmap.JmapURIBuilder.baseUri; +import static org.apache.james.jmap.TestingConstants.ARGUMENTS; +import static org.apache.james.jmap.TestingConstants.SECOND_ARGUMENTS; +import static org.apache.james.jmap.TestingConstants.SECOND_NAME; import static org.apache.james.jmap.TestingConstants.calmlyAwait; import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder; import static org.hamcrest.Matchers.empty; @@ -52,9 +55,6 @@ import com.jayway.restassured.RestAssured; public abstract class VacationIntegrationTest { - private static final String ARGUMENTS = "[0][1]"; - private static final String SECOND_NAME = "[1][0]"; - private static final String SECOND_ARGUMENTS = "[1][1]"; private static final String DOMAIN = "mydomain.tld"; private static final String USER_1 = "benwa@" + DOMAIN; private static final String USER_2 = "matthieu@" + DOMAIN; http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java index 8511b45..8aa0908 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java @@ -25,6 +25,8 @@ import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser import static org.apache.james.jmap.JmapCommonRequests.getOutboxId; import static org.apache.james.jmap.JmapCommonRequests.isAnyMessageFoundInRecipientsMailboxes; import static org.apache.james.jmap.JmapURIBuilder.baseUri; +import static org.apache.james.jmap.TestingConstants.ARGUMENTS; +import static org.apache.james.jmap.TestingConstants.NAME; import static org.apache.james.jmap.TestingConstants.calmlyAwait; import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder; import static org.hamcrest.Matchers.equalTo; @@ -56,8 +58,6 @@ public abstract class ForwardIntegrationTest { private static final String CEDRIC = "cedric@" + DOMAIN; private static final String CEDRIC_PASSWORD = "456789"; - private static final String NAME = "[0][0]"; - private static final String ARGUMENTS = "[0][1]"; protected abstract GuiceJamesServer createJmapServer(); http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/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 74a8f53..97d3510 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 @@ -22,6 +22,10 @@ package org.apache.james.jmap.methods.integration; import static com.jayway.restassured.RestAssured.given; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; import static org.apache.james.jmap.JmapURIBuilder.baseUri; +import static org.apache.james.jmap.TestingConstants.ARGUMENTS; +import static org.apache.james.jmap.TestingConstants.FIRST_MAILBOX; +import static org.apache.james.jmap.TestingConstants.NAME; +import static org.apache.james.jmap.TestingConstants.SECOND_MAILBOX; import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.empty; @@ -78,11 +82,6 @@ import com.google.common.collect.ImmutableMap; import com.jayway.restassured.RestAssured; public abstract class GetMailboxesMethodTest { - private static final String NAME = "[0][0]"; - private static final String ARGUMENTS = "[0][1]"; - private static final String FIRST_MAILBOX = ARGUMENTS + ".list[0]"; - private static final String SECOND_MAILBOX = ARGUMENTS + ".list[1]"; - public static final String READ = String.valueOf(Right.Read.asCharacter()); public static final String LOOKUP = String.valueOf(Right.Lookup.asCharacter()); public static final String ADMINISTER = String.valueOf(Right.Administer.asCharacter()); http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/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 5eff994..692e716 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 @@ -22,6 +22,8 @@ package org.apache.james.jmap.methods.integration; import static com.jayway.restassured.RestAssured.given; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; import static org.apache.james.jmap.JmapURIBuilder.baseUri; +import static org.apache.james.jmap.TestingConstants.ARGUMENTS; +import static org.apache.james.jmap.TestingConstants.NAME; import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.contains; @@ -72,8 +74,6 @@ import com.jayway.restassured.RestAssured; public abstract class GetMessageListMethodTest { private static final String FORWARDED = "$Forwarded"; - private static final String NAME = "[0][0]"; - private static final String ARGUMENTS = "[0][1]"; private static final ZoneId ZONE_ID = ZoneId.of("Europe/Paris"); private ACLProbeImpl aclProbe; http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/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 a4c5b6a..6213e1a 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 @@ -22,6 +22,8 @@ package org.apache.james.jmap.methods.integration; import static com.jayway.restassured.RestAssured.given; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; import static org.apache.james.jmap.JmapURIBuilder.baseUri; +import static org.apache.james.jmap.TestingConstants.ARGUMENTS; +import static org.apache.james.jmap.TestingConstants.NAME; import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; @@ -46,9 +48,6 @@ import com.jayway.restassured.RestAssured; import com.jayway.restassured.http.ContentType; public abstract class GetVacationResponseTest { - - private static final String NAME = "[0][0]"; - private static final String ARGUMENTS = "[0][1]"; private static final String USERS_DOMAIN = "domain.tld"; public static final String USER = "username@" + USERS_DOMAIN; public static final String PASSWORD = "password"; http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/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 faeb705..14da500 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 @@ -27,6 +27,8 @@ import static org.apache.james.jmap.JmapCommonRequests.getOutboxId; import static org.apache.james.jmap.JmapCommonRequests.listMessageIdsForAccount; import static org.apache.james.jmap.JmapCommonRequests.listMessageIdsInMailbox; import static org.apache.james.jmap.JmapURIBuilder.baseUri; +import static org.apache.james.jmap.TestingConstants.ARGUMENTS; +import static org.apache.james.jmap.TestingConstants.NAME; import static org.apache.james.jmap.TestingConstants.calmlyAwait; import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder; import static org.hamcrest.Matchers.contains; @@ -64,8 +66,6 @@ import com.jayway.restassured.RestAssured; import com.jayway.restassured.parsing.Parser; 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 HOMER = "homer@" + USERS_DOMAIN; private static final String BART = "bart@" + USERS_DOMAIN; http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/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 839491d..151707e 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 @@ -23,6 +23,9 @@ import static com.jayway.restassured.RestAssured.given; import static com.jayway.restassured.RestAssured.with; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; import static org.apache.james.jmap.JmapURIBuilder.baseUri; +import static org.apache.james.jmap.TestingConstants.ARGUMENTS; +import static org.apache.james.jmap.TestingConstants.FIRST_MAILBOX; +import static org.apache.james.jmap.TestingConstants.NAME; import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.contains; @@ -66,9 +69,6 @@ import com.jayway.restassured.RestAssured; public abstract class SetMailboxesMethodTest { - private static final String NAME = "[0][0]"; - private static final String ARGUMENTS = "[0][1]"; - private static final String FIRST_MAILBOX = ARGUMENTS + ".list[0]"; private static final String USERS_DOMAIN = "domain.tld"; private static final String ADMINISTER = String.valueOf(Right.Administer.asCharacter()); http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/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 d042556..074a820 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 @@ -23,6 +23,10 @@ import static com.jayway.restassured.RestAssured.given; import static com.jayway.restassured.RestAssured.with; import static com.jayway.restassured.config.EncoderConfig.encoderConfig; import static com.jayway.restassured.config.RestAssuredConfig.newConfig; +import static org.apache.james.jmap.TestingConstants.ARGUMENTS; +import static org.apache.james.jmap.TestingConstants.NAME; +import static org.apache.james.jmap.TestingConstants.SECOND_ARGUMENTS; +import static org.apache.james.jmap.TestingConstants.SECOND_NAME; import static org.apache.james.jmap.TestingConstants.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.contains; @@ -119,10 +123,6 @@ public abstract class SetMessagesMethodTest { private static final int IMAP_PORT = 1143; private static final String FORWARDED = "$Forwarded"; private static final int _1MB = 1024 * 1024; - private static final String NAME = "[0][0]"; - private static final String ARGUMENTS = "[0][1]"; - private static final String SECOND_NAME = "[1][0]"; - private static final String SECOND_ARGUMENTS = "[1][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; http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java index 0724ced..a0bd93e 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java @@ -22,6 +22,8 @@ package org.apache.james.jmap.methods.integration; import static com.jayway.restassured.RestAssured.given; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; import static org.apache.james.jmap.JmapURIBuilder.baseUri; +import static org.apache.james.jmap.TestingConstants.ARGUMENTS; +import static org.apache.james.jmap.TestingConstants.NAME; import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -46,8 +48,6 @@ import com.jayway.restassured.http.ContentType; public abstract class SetVacationResponseTest { - private static final String NAME = "[0][0]"; - private static final String ARGUMENTS = "[0][1]"; private static final String USERS_DOMAIN = "domain.tld"; public static final String USER = "username@" + USERS_DOMAIN; public static final String PASSWORD = "password"; http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java index 0599108..fc1222b 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java @@ -25,6 +25,8 @@ import static com.jayway.restassured.config.EncoderConfig.encoderConfig; import static com.jayway.restassured.config.RestAssuredConfig.newConfig; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; import static org.apache.james.jmap.JmapURIBuilder.baseUri; +import static org.apache.james.jmap.TestingConstants.ARGUMENTS; +import static org.apache.james.jmap.TestingConstants.NAME; import static org.apache.james.jmap.TestingConstants.calmlyAwait; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; @@ -50,8 +52,6 @@ import com.jayway.restassured.parsing.Parser; public interface SpamAssassinContract { - String NAME = "[0][0]"; - String ARGUMENTS = "[0][1]"; String BOBS_DOMAIN = "spamer.com"; String BOB = "bob@" + BOBS_DOMAIN; String BOB_PASSWORD = "bobPassword"; http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMailboxesMethodStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMailboxesMethodStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMailboxesMethodStepdefs.java index b293819..3a7ee03 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMailboxesMethodStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMailboxesMethodStepdefs.java @@ -21,6 +21,8 @@ package org.apache.james.jmap.methods.integration.cucumber; import static com.jayway.jsonpath.Criteria.where; import static com.jayway.jsonpath.Filter.filter; +import static org.apache.james.jmap.TestingConstants.ARGUMENTS; +import static org.apache.james.jmap.TestingConstants.NAME; import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; @@ -38,9 +40,6 @@ import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped public class GetMailboxesMethodStepdefs { - private static final String NAME = "[0][0]"; - private static final String ARGUMENTS = "[0][1]"; - private final UserStepdefs userStepdefs; private final HttpClient httpClient; private final MainStepdefs mainStepdefs; http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessageListMethodStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessageListMethodStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessageListMethodStepdefs.java index 3795b8d..c3b99af 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessageListMethodStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessageListMethodStepdefs.java @@ -19,6 +19,7 @@ package org.apache.james.jmap.methods.integration.cucumber; +import static org.apache.james.jmap.TestingConstants.ARGUMENTS; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; @@ -34,7 +35,6 @@ import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped public class GetMessageListMethodStepdefs { - private static final String ARGUMENTS = "[0][1]"; private final MainStepdefs mainStepdefs; private final HttpClient httpClient; private final MessageIdStepdefs messageIdStepdefs; http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java index 9db74ca..f9bd5db 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.methods.integration.cucumber; +import static org.apache.james.jmap.TestingConstants.ARGUMENTS; +import static org.apache.james.jmap.TestingConstants.NAME; import static org.assertj.core.api.Assertions.assertThat; import java.io.ByteArrayInputStream; @@ -63,8 +65,6 @@ import net.minidev.json.JSONArray; public class GetMessagesMethodStepdefs { private static final Optional<Map<String, String>> NO_HEADERS = Optional.empty(); - private static final String NAME = "[0][0]"; - private static final String ARGUMENTS = "[0][1]"; private static final String FIRST_MESSAGE = ARGUMENTS + ".list[0]"; private static final String ATTACHMENTS = FIRST_MESSAGE + ".attachments"; private static final String FIRST_ATTACHMENT = ATTACHMENTS + "[0]"; http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java index 657e812..a02db3d 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.methods.integration.cucumber; +import static org.apache.james.jmap.TestingConstants.ARGUMENTS; +import static org.apache.james.jmap.TestingConstants.NAME; import static org.apache.james.jmap.TestingConstants.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; @@ -52,9 +54,6 @@ import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped public class SetMailboxesMethodStepdefs { - private static final String NAME = "[0][0]"; - private static final String ARGUMENTS = "[0][1]"; - private final MainStepdefs mainStepdefs; private final UserStepdefs userStepdefs; private final HttpClient httpClient; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
