From 7d994e607d33f9b53c9d7f6d3ee71b77ed7b4dfb Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 24 Aug 2019 08:22:28 +0200 Subject: [PATCH] Restructure tests to exercise deprecated property in a dedicated test See gh-17848 --- .../amqp/RabbitAutoConfigurationTests.java | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java index 874219d115..bfe14c13bc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java @@ -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(); });