This is an automated email from the ASF dual-hosted git repository.
aduprat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit a6127a33279a01fa5fdc18363a8be2d3562de86d
Author: Gautier DI FOLCO <gdifo...@linagora.com>
AuthorDate: Thu Mar 28 10:43:06 2019 +0100
JAMES-2671 Move cucumber tests in rabbitmq-jmap-integration-testing to
cucumber.swift
---
.../rabbitmq/cucumber/CucumberAwsS3Singleton.java | 29 -----
.../rabbitmq/cucumber/RabbitMQAwsS3Stepdefs.java | 122 ---------------------
.../{ => swift}/CucumberCassandraSingleton.java | 2 +-
.../{ => swift}/CucumberRabbitMQSingleton.java | 2 +-
.../{ => swift}/CucumberSwiftSingleton.java | 2 +-
.../{ => swift}/RabbitMQDownloadCucumberTest.java | 4 +-
.../{ => swift}/RabbitMQGetMessagesMethodTest.java | 4 +-
.../RabbitMQIMAPKeywordsInconsistenciesTest.java | 4 +-
.../RabbitMQIMAPSetMessagesCompatibilityTest.java | 4 +-
.../{ => swift}/RabbitMQMailboxSharingTest.java | 4 +-
.../{ => swift}/RabbitMQMessageSharingTest.java | 4 +-
.../RabbitMQSetMailboxesMethodCucumberTest.java | 4 +-
.../RabbitMQSetMessagesMethodCucumberTest.java | 4 +-
.../{ => swift}/RabbitMQSwiftStepdefs.java | 2 +-
.../{ => swift}/RabbitMQUploadCucumberTest.java | 4 +-
15 files changed, 22 insertions(+), 173 deletions(-)
diff --git
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/CucumberAwsS3Singleton.java
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/CucumberAwsS3Singleton.java
deleted file mode 100644
index 6f06cc1..0000000
---
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/CucumberAwsS3Singleton.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-package org.apache.james.jmap.rabbitmq.cucumber;
-
-import org.apache.james.modules.objectstorage.PayloadCodecFactory;
-import org.apache.james.modules.objectstorage.aws.s3.DockerAwsS3TestRule;
-
-public class CucumberAwsS3Singleton {
-
- public static DockerAwsS3TestRule swiftServer = new DockerAwsS3TestRule();
- public static DockerAwsS3TestRule encryptedAwsS3Server = new
DockerAwsS3TestRule(PayloadCodecFactory.AES256);
-}
-
diff --git
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQAwsS3Stepdefs.java
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQAwsS3Stepdefs.java
deleted file mode 100644
index 8a19262..0000000
---
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQAwsS3Stepdefs.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-
-package org.apache.james.jmap.rabbitmq.cucumber;
-
-import java.util.Arrays;
-
-import javax.inject.Inject;
-
-import org.apache.activemq.store.PersistenceAdapter;
-import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
-import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.CleanupTasksPerformer;
-import org.apache.james.DockerCassandraRule;
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.backends.es.EmbeddedElasticSearch;
-import org.apache.james.jmap.methods.integration.cucumber.ImapStepdefs;
-import org.apache.james.jmap.methods.integration.cucumber.MainStepdefs;
-import org.apache.james.mailbox.cassandra.ids.CassandraMessageId;
-import org.apache.james.mailbox.extractor.TextExtractor;
-import org.apache.james.mailbox.store.extractor.DefaultTextExtractor;
-import org.apache.james.modules.DockerRabbitMQRule;
-import org.apache.james.modules.TestESMetricReporterModule;
-import org.apache.james.modules.TestElasticSearchModule;
-import org.apache.james.modules.TestJMAPServerModule;
-import org.apache.james.modules.TestRabbitMQModule;
-import org.apache.james.modules.objectstorage.aws.s3.DockerAwsS3TestRule;
-import org.apache.james.server.CassandraTruncateTableTask;
-import org.apache.james.server.core.configuration.Configuration;
-import org.junit.rules.TemporaryFolder;
-
-import com.github.fge.lambdas.runnable.ThrowingRunnable;
-import com.google.inject.multibindings.Multibinder;
-import cucumber.api.java.After;
-import cucumber.api.java.Before;
-import cucumber.runtime.java.guice.ScenarioScoped;
-
-@ScenarioScoped
-public class RabbitMQAwsS3Stepdefs {
-
- private final MainStepdefs mainStepdefs;
- private final ImapStepdefs imapStepdefs;
- private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new
EmbeddedElasticSearch(temporaryFolder);
- private DockerCassandraRule cassandraServer =
CucumberCassandraSingleton.cassandraServer;
- private DockerRabbitMQRule rabbitMQServer =
CucumberRabbitMQSingleton.rabbitMQServer;
- private DockerAwsS3TestRule swiftServer =
CucumberAwsS3Singleton.swiftServer;
-
- @Inject
- private RabbitMQAwsS3Stepdefs(MainStepdefs mainStepdefs, ImapStepdefs
imapStepdefs) {
- this.mainStepdefs = mainStepdefs;
- this.imapStepdefs = imapStepdefs;
- }
-
- @Before
- public void init() throws Exception {
- cassandraServer.start();
- rabbitMQServer.start();
- swiftServer.start();
-
- temporaryFolder.create();
- embeddedElasticSearch.before();
- mainStepdefs.messageIdFactory = new CassandraMessageId.Factory();
- Configuration configuration = Configuration.builder()
- .workingDirectory(temporaryFolder.newFolder())
- .configurationFromClasspath()
- .build();
-
- mainStepdefs.jmapServer =
GuiceJamesServer.forConfiguration(configuration)
- .combineWith(CassandraRabbitMQJamesServerMain.MODULES)
- .overrideWith(new TestJMAPServerModule(10))
- .overrideWith(new TestESMetricReporterModule())
- .overrideWith(new
TestRabbitMQModule(rabbitMQServer.dockerRabbitMQ()))
- .overrideWith(swiftServer.getModule())
- .overrideWith(new
TestElasticSearchModule(embeddedElasticSearch))
- .overrideWith(cassandraServer.getModule())
- .overrideWith(binder ->
binder.bind(TextExtractor.class).to(DefaultTextExtractor.class))
- .overrideWith((binder) ->
binder.bind(PersistenceAdapter.class).to(MemoryPersistenceAdapter.class))
- .overrideWith(binder -> Multibinder.newSetBinder(binder,
CleanupTasksPerformer.CleanupTask.class).addBinding().to(CassandraTruncateTableTask.class))
- .overrideWith((binder ->
binder.bind(CleanupTasksPerformer.class).asEagerSingleton()));
- mainStepdefs.awaitMethod = () ->
embeddedElasticSearch.awaitForElasticSearch();
- mainStepdefs.init();
- }
-
- @After
- public void tearDown() {
- ignoreFailures(imapStepdefs::closeConnections,
- mainStepdefs::tearDown,
- () -> embeddedElasticSearch.after(),
- () -> temporaryFolder.delete());
- }
-
- private void ignoreFailures(ThrowingRunnable... cleaners) {
- Arrays.stream(cleaners)
- .forEach(this::runSwallowingException);
- }
-
- private void runSwallowingException(Runnable run) {
- try {
- run.run();
- } catch (Exception e) {
- // ignore
- }
- }
-}
-
diff --git
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/CucumberCassandraSingleton.java
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/CucumberCassandraSingleton.java
similarity index 96%
rename from
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/CucumberCassandraSingleton.java
rename to
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/CucumberCassandraSingleton.java
index aabddd0..b476acc 100644
---
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/CucumberCassandraSingleton.java
+++
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/CucumberCassandraSingleton.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.jmap.rabbitmq.cucumber;
+package org.apache.james.jmap.rabbitmq.cucumber.swift;
import org.apache.james.DockerCassandraRule;
diff --git
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/CucumberRabbitMQSingleton.java
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/CucumberRabbitMQSingleton.java
similarity index 96%
rename from
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/CucumberRabbitMQSingleton.java
rename to
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/CucumberRabbitMQSingleton.java
index 2fe3b36..c56063d 100644
---
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/CucumberRabbitMQSingleton.java
+++
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/CucumberRabbitMQSingleton.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.jmap.rabbitmq.cucumber;
+package org.apache.james.jmap.rabbitmq.cucumber.swift;
import org.apache.james.modules.DockerRabbitMQRule;
diff --git
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/CucumberSwiftSingleton.java
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/CucumberSwiftSingleton.java
similarity index 96%
rename from
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/CucumberSwiftSingleton.java
rename to
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/CucumberSwiftSingleton.java
index 7695ca3..adbf651 100644
---
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/CucumberSwiftSingleton.java
+++
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/CucumberSwiftSingleton.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.jmap.rabbitmq.cucumber;
+package org.apache.james.jmap.rabbitmq.cucumber.swift;
import org.apache.james.modules.objectstorage.PayloadCodecFactory;
import org.apache.james.modules.objectstorage.swift.DockerSwiftTestRule;
diff --git
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQDownloadCucumberTest.java
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQDownloadCucumberTest.java
similarity index 94%
rename from
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQDownloadCucumberTest.java
rename to
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQDownloadCucumberTest.java
index 0d26cd0..2af6f4e 100644
---
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQDownloadCucumberTest.java
+++
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQDownloadCucumberTest.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jmap.rabbitmq.cucumber;
+package org.apache.james.jmap.rabbitmq.cucumber.swift;
import org.apache.james.jmap.categories.EnableCucumber;
import org.junit.experimental.categories.Category;
@@ -28,7 +28,7 @@ import cucumber.api.junit.Cucumber;
@RunWith(Cucumber.class)
@CucumberOptions(features = {"classpath:cucumber/DownloadEndpoint.feature",
"classpath:cucumber/DownloadGet.feature",
"classpath:cucumber/DownloadPost.feature"},
- glue = {"org.apache.james.jmap.methods.integration",
"org.apache.james.jmap.rabbitmq.cucumber"},
+ glue = {"org.apache.james.jmap.methods.integration",
"org.apache.james.jmap.rabbitmq.cucumber.swift"},
tags = {"not @Ignore", "@BasicFeature"},
strict = true)
@Category(EnableCucumber.class)
diff --git
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQGetMessagesMethodTest.java
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQGetMessagesMethodTest.java
similarity index 94%
rename from
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQGetMessagesMethodTest.java
rename to
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQGetMessagesMethodTest.java
index eb5ea7d..281e638 100644
---
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQGetMessagesMethodTest.java
+++
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQGetMessagesMethodTest.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jmap.rabbitmq.cucumber;
+package org.apache.james.jmap.rabbitmq.cucumber.swift;
import org.apache.james.jmap.categories.EnableCucumber;
import org.junit.experimental.categories.Category;
@@ -28,7 +28,7 @@ import cucumber.api.junit.Cucumber;
@RunWith(Cucumber.class)
@CucumberOptions(features = "classpath:cucumber/GetMessages.feature",
- glue = {"org.apache.james.jmap.methods.integration",
"org.apache.james.jmap.rabbitmq.cucumber"},
+ glue = {"org.apache.james.jmap.methods.integration",
"org.apache.james.jmap.rabbitmq.cucumber.swift"},
tags = {"not @Ignore", "@BasicFeature"},
strict = true)
@Category(EnableCucumber.class)
diff --git
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQIMAPKeywordsInconsistenciesTest.java
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQIMAPKeywordsInconsistenciesTest.java
similarity index 94%
rename from
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQIMAPKeywordsInconsistenciesTest.java
rename to
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQIMAPKeywordsInconsistenciesTest.java
index 08245c5..df9b64f 100644
---
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQIMAPKeywordsInconsistenciesTest.java
+++
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQIMAPKeywordsInconsistenciesTest.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jmap.rabbitmq.cucumber;
+package org.apache.james.jmap.rabbitmq.cucumber.swift;
import org.apache.james.jmap.categories.EnableCucumber;
import org.junit.experimental.categories.Category;
@@ -28,7 +28,7 @@ import cucumber.api.junit.Cucumber;
@RunWith(Cucumber.class)
@CucumberOptions(features =
"classpath:cucumber/ImapKeywordsConsistency.feature",
- glue = {"org.apache.james.jmap.methods.integration",
"org.apache.james.jmap.rabbitmq.cucumber"},
+ glue = {"org.apache.james.jmap.methods.integration",
"org.apache.james.jmap.rabbitmq.cucumber.swift"},
tags = {"not @Ignore", "@BasicFeature"},
strict = true)
@Category(EnableCucumber.class)
diff --git
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQIMAPSetMessagesCompatibilityTest.java
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQIMAPSetMessagesCompatibilityTest.java
similarity index 94%
rename from
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQIMAPSetMessagesCompatibilityTest.java
rename to
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQIMAPSetMessagesCompatibilityTest.java
index a804f6c..2a64f07 100644
---
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQIMAPSetMessagesCompatibilityTest.java
+++
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQIMAPSetMessagesCompatibilityTest.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jmap.rabbitmq.cucumber;
+package org.apache.james.jmap.rabbitmq.cucumber.swift;
import org.apache.james.jmap.categories.EnableCucumber;
import org.junit.experimental.categories.Category;
@@ -28,7 +28,7 @@ import cucumber.api.junit.Cucumber;
@RunWith(Cucumber.class)
@CucumberOptions(features =
"classpath:cucumber/ImapSetMessagesMailboxesUpdatesCompatibility.feature",
- glue = {"org.apache.james.jmap.methods.integration",
"org.apache.james.jmap.rabbitmq.cucumber"},
+ glue = {"org.apache.james.jmap.methods.integration",
"org.apache.james.jmap.rabbitmq.cucumber.swift"},
tags = {"not @Ignore", "@BasicFeature"},
strict = true)
@Category(EnableCucumber.class)
diff --git
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQMailboxSharingTest.java
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQMailboxSharingTest.java
similarity index 95%
rename from
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQMailboxSharingTest.java
rename to
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQMailboxSharingTest.java
index 0a03890..dfc49a8 100644
---
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQMailboxSharingTest.java
+++
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQMailboxSharingTest.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jmap.rabbitmq.cucumber;
+package org.apache.james.jmap.rabbitmq.cucumber.swift;
import org.apache.james.jmap.categories.EnableCucumber;
import org.junit.experimental.categories.Category;
@@ -35,7 +35,7 @@ import cucumber.api.junit.Cucumber;
"classpath:cucumber/sharing/MailboxDeletionAndSharing.feature",
"classpath:cucumber/sharing/MoveMailboxAndSharing.feature",
"classpath:cucumber/sharing/RenamingMailboxAndSharing.feature" },
- glue = { "org.apache.james.jmap.methods.integration",
"org.apache.james.jmap.rabbitmq.cucumber" },
+ glue = { "org.apache.james.jmap.methods.integration",
"org.apache.james.jmap.rabbitmq.cucumber.swift" },
tags = {"not @Ignore", "@BasicFeature"},
strict = true)
@Category(EnableCucumber.class)
diff --git
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQMessageSharingTest.java
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQMessageSharingTest.java
similarity index 95%
rename from
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQMessageSharingTest.java
rename to
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQMessageSharingTest.java
index 4dca94f..b783e7a 100644
---
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQMessageSharingTest.java
+++
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQMessageSharingTest.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jmap.rabbitmq.cucumber;
+package org.apache.james.jmap.rabbitmq.cucumber.swift;
import org.apache.james.jmap.categories.EnableCucumber;
import org.junit.experimental.categories.Category;
@@ -36,7 +36,7 @@ import cucumber.api.junit.Cucumber;
"classpath:cucumber/sharing/MoveMessageAndSharing.feature",
"classpath:cucumber/sharing/SetFlagAndSharing.feature",
"classpath:cucumber/sharing/CopyAndSharing.feature" },
- glue = { "org.apache.james.jmap.methods.integration",
"org.apache.james.jmap.rabbitmq.cucumber" },
+ glue = { "org.apache.james.jmap.methods.integration",
"org.apache.james.jmap.rabbitmq.cucumber.swift" },
tags = {"not @Ignore", "@BasicFeature"},
strict = true)
@Category(EnableCucumber.class)
diff --git
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQSetMailboxesMethodCucumberTest.java
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQSetMailboxesMethodCucumberTest.java
similarity index 94%
rename from
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQSetMailboxesMethodCucumberTest.java
rename to
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQSetMailboxesMethodCucumberTest.java
index 07283aa..88fce78 100644
---
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQSetMailboxesMethodCucumberTest.java
+++
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQSetMailboxesMethodCucumberTest.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jmap.rabbitmq.cucumber;
+package org.apache.james.jmap.rabbitmq.cucumber.swift;
import org.apache.james.jmap.categories.EnableCucumber;
import org.junit.experimental.categories.Category;
@@ -28,7 +28,7 @@ import cucumber.api.junit.Cucumber;
@RunWith(Cucumber.class)
@CucumberOptions(features = {
"classpath:cucumber/MailboxModification.feature",
"classpath:cucumber/SetMailboxes.feature" },
- glue = { "org.apache.james.jmap.methods.integration",
"org.apache.james.jmap.rabbitmq.cucumber" },
+ glue = { "org.apache.james.jmap.methods.integration",
"org.apache.james.jmap.rabbitmq.cucumber.swift" },
tags = {"not @Ignore", "@BasicFeature"},
strict = true)
@Category(EnableCucumber.class)
diff --git
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQSetMessagesMethodCucumberTest.java
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQSetMessagesMethodCucumberTest.java
similarity index 94%
rename from
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQSetMessagesMethodCucumberTest.java
rename to
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQSetMessagesMethodCucumberTest.java
index 3b7d04c..e4f8e61 100644
---
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQSetMessagesMethodCucumberTest.java
+++
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQSetMessagesMethodCucumberTest.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jmap.rabbitmq.cucumber;
+package org.apache.james.jmap.rabbitmq.cucumber.swift;
import org.apache.james.jmap.categories.EnableCucumber;
import org.junit.experimental.categories.Category;
@@ -28,7 +28,7 @@ import cucumber.api.junit.Cucumber;
@RunWith(Cucumber.class)
@CucumberOptions(features = "classpath:cucumber/SetMessages.feature",
- glue = {"org.apache.james.jmap.methods.integration",
"org.apache.james.jmap.rabbitmq.cucumber"},
+ glue = {"org.apache.james.jmap.methods.integration",
"org.apache.james.jmap.rabbitmq.cucumber.swift"},
tags = {"not @Ignore", "@BasicFeature"},
strict = true)
@Category(EnableCucumber.class)
diff --git
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQSwiftStepdefs.java
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQSwiftStepdefs.java
similarity index 99%
rename from
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQSwiftStepdefs.java
rename to
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQSwiftStepdefs.java
index aa86570..a29ef21 100644
---
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQSwiftStepdefs.java
+++
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQSwiftStepdefs.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jmap.rabbitmq.cucumber;
+package org.apache.james.jmap.rabbitmq.cucumber.swift;
import java.util.Arrays;
diff --git
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQUploadCucumberTest.java
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQUploadCucumberTest.java
similarity index 94%
rename from
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQUploadCucumberTest.java
rename to
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQUploadCucumberTest.java
index bdeff9f..047d74a 100644
---
a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/RabbitMQUploadCucumberTest.java
+++
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/swift/RabbitMQUploadCucumberTest.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jmap.rabbitmq.cucumber;
+package org.apache.james.jmap.rabbitmq.cucumber.swift;
import org.apache.james.jmap.categories.EnableCucumber;
import org.junit.experimental.categories.Category;
@@ -28,7 +28,7 @@ import cucumber.api.junit.Cucumber;
@RunWith(Cucumber.class)
@CucumberOptions(features = {"classpath:cucumber/UploadEndpoint.feature"},
- glue = {"org.apache.james.jmap.methods.integration",
"org.apache.james.jmap.rabbitmq.cucumber"},
+ glue = {"org.apache.james.jmap.methods.integration",
"org.apache.james.jmap.rabbitmq.cucumber.swift"},
tags = {"not @Ignore", "@BasicFeature"},
strict = true)
@Category(EnableCucumber.class)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
