Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Stephane Nicoll 2018-09-07 10:47:20 +02:00
parent 0b07c026af
commit 7d54eda6f1
2 changed files with 54 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationCompatibilityTests.java Normal file
View File

@ -0,0 +1,49 @@
/*
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.autoconfigure.amqp;
import javax.net.ssl.TrustManager;
import com.rabbitmq.client.NullTrustManager;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.junit.runner.classpath.ClassPathOverrides;
import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Compatibility tests for RabbitMQ with amqp-client 4.0.x
*
* @author Stephane Nicoll
*/
@RunWith(ModifiedClassPathRunner.class)
@ClassPathOverrides("com.rabbitmq:amqp-client:4.0.3")
public class RabbitAutoConfigurationCompatibilityTests
extends RabbitAutoConfigurationTests {
@Test
public void enableSslWithValidateServerCertificateFalse() {
load(TestConfiguration.class, "spring.rabbitmq.ssl.enabled:true",
"spring.rabbitmq.ssl.validateServerCertificate=false");
com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory();
TrustManager trustManager = getTrustManager(rabbitConnectionFactory);
assertThat(trustManager).isInstanceOf(NullTrustManager.class);
}
}

11
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
View File

@ -22,6 +22,7 @@ import javax.net.ssl.TrustManager;
import com.rabbitmq.client.Address;
import com.rabbitmq.client.NullTrustManager;
import com.rabbitmq.client.TrustEverythingTrustManager;
import org.aopalliance.aop.Advice;
import org.junit.After;
import org.junit.Rule;
@ -66,8 +67,6 @@ import static org.mockito.Mockito.verify;
*
* @author Greg Turnquist
* @author Stephane Nicoll
* @author Gary Russell
* @author Stephane Nicoll
*/
public class RabbitAutoConfigurationTests {
@ -438,7 +437,7 @@ public class RabbitAutoConfigurationTests {
"spring.rabbitmq.ssl.validateServerCertificate=false");
com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory();
TrustManager trustManager = getTrustManager(rabbitConnectionFactory);
assertThat(trustManager).isInstanceOf(NullTrustManager.class);
assertThat(trustManager).isInstanceOf(TrustEverythingTrustManager.class);
}
@Test
@ -449,7 +448,7 @@ public class RabbitAutoConfigurationTests {
assertThat(trustManager).isNotInstanceOf(NullTrustManager.class);
}
private TrustManager getTrustManager(
protected TrustManager getTrustManager(
com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory) {
Object sslContext = ReflectionTestUtils.getField(rabbitConnectionFactory,
"sslContext");
@ -461,7 +460,7 @@ public class RabbitAutoConfigurationTests {
return (TrustManager) trustManager;
}
private com.rabbitmq.client.ConnectionFactory getTargetConnectionFactory() {
protected com.rabbitmq.client.ConnectionFactory getTargetConnectionFactory() {
CachingConnectionFactory connectionFactory = this.context
.getBean(CachingConnectionFactory.class);
return (com.rabbitmq.client.ConnectionFactory) new DirectFieldAccessor(
@ -475,7 +474,7 @@ public class RabbitAutoConfigurationTests {
return expression.getValue();
}
private void load(Class<?> config, String... environment) {
protected void load(Class<?> config, String... environment) {
load(new Class<?>[] { config }, environment);
}