This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 3c792369466ab99f0c0c9461f667d7ee40e5ed50
Author: Tran Tien Duc <dt...@linagora.com>
AuthorDate: Fri Jan 10 10:59:47 2020 +0700
[Refactoring] Using WebadminIntergrationTestModule in tests
---
.../james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java | 5 ++---
.../integration/rabbitmq/RabbitMQAuthorizedEndpointsTest.java | 4 ++--
.../integration/rabbitmq/RabbitMQForwardIntegrationTest.java | 4 ++--
.../james/webadmin/integration/rabbitmq/RabbitMQJmapExtension.java | 4 ++--
.../integration/rabbitmq/RabbitMQJwtFilterIntegrationTest.java | 4 ++--
.../rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java | 5 ++---
.../integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java | 4 ++--
.../rabbitmq/vault/RabbitMQDeletedMessageVaultIntegrationTest.java | 4 ++--
.../vault/RabbitMQLinshareBlobExportMechanismIntegrationTest.java | 4 ++--
.../webadmin/integration/memory/MemoryAuthorizedEndpointsTest.java | 4 ++--
.../memory/MemoryFastViewProjectionHealthCheckIntegrationTest.java | 4 ++--
.../webadmin/integration/memory/MemoryForwardIntegrationTest.java | 4 ++--
.../webadmin/integration/memory/MemoryJwtFilterIntegrationTest.java | 4 ++--
.../webadmin/integration/memory/MemoryUnauthorizedEndpointsTest.java | 4 ++--
.../integration/memory/MemoryWebAdminServerIntegrationTest.java | 4 ++--
.../memory/vault/MemoryDeletedMessageVaultIntegrationTest.java | 4 ++--
.../vault/MemoryLinshareBlobExportMechanismIntegrationTest.java | 4 ++--
17 files changed, 34 insertions(+), 36 deletions(-)
diff --git
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java
index 05bef4e..d4f6bc7 100644
---
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java
+++
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java
@@ -72,8 +72,8 @@ import org.apache.james.util.Host;
import org.apache.james.util.Port;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.WebAdminGuiceProbe;
-import org.apache.james.webadmin.WebAdminConfiguration;
import org.apache.james.webadmin.WebAdminUtils;
+import org.apache.james.webadmin.integration.WebadminIntergrationTestModule;
import org.apache.james.webadmin.routes.CassandraMailboxMergingRoutes;
import org.apache.james.webadmin.routes.TasksRoutes;
import org.junit.experimental.categories.Category;
@@ -113,8 +113,7 @@ class FixingGhostMailboxTest {
.combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
.overrideWith(binder ->
binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))
- .overrideWith(binder -> binder.bind(WebAdminConfiguration.class)
- .toInstance(WebAdminConfiguration.TEST_CONFIGURATION)))
+ .overrideWith(new WebadminIntergrationTestModule()))
.build();
private AccessToken accessToken;
diff --git
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQAuthorizedEndpointsTest.java
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQAuthorizedEndpointsTest.java
index 8c296cb..7b07885 100644
---
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQAuthorizedEndpointsTest.java
+++
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQAuthorizedEndpointsTest.java
@@ -29,9 +29,9 @@ import org.apache.james.junit.categories.BasicFeature;
import org.apache.james.modules.AwsS3BlobStoreExtension;
import org.apache.james.modules.RabbitMQExtension;
import org.apache.james.modules.TestJMAPServerModule;
-import org.apache.james.webadmin.WebAdminConfiguration;
import org.apache.james.webadmin.integration.AuthorizedEndpointsTest;
import org.apache.james.webadmin.integration.UnauthorizedModule;
+import org.apache.james.webadmin.integration.WebadminIntergrationTestModule;
import org.junit.experimental.categories.Category;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -50,6 +50,6 @@ class RabbitMQAuthorizedEndpointsTest extends
AuthorizedEndpointsTest {
.combineWith(CassandraRabbitMQJamesServerMain.MODULES)
.overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))
.overrideWith(new UnauthorizedModule())
- .overrideWith(binder ->
binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION)))
+ .overrideWith(new WebadminIntergrationTestModule()))
.build();
}
\ No newline at end of file
diff --git
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQForwardIntegrationTest.java
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQForwardIntegrationTest.java
index 04655b9..10a6afb 100644
---
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQForwardIntegrationTest.java
+++
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQForwardIntegrationTest.java
@@ -28,8 +28,8 @@ import org.apache.james.JamesServerExtension;
import org.apache.james.modules.AwsS3BlobStoreExtension;
import org.apache.james.modules.RabbitMQExtension;
import org.apache.james.modules.TestJMAPServerModule;
-import org.apache.james.webadmin.WebAdminConfiguration;
import org.apache.james.webadmin.integration.ForwardIntegrationTest;
+import org.apache.james.webadmin.integration.WebadminIntergrationTestModule;
import org.junit.jupiter.api.extension.RegisterExtension;
class RabbitMQForwardIntegrationTest extends ForwardIntegrationTest {
@@ -45,6 +45,6 @@ class RabbitMQForwardIntegrationTest extends
ForwardIntegrationTest {
.server(configuration ->
GuiceJamesServer.forConfiguration(configuration)
.combineWith(CassandraRabbitMQJamesServerMain.MODULES)
.overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))
- .overrideWith(binder ->
binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION)))
+ .overrideWith(new WebadminIntergrationTestModule()))
.build();
}
diff --git
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJmapExtension.java
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJmapExtension.java
index 1751b99..c5edb92 100644
---
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJmapExtension.java
+++
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJmapExtension.java
@@ -38,8 +38,8 @@ import
org.apache.james.modules.objectstorage.aws.s3.DockerAwsS3TestRule;
import org.apache.james.server.core.configuration.Configuration;
import org.apache.james.util.FunctionalUtils;
import org.apache.james.util.Runnables;
-import org.apache.james.webadmin.WebAdminConfiguration;
import org.apache.james.webadmin.integration.UnauthorizedModule;
+import org.apache.james.webadmin.integration.WebadminIntergrationTestModule;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
@@ -164,7 +164,7 @@ public class RabbitMQJmapExtension implements
BeforeAllCallback, AfterAllCallbac
.overrideWith(elasticSearchRule.getModule())
.overrideWith(dockerAwsS3TestRule.getModule())
.overrideWith(new
TestRabbitMQModule(DockerRabbitMQSingleton.SINGLETON))
- .overrideWith(binder ->
binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION))
+ .overrideWith(new WebadminIntergrationTestModule())
.overrideWith(new UnauthorizedModule())
.overrideWith((binder ->
binder.bind(CleanupTasksPerformer.class).asEagerSingleton()));
}
diff --git
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJwtFilterIntegrationTest.java
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJwtFilterIntegrationTest.java
index 8a4f7b0..8dc787c 100644
---
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJwtFilterIntegrationTest.java
+++
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJwtFilterIntegrationTest.java
@@ -29,10 +29,10 @@ import org.apache.james.jwt.JwtConfiguration;
import org.apache.james.modules.AwsS3BlobStoreExtension;
import org.apache.james.modules.RabbitMQExtension;
import org.apache.james.modules.TestJMAPServerModule;
-import org.apache.james.webadmin.WebAdminConfiguration;
import org.apache.james.webadmin.authentication.AuthenticationFilter;
import org.apache.james.webadmin.authentication.JwtFilter;
import org.apache.james.webadmin.integration.JwtFilterIntegrationTest;
+import org.apache.james.webadmin.integration.WebadminIntergrationTestModule;
import org.junit.jupiter.api.extension.RegisterExtension;
class RabbitMQJwtFilterIntegrationTest extends JwtFilterIntegrationTest {
@@ -50,6 +50,6 @@ class RabbitMQJwtFilterIntegrationTest extends
JwtFilterIntegrationTest {
.overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))
.overrideWith(binder ->
binder.bind(AuthenticationFilter.class).to(JwtFilter.class))
.overrideWith(binder ->
binder.bind(JwtConfiguration.class).toInstance(jwtConfiguration()))
- .overrideWith(binder ->
binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION)))
+ .overrideWith(new WebadminIntergrationTestModule()))
.build();
}
diff --git
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
index 26fbfac..a18ce3a 100644
---
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
+++
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
@@ -50,8 +50,8 @@ import
org.apache.james.modules.objectstorage.PayloadCodecFactory;
import org.apache.james.util.Port;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.WebAdminGuiceProbe;
-import org.apache.james.webadmin.WebAdminConfiguration;
import org.apache.james.webadmin.WebAdminUtils;
+import org.apache.james.webadmin.integration.WebadminIntergrationTestModule;
import org.awaitility.Awaitility;
import org.awaitility.Duration;
import org.awaitility.core.ConditionFactory;
@@ -86,8 +86,7 @@ class RabbitMQReindexingWithEventDeadLettersTest {
.combineWith(CassandraRabbitMQJamesServerMain.MODULES)
.overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))
.overrideWith(JmapJamesServerContract.DOMAIN_LIST_CONFIGURATION_MODULE)
- .overrideWith(binder -> binder.bind(WebAdminConfiguration.class)
- .toInstance(WebAdminConfiguration.TEST_CONFIGURATION));
+ .overrideWith(new WebadminIntergrationTestModule());
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder()
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 4924364..dabfb7b 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
@@ -39,8 +39,8 @@ import org.apache.james.junit.categories.BasicFeature;
import org.apache.james.modules.AwsS3BlobStoreExtension;
import org.apache.james.modules.RabbitMQExtension;
import org.apache.james.modules.TestJMAPServerModule;
-import org.apache.james.webadmin.WebAdminConfiguration;
import org.apache.james.webadmin.integration.WebAdminServerIntegrationTest;
+import org.apache.james.webadmin.integration.WebadminIntergrationTestModule;
import org.apache.james.webadmin.routes.AliasRoutes;
import org.apache.james.webadmin.routes.CassandraMappingsRoutes;
import org.apache.james.webadmin.routes.TasksRoutes;
@@ -68,7 +68,7 @@ class RabbitMQWebAdminServerIntegrationTest extends
WebAdminServerIntegrationTes
.server(configuration ->
GuiceJamesServer.forConfiguration(configuration)
.combineWith(CassandraRabbitMQJamesServerMain.MODULES)
.overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))
- .overrideWith(binder ->
binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION)))
+ .overrideWith(new WebadminIntergrationTestModule()))
.build();
private static final String VERSION = "/cassandra/version";
diff --git
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQDeletedMessageVaultIntegrationTest.java
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQDeletedMessageVaultIntegrationTest.java
index 81f1c16..2a0373e 100644
---
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQDeletedMessageVaultIntegrationTest.java
+++
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQDeletedMessageVaultIntegrationTest.java
@@ -27,7 +27,7 @@ import org.apache.james.DockerCassandraRule;
import org.apache.james.GuiceJamesServer;
import org.apache.james.filesystem.api.FileSystem;
import
org.apache.james.modules.vault.TestDeleteMessageVaultPreDeletionHookModule;
-import org.apache.james.webadmin.WebAdminConfiguration;
+import org.apache.james.webadmin.integration.WebadminIntergrationTestModule;
import
org.apache.james.webadmin.integration.vault.DeletedMessageVaultIntegrationTest;
import org.junit.Rule;
@@ -42,7 +42,7 @@ public class RabbitMQDeletedMessageVaultIntegrationTest
extends DeletedMessageVa
public GuiceJamesServer createJmapServer(FileSystem fileSystem, Clock
clock) throws IOException {
return rule.jmapServer(cassandra.getModule(),
new TestDeleteMessageVaultPreDeletionHookModule(),
- binder ->
binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION),
+ new WebadminIntergrationTestModule(),
binder -> binder.bind(FileSystem.class).toInstance(fileSystem),
binder -> binder.bind(Clock.class).toInstance(clock));
}
diff --git
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQLinshareBlobExportMechanismIntegrationTest.java
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQLinshareBlobExportMechanismIntegrationTest.java
index 4dc3e32..de281a0 100644
---
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQLinshareBlobExportMechanismIntegrationTest.java
+++
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQLinshareBlobExportMechanismIntegrationTest.java
@@ -33,7 +33,7 @@ import org.apache.james.modules.RabbitMQExtension;
import org.apache.james.modules.TestJMAPServerModule;
import org.apache.james.modules.TestRabbitMQModule;
import
org.apache.james.modules.vault.TestDeleteMessageVaultPreDeletionHookModule;
-import org.apache.james.webadmin.WebAdminConfiguration;
+import org.apache.james.webadmin.integration.WebadminIntergrationTestModule;
import
org.apache.james.webadmin.integration.vault.LinshareBlobExportMechanismIntegrationTest;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -53,7 +53,7 @@ class RabbitMQLinshareBlobExportMechanismIntegrationTest
extends LinshareBlobExp
.overrideWith(binder ->
binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule(LIMIT_TO_20_MESSAGES))
.overrideWith(new
TestRabbitMQModule(DockerRabbitMQSingleton.SINGLETON))
- .overrideWith(binder ->
binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION))
+ .overrideWith(new WebadminIntergrationTestModule())
.overrideWith(new TestDeleteMessageVaultPreDeletionHookModule()))
.build();
}
diff --git
a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryAuthorizedEndpointsTest.java
b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryAuthorizedEndpointsTest.java
index f3415b4..7692f45 100644
---
a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryAuthorizedEndpointsTest.java
+++
b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryAuthorizedEndpointsTest.java
@@ -24,9 +24,9 @@ import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.modules.TestJMAPServerModule;
-import org.apache.james.webadmin.WebAdminConfiguration;
import org.apache.james.webadmin.integration.AuthorizedEndpointsTest;
import org.apache.james.webadmin.integration.UnauthorizedModule;
+import org.apache.james.webadmin.integration.WebadminIntergrationTestModule;
import org.junit.jupiter.api.extension.RegisterExtension;
class MemoryAuthorizedEndpointsTest extends AuthorizedEndpointsTest {
@@ -38,7 +38,7 @@ class MemoryAuthorizedEndpointsTest extends
AuthorizedEndpointsTest {
.server(configuration ->
GuiceJamesServer.forConfiguration(configuration)
.combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE)
.overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))
- .overrideWith(binder ->
binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION))
+ .overrideWith(new WebadminIntergrationTestModule())
.overrideWith(new UnauthorizedModule()))
.build();
}
\ No newline at end of file
diff --git
a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryFastViewProjectionHealthCheckIntegrationTest.java
b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryFastViewProjectionHealthCheckIntegrationTest.java
index 82f5d3b..22feb5d 100644
---
a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryFastViewProjectionHealthCheckIntegrationTest.java
+++
b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryFastViewProjectionHealthCheckIntegrationTest.java
@@ -24,8 +24,8 @@ import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.modules.TestJMAPServerModule;
-import org.apache.james.webadmin.WebAdminConfiguration;
import
org.apache.james.webadmin.integration.FastViewProjectionHealthCheckIntegrationContract;
+import org.apache.james.webadmin.integration.WebadminIntergrationTestModule;
import org.junit.jupiter.api.extension.RegisterExtension;
class MemoryFastViewProjectionHealthCheckIntegrationTest extends
FastViewProjectionHealthCheckIntegrationContract {
@@ -36,6 +36,6 @@ class MemoryFastViewProjectionHealthCheckIntegrationTest
extends FastViewProject
.server(configuration ->
GuiceJamesServer.forConfiguration(configuration)
.combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE)
.overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))
- .overrideWith(binder ->
binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION)))
+ .overrideWith(new WebadminIntergrationTestModule()))
.build();
}
\ No newline at end of file
diff --git
a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryForwardIntegrationTest.java
b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryForwardIntegrationTest.java
index 7e4bbf0..180f525 100644
---
a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryForwardIntegrationTest.java
+++
b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryForwardIntegrationTest.java
@@ -24,8 +24,8 @@ import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.modules.TestJMAPServerModule;
-import org.apache.james.webadmin.WebAdminConfiguration;
import org.apache.james.webadmin.integration.ForwardIntegrationTest;
+import org.apache.james.webadmin.integration.WebadminIntergrationTestModule;
import org.junit.jupiter.api.extension.RegisterExtension;
class MemoryForwardIntegrationTest extends ForwardIntegrationTest {
@@ -37,6 +37,6 @@ class MemoryForwardIntegrationTest extends
ForwardIntegrationTest {
.server(configuration ->
GuiceJamesServer.forConfiguration(configuration)
.combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE)
.overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))
- .overrideWith(binder ->
binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION)))
+ .overrideWith(new WebadminIntergrationTestModule()))
.build();
}
diff --git
a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryJwtFilterIntegrationTest.java
b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryJwtFilterIntegrationTest.java
index d2c4c00..98beb9b 100644
---
a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryJwtFilterIntegrationTest.java
+++
b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryJwtFilterIntegrationTest.java
@@ -25,10 +25,10 @@ import org.apache.james.JamesServerExtension;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.jwt.JwtConfiguration;
import org.apache.james.modules.TestJMAPServerModule;
-import org.apache.james.webadmin.WebAdminConfiguration;
import org.apache.james.webadmin.authentication.AuthenticationFilter;
import org.apache.james.webadmin.authentication.JwtFilter;
import org.apache.james.webadmin.integration.JwtFilterIntegrationTest;
+import org.apache.james.webadmin.integration.WebadminIntergrationTestModule;
import org.junit.jupiter.api.extension.RegisterExtension;
class MemoryJwtFilterIntegrationTest extends JwtFilterIntegrationTest {
@@ -40,7 +40,7 @@ class MemoryJwtFilterIntegrationTest extends
JwtFilterIntegrationTest {
.server(configuration ->
GuiceJamesServer.forConfiguration(configuration)
.combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE)
.overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))
- .overrideWith(binder ->
binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION))
+ .overrideWith(new WebadminIntergrationTestModule())
.overrideWith(binder ->
binder.bind(AuthenticationFilter.class).to(JwtFilter.class))
.overrideWith(binder ->
binder.bind(JwtConfiguration.class).toInstance(jwtConfiguration())))
.build();
diff --git
a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUnauthorizedEndpointsTest.java
b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUnauthorizedEndpointsTest.java
index b1262bf..b02df73 100644
---
a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUnauthorizedEndpointsTest.java
+++
b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUnauthorizedEndpointsTest.java
@@ -25,9 +25,9 @@ import org.apache.james.JamesServerExtension;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.modules.TestJMAPServerModule;
import
org.apache.james.modules.vault.TestDeleteMessageVaultPreDeletionHookModule;
-import org.apache.james.webadmin.WebAdminConfiguration;
import org.apache.james.webadmin.integration.UnauthorizedEndpointsTest;
import org.apache.james.webadmin.integration.UnauthorizedModule;
+import org.apache.james.webadmin.integration.WebadminIntergrationTestModule;
import org.junit.jupiter.api.extension.RegisterExtension;
class MemoryUnauthorizedEndpointsTest extends UnauthorizedEndpointsTest {
@@ -41,6 +41,6 @@ class MemoryUnauthorizedEndpointsTest extends
UnauthorizedEndpointsTest {
.overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))
.overrideWith(new TestDeleteMessageVaultPreDeletionHookModule())
.overrideWith(new UnauthorizedModule())
- .overrideWith(binder ->
binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION)))
+ .overrideWith(new WebadminIntergrationTestModule()))
.build();
}
\ No newline at end of file
diff --git
a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryWebAdminServerIntegrationTest.java
b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryWebAdminServerIntegrationTest.java
index 6876e7a..2989f56 100644
---
a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryWebAdminServerIntegrationTest.java
+++
b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryWebAdminServerIntegrationTest.java
@@ -24,8 +24,8 @@ import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.modules.TestJMAPServerModule;
-import org.apache.james.webadmin.WebAdminConfiguration;
import org.apache.james.webadmin.integration.WebAdminServerIntegrationTest;
+import org.apache.james.webadmin.integration.WebadminIntergrationTestModule;
import org.junit.jupiter.api.extension.RegisterExtension;
class MemoryWebAdminServerIntegrationTest extends
WebAdminServerIntegrationTest {
@@ -37,6 +37,6 @@ class MemoryWebAdminServerIntegrationTest extends
WebAdminServerIntegrationTest
.server(configuration ->
GuiceJamesServer.forConfiguration(configuration)
.combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE)
.overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))
- .overrideWith(binder ->
binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION)))
+ .overrideWith(new WebadminIntergrationTestModule()))
.build();
}
\ No newline at end of file
diff --git
a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryDeletedMessageVaultIntegrationTest.java
b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryDeletedMessageVaultIntegrationTest.java
index d722825..4481a12 100644
---
a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryDeletedMessageVaultIntegrationTest.java
+++
b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryDeletedMessageVaultIntegrationTest.java
@@ -26,7 +26,7 @@ import org.apache.james.GuiceJamesServer;
import org.apache.james.MemoryJmapTestRule;
import org.apache.james.filesystem.api.FileSystem;
import
org.apache.james.modules.vault.TestDeleteMessageVaultPreDeletionHookModule;
-import org.apache.james.webadmin.WebAdminConfiguration;
+import org.apache.james.webadmin.integration.WebadminIntergrationTestModule;
import
org.apache.james.webadmin.integration.vault.DeletedMessageVaultIntegrationTest;
import org.junit.Rule;
@@ -39,7 +39,7 @@ public class MemoryDeletedMessageVaultIntegrationTest extends
DeletedMessageVaul
protected GuiceJamesServer createJmapServer(FileSystem fileSystem, Clock
clock) throws IOException {
return memoryJmap.jmapServer(
new TestDeleteMessageVaultPreDeletionHookModule(),
- binder ->
binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION),
+ new WebadminIntergrationTestModule(),
binder -> binder.bind(FileSystem.class).toInstance(fileSystem),
binder -> binder.bind(Clock.class).toInstance(clock));
}
diff --git
a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryLinshareBlobExportMechanismIntegrationTest.java
b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryLinshareBlobExportMechanismIntegrationTest.java
index 77f27f3..959d768 100644
---
a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryLinshareBlobExportMechanismIntegrationTest.java
+++
b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryLinshareBlobExportMechanismIntegrationTest.java
@@ -26,7 +26,7 @@ import org.apache.james.MemoryJamesServerMain;
import org.apache.james.modules.LinshareGuiceExtension;
import org.apache.james.modules.TestJMAPServerModule;
import
org.apache.james.modules.vault.TestDeleteMessageVaultPreDeletionHookModule;
-import org.apache.james.webadmin.WebAdminConfiguration;
+import org.apache.james.webadmin.integration.WebadminIntergrationTestModule;
import
org.apache.james.webadmin.integration.vault.LinshareBlobExportMechanismIntegrationTest;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -43,6 +43,6 @@ class MemoryLinshareBlobExportMechanismIntegrationTest
extends LinshareBlobExpor
.combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE)
.overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))
.overrideWith(new TestDeleteMessageVaultPreDeletionHookModule())
- .overrideWith(binder ->
binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION)))
+ .overrideWith(new WebadminIntergrationTestModule()))
.build();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
