From 1c365662b0474eaf9c392ca653bce1b8d317c595 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 12 Feb 2016 17:39:14 +0000 Subject: [PATCH] Don't leave so many threads lying around in the tests See gh-5141 --- .../embedded/AbstractEmbeddedServletContainerFactoryTests.java | 1 + .../boot/jta/bitronix/PoolingDataSourceBeanTests.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java index 13cfc068cb..b44a79d1b1 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java @@ -170,6 +170,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests { .createAsyncRequest(new URI(getLocalUrl("/hello")), HttpMethod.GET) .executeAsync(); assertThat(response2.get(10, TimeUnit.SECONDS).getRawStatusCode()).isEqualTo(200); + clientHttpRequestFactory.destroy(); } @Test diff --git a/spring-boot/src/test/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBeanTests.java index 7e880f109d..51973e857f 100644 --- a/spring-boot/src/test/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBeanTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBeanTests.java @@ -21,6 +21,7 @@ import java.sql.Connection; import javax.sql.XAConnection; import javax.sql.XADataSource; +import bitronix.tm.TransactionManagerServices; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -72,6 +73,7 @@ public class PoolingDataSourceBeanTests { this.bean.init(); this.bean.createPooledConnection(dataSource, this.bean); verify(dataSource).getXAConnection(); + TransactionManagerServices.getTaskScheduler().shutdown(); } }