root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Ensure that new JPA-based test doesn’t accidentally enable Bitronix

This commit is contained in:
Andy Wilkinson 2015-10-05 14:07:01 +01:00
parent d01236db30
commit a4eec42813
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
View File

@ -17,11 +17,13 @@
package org.springframework.boot.autoconfigure.flyway; package org.springframework.boot.autoconfigure.flyway;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.HashMap;
import java.util.Map;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.flywaydb.core.Flyway; import org.flywaydb.core.Flyway;
import org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
@ -229,9 +231,11 @@ public class FlywayAutoConfigurationTests {
@Bean @Bean
public LocalContainerEntityManagerFactoryBean entityManagerFactoryBean() { public LocalContainerEntityManagerFactoryBean entityManagerFactoryBean() {
Map<String, Object> properties = new HashMap<String, Object>();
properties.put("configured", "manually");
properties.put("hibernate.transaction.jta.platform", NoJtaPlatform.INSTANCE);
return new EntityManagerFactoryBuilder(new HibernateJpaVendorAdapter(), return new EntityManagerFactoryBuilder(new HibernateJpaVendorAdapter(),
Collections.<String, Object>emptyMap(), null).dataSource( properties, null).dataSource(this.dataSource).build();
this.dataSource).build();
} }
} }