From 429da743f57f984f89730884cc2fef0a17f37e90 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 29 Oct 2014 15:44:53 +0100 Subject: [PATCH] Add missing close --- .../amqp/RabbitAutoConfigurationTests.java | 12 ++++++++++-- .../autoconfigure/jms/JmsAutoConfigurationTests.java | 8 ++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java index 1324f122da..bd1cf77667 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java @@ -16,6 +16,7 @@ package org.springframework.boot.autoconfigure.amqp; +import org.junit.After; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -49,11 +50,18 @@ import static org.mockito.Mockito.verify; */ public class RabbitAutoConfigurationTests { - private AnnotationConfigApplicationContext context; - @Rule public ExpectedException thrown = ExpectedException.none(); + private AnnotationConfigApplicationContext context; + + @After + public void close() { + if (this.context != null) { + this.context.close(); + } + } + @Test public void testDefaultRabbitConfiguration() { load(TestConfiguration.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java index c1bcba116a..a8015f03f2 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java @@ -20,6 +20,7 @@ import javax.jms.ConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.pool.PooledConnectionFactory; +import org.junit.After; import org.junit.Test; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; @@ -54,6 +55,13 @@ public class JmsAutoConfigurationTests { private AnnotationConfigApplicationContext context; + @After + public void close() { + if (this.context != null) { + this.context.close(); + } + } + @Test public void testDefaultJmsConfiguration() { load(TestConfiguration.class);