INT-4519: JmsTests Polishing

Author: garyrussell

spring-integration-jms/src/test/java/org/springframework/integration/jms/dsl/JmsTests.java

@@ -32,7 +32,9 @@
 import javax.jms.ConnectionFactory;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.logging.log4j.Level;
 import org.hamcrest.Matchers;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -60,9 +62,11 @@
 import org.springframework.integration.dsl.MessageChannels;
 import org.springframework.integration.dsl.Pollers;
 import org.springframework.integration.endpoint.MethodInvokingMessageSource;
+import org.springframework.integration.jms.ActiveMQMultiContextTests;
 import org.springframework.integration.jms.JmsDestinationPollingSource;
 import org.springframework.integration.scheduling.PollerMetadata;
 import org.springframework.integration.support.MessageBuilder;
+import org.springframework.integration.test.rule.Log4j2LevelAdjuster;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.jms.connection.CachingConnectionFactory;
 import org.springframework.jms.core.JmsTemplate;
@@ -89,7 +93,7 @@
  */
 @RunWith(SpringRunner.class)
 @DirtiesContext
-public class JmsTests {
+public class JmsTests extends ActiveMQMultiContextTests {
 
 	@Autowired
 	private ListableBeanFactory beanFactory;
@@ -120,7 +124,7 @@ public class JmsTests {
 	private TestChannelInterceptor testChannelInterceptor;
 
 	@Autowired
-	private ConnectionFactory jmsConnectionFactory;
+	private ConnectionFactory cachingConnectionFactory;
 
 	@Autowired
 	private PollableChannel jmsPubSubBridgeChannel;
@@ -146,6 +150,10 @@ public class JmsTests {
 	@Autowired
 	private CountDownLatch redeliveryLatch;
 
+	@Rule
+	public final Log4j2LevelAdjuster adjuster = Log4j2LevelAdjuster.forLevel(Level.DEBUG)
+			.categories("org.springframework", "org.springframework.integration", "org.apache");
+
 	@Test
 	public void testPollingFlow() {
 		this.controlBus.send("@'jmsTests.ContextConfiguration.integerMessageSource.inboundChannelAdapter'.start()");
@@ -223,7 +231,7 @@ public void testJmsPipelineFlow() {
 
 	@Test
 	public void testPubSubFlow() {
-		JmsTemplate template = new JmsTemplate(this.jmsConnectionFactory);
+		JmsTemplate template = new JmsTemplate(this.cachingConnectionFactory);
 		template.setPubSubDomain(true);
 		template.setDefaultDestinationName("pubsub");
 		template.convertAndSend("foo");
@@ -241,6 +249,7 @@ public void testJmsRedeliveryFlow() throws InterruptedException {
 		assertTrue(this.redeliveryLatch.await(10, TimeUnit.SECONDS));
 
 		assertNotNull(this.jmsMessageDrivenRedeliveryFlowContainer);
+		this.jmsMessageDrivenRedeliveryFlowContainer.stop();
 	}
 
 	@MessagingGateway(defaultRequestChannel = "controlBus.input")