You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/03/03 07:07:19 UTC
[james-project] 11/23: JAMES-3502, refactor, add more tests
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 bda99c2dbc983ebdc91aa03746090cab3758fa58
Author: andreasvaldma <andreas.valdmanortal.com>
AuthorDate: Thu Feb 25 08:16:25 2021 +0200
JAMES-3502, refactor, add more tests
---
.../rabbitmq/RabbitMQConfigurationTest.java | 52 +++++++++++++++++++++-
1 file changed, 51 insertions(+), 1 deletion(-)
diff --git a/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQConfigurationTest.java b/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQConfigurationTest.java
index 0d0535e..150f003 100644
--- a/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQConfigurationTest.java
+++ b/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQConfigurationTest.java
@@ -29,6 +29,7 @@ import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Arrays;
+import java.util.Optional;
import org.apache.commons.configuration2.PropertiesConfiguration;
import org.junit.jupiter.api.Nested;
@@ -337,6 +338,55 @@ class RabbitMQConfigurationTest {
.isEqualTo(shutdownTimeout);
}
+ @Test
+ void sslConfigurationShouldHaveDefaultWhenNotSpecifiedOtherwise() throws URISyntaxException {
+ RabbitMQConfiguration rabbitMQConfiguration = RabbitMQConfiguration.builder()
+ .amqpUri(new URI("amqp://james:james@rabbitmq_host:5672"))
+ .managementUri(new URI("http://james:james@rabbitmq_host:15672/api/"))
+ .managementCredentials(DEFAULT_MANAGEMENT_CREDENTIAL)
+ .build();
+
+ assertThat(rabbitMQConfiguration.getSslConfiguration().getHostNameVerifier())
+ .isEqualTo(RabbitMQConfiguration.SSLConfiguration.HostNameVerifier.DEFAULT);
+
+ assertThat(rabbitMQConfiguration.getSslConfiguration().getStrategy())
+ .isEqualTo(RabbitMQConfiguration.SSLConfiguration.SSLValidationStrategy.DEFAULT);
+
+ assertThat(rabbitMQConfiguration.getSslConfiguration().getTrustStore())
+ .isEmpty();
+
+ assertThat(rabbitMQConfiguration.getSslConfiguration().getKeyStore())
+ .isEmpty();
+ }
+
+ @Test
+ void sslConfigurationShouldHaveCustomValuesIfUseInConfiguration() throws URISyntaxException {
+ RabbitMQConfiguration rabbitMQConfiguration = RabbitMQConfiguration.builder()
+ .amqpUri(new URI("amqp://james:james@rabbitmq_host:5672"))
+ .managementUri(new URI("http://james:james@rabbitmq_host:15672/api/"))
+ .managementCredentials(DEFAULT_MANAGEMENT_CREDENTIAL)
+ .sslConfiguration(
+ RabbitMQConfiguration.SSLConfiguration.builder()
+ .strategyOverride(RabbitMQConfiguration.SSLConfiguration.SSLTrustStore.of("src/test/resources/test-truststore-password-password", "password"))
+ .acceptAnyHostNameVerifier()
+ .sslKeyStore(Optional.of(RabbitMQConfiguration.SSLConfiguration.SSLKeyStore.of("src/test/resources/test-keystore-password-password", "password")))
+ .build()
+ )
+ .build();
+
+ assertThat(rabbitMQConfiguration.getSslConfiguration().getHostNameVerifier())
+ .isEqualTo(RabbitMQConfiguration.SSLConfiguration.HostNameVerifier.ACCEPT_ANY_HOSTNAME);
+
+ assertThat(rabbitMQConfiguration.getSslConfiguration().getStrategy())
+ .isEqualTo(RabbitMQConfiguration.SSLConfiguration.SSLValidationStrategy.OVERRIDE);
+
+ assertThat(rabbitMQConfiguration.getSslConfiguration().getTrustStore())
+ .isNotEmpty();
+
+ assertThat(rabbitMQConfiguration.getSslConfiguration().getKeyStore())
+ .isNotEmpty();
+ }
+
@Nested
class ManagementCredentialsTest {
@Test
@@ -439,7 +489,7 @@ class RabbitMQConfigurationTest {
}
@Nested
- class SSLTrustStore {
+ class SSLTrustStoreTest {
@Test
void ofShouldThrowExceptionWhenFilePathNotSupplied() {
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org