This is an automated email from the ASF dual-hosted git repository. rouazana pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 6980ef45ff8be1a0bced3db9c85327bb5eb9e7fb Author: Benoit Tellier <[email protected]> AuthorDate: Wed Jun 5 15:47:01 2019 +0700 JAMES-2314 WebAdminUtils.createWebAdminServer should call start This avoids having to specify the start call in each test class --- .../james/webadmin/routes/CassandraMappingsRoutesTest.java | 2 -- .../james/webadmin/routes/CassandraMigrationRoutesTest.java | 4 +--- .../test/java/org/apache/james/webadmin/WebAdminServerTest.java | 9 ++++----- .../src/test/java/org/apache/james/webadmin/WebAdminUtils.java | 6 ++++++ .../java/org/apache/james/webadmin/routes/ErrorRoutesTest.java | 1 - .../org/apache/james/webadmin/routes/HealthCheckRoutesTest.java | 2 -- .../java/org/apache/james/webadmin/routes/TasksRoutesTest.java | 2 -- .../java/org/apache/james/webadmin/routes/AliasRoutesTest.java | 1 - .../apache/james/webadmin/routes/DLPConfigurationRoutesTest.java | 1 - .../apache/james/webadmin/routes/DomainMappingsRoutesTest.java | 1 - .../java/org/apache/james/webadmin/routes/DomainsRoutesTest.java | 1 - .../java/org/apache/james/webadmin/routes/ForwardRoutesTest.java | 1 - .../java/org/apache/james/webadmin/routes/GroupsRoutesTest.java | 1 - .../org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java | 1 - .../org/apache/james/webadmin/routes/SieveScriptRoutesTest.java | 1 - .../java/org/apache/james/webadmin/routes/UsersRoutesTest.java | 1 - .../webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java | 1 - .../webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java | 1 - .../apache/james/webadmin/routes/EventDeadLettersRoutesTest.java | 1 - .../org/apache/james/webadmin/routes/ReindexingRoutesTest.java | 1 - .../apache/james/webadmin/routes/UserMailboxesRoutesTest.java | 1 - .../james/webadmin/routes/WebAdminQuotaSearchTestSystem.java | 1 - .../org/apache/james/webadmin/routes/MailQueueRoutesTest.java | 4 +--- .../apache/james/webadmin/routes/MailRepositoriesRoutesTest.java | 1 - 24 files changed, 12 insertions(+), 34 deletions(-) diff --git a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java index b1afff9..0f8f8f7 100644 --- a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java +++ b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java @@ -83,8 +83,6 @@ class CassandraMappingsRoutesTest { new CassandraMappingsRoutes(cassandraMappingsService, taskManager, jsonTransformer), new TasksRoutes(taskManager, jsonTransformer)); - webAdminServer.start(); - RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer) .setBasePath(CassandraMappingsRoutes.ROOT_PATH) .build(); diff --git a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java index 6f8c093..d94b2f7 100644 --- a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java +++ b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java @@ -86,9 +86,7 @@ public class CassandraMigrationRoutesTest { new CassandraMigrationRoutes(new CassandraMigrationService(schemaVersionDAO, allMigrationClazz, LATEST_VERSION), taskManager, jsonTransformer), new TasksRoutes(taskManager, jsonTransformer)); - - webAdminServer.start(); - + RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer) .setBasePath(CassandraMigrationRoutes.VERSION_BASE) .build(); diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java index 523b0bf..3605c93 100644 --- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java +++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java @@ -28,16 +28,15 @@ import org.junit.Test; public class WebAdminServerTest { @Test - public void getPortShouldThrowWhenNotConfigured() throws Exception { - WebAdminServer server = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory()); - assertThatThrownBy(() -> server.getPort()) + public void getPortShouldThrowWhenNotConfigured() { + WebAdminServer server = WebAdminUtils.createNotStartedWebAdminServer(new DefaultMetricFactory()); + assertThatThrownBy(server::getPort) .isInstanceOf(IllegalStateException.class); } @Test - public void getPortShouldReturnPortWhenConfigured() throws Exception { + public void getPortShouldReturnPortWhenConfigured() { WebAdminServer server = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory()); - server.start(); Port port = server.getPort(); diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java index b5a02fa..06b402c 100644 --- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java +++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java @@ -41,6 +41,12 @@ import io.restassured.specification.RequestSpecification; public class WebAdminUtils { public static WebAdminServer createWebAdminServer(MetricFactory metricFactory, Routes... routes) { + WebAdminServer webAdminServer = createNotStartedWebAdminServer(metricFactory, routes); + webAdminServer.start(); + return webAdminServer; + } + + public static WebAdminServer createNotStartedWebAdminServer(MetricFactory metricFactory, Routes... routes) { return new WebAdminServer(WebAdminConfiguration.TEST_CONFIGURATION, privateRoutes(routes), publicRoutes(routes), diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java index d5e8916..28c3659 100644 --- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java +++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java @@ -51,7 +51,6 @@ public class ErrorRoutesTest { webAdminServer = WebAdminUtils.createWebAdminServer( new NoopMetricFactory(), new ErrorRoutes()); - webAdminServer.start(); RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer) .setBasePath(ErrorRoutes.BASE_URL) diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java index 17ed35c..5117d96 100644 --- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java +++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java @@ -82,8 +82,6 @@ public class HealthCheckRoutesTest { new DefaultMetricFactory(), new HealthCheckRoutes(healthChecks, new JsonTransformer())); - webAdminServer.start(); - RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer) .setBasePath(HealthCheckRoutes.HEALTHCHECK) .build(); diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java index aaaea2c..d3a57fc 100644 --- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java +++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java @@ -59,8 +59,6 @@ class TasksRoutesTest { new DefaultMetricFactory(), new TasksRoutes(taskManager, new JsonTransformer())); - webAdminServer.start(); - RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer) .setBasePath(TasksRoutes.BASE) .build(); diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java index e511fb3..20a8eb8 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java @@ -85,7 +85,6 @@ class AliasRoutesTest { webAdminServer = WebAdminUtils.createWebAdminServer( new DefaultMetricFactory(), aliasRoutes); - webAdminServer.start(); RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer) .setBasePath("address/aliases") diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java index 2ddb946..1448f6c 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java @@ -70,7 +70,6 @@ class DLPConfigurationRoutesTest { webAdminServer = WebAdminUtils.createWebAdminServer( new DefaultMetricFactory(), new DLPConfigurationRoutes(dlpConfigurationStore, domainList, new JsonTransformer())); - webAdminServer.start(); requestSpecification = buildRequestSpecification(webAdminServer); } diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java index ff19744..d24bd9f 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java @@ -79,7 +79,6 @@ class DomainMappingsRoutesTest { webAdminServer = WebAdminUtils.createWebAdminServer( new DefaultMetricFactory(), domainMappingsRoutes); - webAdminServer.start(); RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer) .setBasePath(DOMAIN_MAPPINGS) diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java index dbb2857..0812fc9 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java @@ -70,7 +70,6 @@ class DomainsRoutesTest { webAdminServer = WebAdminUtils.createWebAdminServer( new DefaultMetricFactory(), new DomainsRoutes(domainList, domainAliasService, new JsonTransformer())); - webAdminServer.start(); RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer) .setBasePath(DomainsRoutes.DOMAINS) diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java index 70c2ba5..566fa27 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java @@ -84,7 +84,6 @@ class ForwardRoutesTest { webAdminServer = WebAdminUtils.createWebAdminServer( new DefaultMetricFactory(), forwardRoutes); - webAdminServer.start(); RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer) .setBasePath("address/forwards") diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java index 8c99c13..7119c80 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java @@ -82,7 +82,6 @@ class GroupsRoutesTest { webAdminServer = WebAdminUtils.createWebAdminServer( new DefaultMetricFactory(), groupsRoutes); - webAdminServer.start(); RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer) .setBasePath("address/groups") diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java index 53fe916..bab9849 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java @@ -51,7 +51,6 @@ class SieveQuotaRoutesTest { webAdminServer = WebAdminUtils.createWebAdminServer( new DefaultMetricFactory(), new SieveQuotaRoutes(sieveRepository, new JsonTransformer())); - webAdminServer.start(); RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer) .build(); diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java index 3658666..d53e461 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java @@ -95,7 +95,6 @@ public class SieveScriptRoutesTest { webAdminServer = WebAdminUtils.createWebAdminServer( new DefaultMetricFactory(), new SieveScriptRoutes(sieveRepository, usersRepository)); - webAdminServer.start(); RestAssured.requestSpecification = WebAdminUtils .buildRequestSpecification(webAdminServer) diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java index dbe92e9..5a67c33 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java @@ -63,7 +63,6 @@ class UsersRoutesTest { webAdminServer = WebAdminUtils.createWebAdminServer( new DefaultMetricFactory(), new UserRoutes(new UserService(usersRepository), new JsonTransformer())); - webAdminServer.start(); RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer) .setBasePath(UserRoutes.USERS) diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java index b471d34..4558c93 100644 --- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java @@ -187,7 +187,6 @@ class DeletedMessagesVaultRoutesTest { new TasksRoutes(taskManager, jsonTransformer), new DeletedMessagesVaultRoutes(vault, vaultRestore, exportService, jsonTransformer, taskManager, queryTranslator, usersRepository, messageIdFactory)); - webAdminServer.start(); RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer) .setBasePath(DeletedMessagesVaultRoutes.ROOT_PATH) .log(LogDetail.METHOD) diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java index 576c8fc..8238385 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java @@ -63,7 +63,6 @@ class DomainQuotaRoutesNoVirtualHostingTest { webAdminServer = WebAdminUtils.createWebAdminServer( new NoopMetricFactory(), domainQuotaRoutes); - webAdminServer.start(); RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer) .build(); diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java index 0ed07fd..c3e73cc 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java @@ -126,7 +126,6 @@ class EventDeadLettersRoutesTest { new DefaultMetricFactory(), new EventDeadLettersRoutes(service, eventSerializer, taskManager, jsonTransformer), new TasksRoutes(taskManager, jsonTransformer)); - webAdminServer.start(); RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer).build(); RestAssured.enableLoggingOfRequestAndResponseIfValidationFails(); diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java index 95faeaf..cdaa89c 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java @@ -105,7 +105,6 @@ class ReindexingRoutesTest { new InMemoryMessageId.Factory(), new MessageIdReIndexerImpl(mailboxManager, mailboxManager.getMapperFactory(), searchIndex), jsonTransformer)); - webAdminServer.start(); RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer).build(); RestAssured.enableLoggingOfRequestAndResponseIfValidationFails(); diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java index 27190b5..4441d10 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java @@ -76,7 +76,6 @@ class UserMailboxesRoutesTest { webAdminServer = WebAdminUtils.createWebAdminServer( new DefaultMetricFactory(), new UserMailboxesRoutes(new UserMailboxesService(mailboxManager, usersRepository), new JsonTransformer())); - webAdminServer.start(); RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer) .setBasePath(USERS_BASE + SEPARATOR + USERNAME + SEPARATOR + UserMailboxesRoutes.MAILBOXES) diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java index cee2514..ad56bcb 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java @@ -66,7 +66,6 @@ public class WebAdminQuotaSearchTestSystem { userQuotaRoutes, domainQuotaRoutes, globalQuotaRoutes); - this.webAdminServer.start(); this.requestSpecBuilder = WebAdminUtils.buildRequestSpecification(webAdminServer) .build(); diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java index 26004bb..5f30300 100644 --- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java @@ -89,12 +89,10 @@ public class MailQueueRoutesTest { TaskManager taskManager = new MemoryTaskManager(); JsonTransformer jsonTransformer = new JsonTransformer(); - WebAdminServer server = WebAdminUtils.createWebAdminServer( + return WebAdminUtils.createWebAdminServer( new NoopMetricFactory(), new MailQueueRoutes(mailQueueFactory, jsonTransformer, taskManager), new TasksRoutes(taskManager, jsonTransformer)); - server.start(); - return server; } RequestSpecification buildRequestSpecification(WebAdminServer server) { diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java index 2d9f935..b4291a7 100644 --- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java @@ -127,7 +127,6 @@ public class MailRepositoriesRoutesTest { new MailRepositoriesRoutes(repositoryStoreService, jsonTransformer, reprocessingService, taskManager), new TasksRoutes(taskManager, jsonTransformer)); - webAdminServer.start(); RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer) .setBasePath(MailRepositoriesRoutes.MAIL_REPOSITORIES) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
