Merge branch '3.3.x'

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java

@@ -44,6 +44,7 @@ import org.springframework.jms.config.JmsListenerConfigUtils;
 import org.springframework.jms.config.JmsListenerContainerFactory;
 import org.springframework.jms.config.JmsListenerEndpoint;
 import org.springframework.jms.config.SimpleJmsListenerContainerFactory;
+import org.springframework.jms.config.SimpleJmsListenerEndpoint;
 import org.springframework.jms.connection.CachingConnectionFactory;
 import org.springframework.jms.core.JmsMessagingTemplate;
 import org.springframework.jms.core.JmsTemplate;
@@ -72,20 +73,18 @@ class JmsAutoConfigurationTests {
 
 	@Test
 	void testDefaultJmsConfiguration() {
-		this.contextRunner.withUserConfiguration(TestConfiguration.class).run(this::testDefaultJmsConfiguration);
+		this.contextRunner.withUserConfiguration(TestConfiguration.class).run((context) -> {
-	}
+			assertThat(context).hasSingleBean(ConnectionFactory.class);
-
+			assertThat(context).hasSingleBean(CachingConnectionFactory.class);
-	private void testDefaultJmsConfiguration(AssertableApplicationContext loaded) {
+			CachingConnectionFactory factory = context.getBean(CachingConnectionFactory.class);
-		assertThat(loaded).hasSingleBean(ConnectionFactory.class);
+			assertThat(factory.getTargetConnectionFactory()).isInstanceOf(ActiveMQConnectionFactory.class);
-		assertThat(loaded).hasSingleBean(CachingConnectionFactory.class);
+			JmsTemplate jmsTemplate = context.getBean(JmsTemplate.class);
-		CachingConnectionFactory factory = loaded.getBean(CachingConnectionFactory.class);
+			JmsMessagingTemplate messagingTemplate = context.getBean(JmsMessagingTemplate.class);
-		assertThat(factory.getTargetConnectionFactory()).isInstanceOf(ActiveMQConnectionFactory.class);
+			assertThat(factory).isEqualTo(jmsTemplate.getConnectionFactory());
-		JmsTemplate jmsTemplate = loaded.getBean(JmsTemplate.class);
+			assertThat(messagingTemplate.getJmsTemplate()).isEqualTo(jmsTemplate);
-		JmsMessagingTemplate messagingTemplate = loaded.getBean(JmsMessagingTemplate.class);
+			assertThat(getBrokerUrl(factory)).startsWith("vm://");
-		assertThat(factory).isEqualTo(jmsTemplate.getConnectionFactory());
+			assertThat(context.containsBean("jmsListenerContainerFactory")).isTrue();
-		assertThat(messagingTemplate.getJmsTemplate()).isEqualTo(jmsTemplate);
+		});
-		assertThat(getBrokerUrl(factory)).startsWith("vm://");
-		assertThat(loaded.containsBean("jmsListenerContainerFactory")).isTrue();
 	}
 
 	@Test
@@ -124,6 +123,30 @@ class JmsAutoConfigurationTests {
 		assertThat(messagingTemplate.getJmsTemplate()).isEqualTo(jmsTemplate);
 	}
 
+	@Test
+	void testDefaultJmsListenerConfiguration() {
+		this.contextRunner.withUserConfiguration(TestConfiguration.class).run((loaded) -> {
+			assertThat(loaded).hasSingleBean(CachingConnectionFactory.class);
+			CachingConnectionFactory connectionFactory = loaded.getBean(CachingConnectionFactory.class);
+			assertThat(loaded).hasSingleBean(DefaultJmsListenerContainerFactory.class);
+			DefaultJmsListenerContainerFactory containerFactory = loaded
+				.getBean(DefaultJmsListenerContainerFactory.class);
+			SimpleJmsListenerEndpoint jmsListenerEndpoint = new SimpleJmsListenerEndpoint();
+			jmsListenerEndpoint.setMessageListener((message) -> {
+			});
+			DefaultMessageListenerContainer container = containerFactory.createListenerContainer(jmsListenerEndpoint);
+			assertThat(container.getClientId()).isNull();
+			assertThat(container.getConcurrentConsumers()).isEqualTo(1);
+			assertThat(container.getConnectionFactory()).isSameAs(connectionFactory);
+			assertThat(container.getMaxConcurrentConsumers()).isEqualTo(1);
+			assertThat(container.getSessionAcknowledgeMode()).isEqualTo(Session.AUTO_ACKNOWLEDGE);
+			assertThat(container.isAutoStartup()).isTrue();
+			assertThat(container.isPubSubDomain()).isFalse();
+			assertThat(container.isSubscriptionDurable()).isFalse();
+			assertThat(container).hasFieldOrPropertyWithValue("receiveTimeout", 1000L);
+		});
+	}
+
 	@Test
 	void testEnableJmsCreateDefaultContainerFactory() {
 		this.contextRunner.withUserConfiguration(EnableJmsConfiguration.class)