root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Restructure tests to exercise deprecated property in a dedicated test 

See gh-17848
This commit is contained in:
Stephane Nicoll 2019-08-24 08:22:28 +02:00
parent 21783faede
commit 7d994e607d
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,41 +199,42 @@ class RabbitAutoConfigurationTests {
}
@Test
void testConnectionFactoryPublisherSettings() {
@Deprecated
void testConnectionFactoryPublisherConfirmTypeUsingDeprecatedProperty() {
this.contextRunner.withUserConfiguration(TestConfiguration.class)
.withPropertyValues("spring.rabbitmq.publisher-confirms=true", "spring.rabbitmq.publisher-returns=true")
.run((context) -> {
.withPropertyValues("spring.rabbitmq.publisher-confirms=true").run((context) -> {
CachingConnectionFactory connectionFactory = context.getBean(CachingConnectionFactory.class);
RabbitTemplate rabbitTemplate = context.getBean(RabbitTemplate.class);
assertThat(connectionFactory.isPublisherConfirms()).isTrue();
assertThat(connectionFactory.isPublisherReturns()).isTrue();
assertThat(getMandatory(rabbitTemplate)).isTrue();
assertThat(connectionFactory.isSimplePublisherConfirms()).isFalse();
});
}
@Test
void testConnectionFactorPublisherSettingsUsingConfirmType() {
void testConnectionFactoryPublisherConfirmTypeCorrelated() {
this.contextRunner.withUserConfiguration(TestConfiguration.class)
.withPropertyValues("spring.rabbitmq.publisher-confirm-type=correlated",
"spring.rabbitmq.publisher-returns=true")
.run((context) -> {
.withPropertyValues("spring.rabbitmq.publisher-confirm-type=correlated").run((context) -> {
CachingConnectionFactory connectionFactory = context.getBean(CachingConnectionFactory.class);
RabbitTemplate rabbitTemplate = context.getBean(RabbitTemplate.class);
assertThat(connectionFactory.isPublisherConfirms()).isTrue();
assertThat(connectionFactory.isPublisherReturns()).isTrue();
assertThat(getMandatory(rabbitTemplate)).isTrue();
assertThat(connectionFactory.isSimplePublisherConfirms()).isFalse();
});
}
@Test
void testConnectionFactorySimplePublisherSettingsUsingConfirmType() {
void testConnectionFactoryPublisherConfirmTypeSimple() {
this.contextRunner.withUserConfiguration(TestConfiguration.class)
.withPropertyValues("spring.rabbitmq.publisher-confirm-type=simple",
"spring.rabbitmq.publisher-returns=true")
.run((context) -> {
.withPropertyValues("spring.rabbitmq.publisher-confirm-type=simple").run((context) -> {
CachingConnectionFactory connectionFactory = context.getBean(CachingConnectionFactory.class);
RabbitTemplate rabbitTemplate = context.getBean(RabbitTemplate.class);
assertThat(connectionFactory.isPublisherConfirms()).isFalse();
assertThat(connectionFactory.isSimplePublisherConfirms()).isTrue();
});
}
@Test
void testConnectionFactoryPublisherReturns() {
this.contextRunner.withUserConfiguration(TestConfiguration.class)
.withPropertyValues("spring.rabbitmq.publisher-returns=true").run((context) -> {
CachingConnectionFactory connectionFactory = context.getBean(CachingConnectionFactory.class);
RabbitTemplate rabbitTemplate = context.getBean(RabbitTemplate.class);
assertThat(connectionFactory.isPublisherReturns()).isTrue();
assertThat(getMandatory(rabbitTemplate)).isTrue();
});