From 4f67a2021435da0d84755865c06049194bec3bf3 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 10 Nov 2014 18:43:46 -0800 Subject: [PATCH] Ensure JpaUserDetailsTests closes embedded DB Fixes gh-1712 --- .../autoconfigure/security/jpa/JpaUserDetailsTests.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java index 76d923ce34..6c2aa8fb5b 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java @@ -21,12 +21,14 @@ import org.junit.runner.RunWith; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration; import org.springframework.boot.autoconfigure.security.user.SecurityConfig; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** @@ -39,6 +41,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration(classes = JpaUserDetailsTests.Main.class) +@DirtiesContext public class JpaUserDetailsTests { @Test @@ -49,7 +52,8 @@ public class JpaUserDetailsTests { SpringApplication.run(Main.class, args); } - @Import({ DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class, + @Import({ EmbeddedDataSourceConfiguration.class, DataSourceAutoConfiguration.class, + HibernateJpaAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, SecurityAutoConfiguration.class }) @ComponentScan(basePackageClasses = SecurityConfig.class) public static class Main {