Skip to content

Commit 5991033

Browse files
committed
Polish "Add configuration for Rabbit's key store and trust store algorithm"
See gh-24076
1 parent 489062b commit 5991033

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ void enableSslWithValidateServerCertificateDefault() throws Exception {
739739
}
740740

741741
@Test
742-
void enableSslWithValidStoreAlgorithmShouldWork() throws Exception {
742+
void enableSslWithValidStoreAlgorithmShouldWork() {
743743
this.contextRunner.withUserConfiguration(TestConfiguration.class)
744744
.withPropertyValues("spring.rabbitmq.ssl.enabled:true",
745745
"spring.rabbitmq.ssl.keyStore=/org/springframework/boot/autoconfigure/amqp/test.jks",
@@ -752,18 +752,29 @@ void enableSslWithValidStoreAlgorithmShouldWork() throws Exception {
752752
}
753753

754754
@Test
755-
void enableSslWithInvalidStoreAlgorithmShouldFail() throws Exception {
755+
void enableSslWithInvalidKeyStoreAlgorithmShouldFail() {
756756
this.contextRunner.withUserConfiguration(TestConfiguration.class)
757757
.withPropertyValues("spring.rabbitmq.ssl.enabled:true",
758758
"spring.rabbitmq.ssl.keyStore=/org/springframework/boot/autoconfigure/amqp/test.jks",
759759
"spring.rabbitmq.ssl.keyStoreType=jks", "spring.rabbitmq.ssl.keyStorePassword=secret",
760-
"spring.rabbitmq.ssl.keyStoreAlgorithm=foo",
760+
"spring.rabbitmq.ssl.keyStoreAlgorithm=test-invalid-algo")
761+
.run((context) -> {
762+
assertThat(context).hasFailed();
763+
assertThat(context).getFailure().hasMessageContaining("test-invalid-algo");
764+
assertThat(context).getFailure().hasRootCauseInstanceOf(NoSuchAlgorithmException.class);
765+
});
766+
}
767+
768+
@Test
769+
void enableSslWithInvalidTrustStoreAlgorithmShouldFail() {
770+
this.contextRunner.withUserConfiguration(TestConfiguration.class)
771+
.withPropertyValues("spring.rabbitmq.ssl.enabled:true",
761772
"spring.rabbitmq.ssl.trustStore=/org/springframework/boot/autoconfigure/amqp/test.jks",
762773
"spring.rabbitmq.ssl.trustStoreType=jks", "spring.rabbitmq.ssl.trustStorePassword=secret",
763-
"spring.rabbitmq.ssl.trustStoreAlgorithm=foo")
774+
"spring.rabbitmq.ssl.trustStoreAlgorithm=test-invalid-algo")
764775
.run((context) -> {
765776
assertThat(context).hasFailed();
766-
assertThat(context).getFailure().hasMessageContaining("foo");
777+
assertThat(context).getFailure().hasMessageContaining("test-invalid-algo");
767778
assertThat(context).getFailure().hasRootCauseInstanceOf(NoSuchAlgorithmException.class);
768779
});
769780
}

0 commit comments

Comments
 (0)