Browse Source

Merge branch '3.1.x'

Closes gh-38752
pull/38842/head
Moritz Halbritter 2 years ago
parent
commit
01f59608ac
  1. 4
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java

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

@ -61,6 +61,7 @@ import org.springframework.amqp.support.converter.MessageConverter; @@ -61,6 +61,7 @@ import org.springframework.amqp.support.converter.MessageConverter;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
import org.springframework.boot.test.context.FilteredClassLoader;
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.test.system.CapturedOutput;
@ -109,7 +110,8 @@ import static org.mockito.Mockito.mock; @@ -109,7 +110,8 @@ import static org.mockito.Mockito.mock;
class RabbitAutoConfigurationTests {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(RabbitAutoConfiguration.class, SslAutoConfiguration.class));
.withConfiguration(AutoConfigurations.of(RabbitAutoConfiguration.class, SslAutoConfiguration.class))
.withClassLoader(new FilteredClassLoader("org.springframework.rabbit.stream")); // gh-38750
@Test
void testDefaultRabbitConfiguration() {

Loading…
Cancel
Save