You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/12/19 10:38:45 UTC
[james-project] 11/14: JAMES-3012 Some Swagger tests are
implementation specific
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 3858a5dfae091f315f91afae3d42f0806fbfd293
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Dec 18 04:50:26 2019 +0100
JAMES-3012 Some Swagger tests are implementation specific
---
.../rabbitmq/RabbitMQWebAdminServerIntegrationTest.java | 14 ++++++++++++++
.../integration/WebAdminServerIntegrationTest.java | 5 +----
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java
index 188268a..05228e1 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java
@@ -25,6 +25,7 @@ import static io.restassured.RestAssured.with;
import static org.apache.james.webadmin.Constants.JSON_CONTENT_TYPE;
import static org.apache.james.webadmin.Constants.SEPARATOR;
import static org.hamcrest.CoreMatchers.hasItems;
+import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import org.apache.james.CassandraRabbitMQAwsS3JmapTestRule;
@@ -36,6 +37,7 @@ import org.apache.james.webadmin.integration.WebAdminServerIntegrationTest;
import org.apache.james.webadmin.routes.AliasRoutes;
import org.apache.james.webadmin.routes.CassandraMappingsRoutes;
import org.apache.james.webadmin.routes.TasksRoutes;
+import org.apache.james.webadmin.swagger.routes.SwaggerRoutes;
import org.awaitility.Awaitility;
import org.awaitility.Duration;
import org.eclipse.jetty.http.HttpStatus;
@@ -154,4 +156,16 @@ public class RabbitMQWebAdminServerIntegrationTest extends WebAdminServerIntegra
.statusCode(HttpStatus.OK_200)
.body("source", hasItems(ALIAS_1, ALIAS_2));
}
+
+
+ @Test
+ public void getSwaggerShouldContainDistributedEndpoints() {
+ when()
+ .get(SwaggerRoutes.SWAGGER_ENDPOINT)
+ .then()
+ .statusCode(HttpStatus.OK_200)
+ .body(containsString("\"tags\":[\"Cassandra Mappings Operations\"]"))
+ .body(containsString("{\"name\":\"ReIndexing (mailboxes)\"}"))
+ .body(containsString("{\"name\":\"MessageIdReIndexing\"}"));
+ }
}
\ No newline at end of file
diff --git a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
index 1ffe07b..ee1e92c 100644
--- a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
@@ -297,10 +297,7 @@ public abstract class WebAdminServerIntegrationTest {
.body(containsString("\"tags\":[\"MailQueues\"]"))
.body(containsString("\"tags\":[\"Address Forwards\"]"))
.body(containsString("\"tags\":[\"Address Aliases\"]"))
- .body(containsString("\"tags\":[\"Address Groups\"]"))
- .body(containsString("\"tags\":[\"Cassandra Mappings Operations\"]"))
- .body(containsString("{\"name\":\"ReIndexing (mailboxes)\"}"))
- .body(containsString("{\"name\":\"MessageIdReIndexing\"}"));
+ .body(containsString("\"tags\":[\"Address Groups\"]"));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org