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

Attempt to fix test failures on CI 

This commit is an attempt to fix the build failures with the HornetQ
tests and relates to #1034
This commit is contained in:
Stephane Nicoll 2014-06-05 11:14:42 +02:00
parent 49697c7ad7
commit 36e0d44eb2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerDirectMockMvcTests.java
View File

@ -21,6 +21,7 @@ import org.junit.Test;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.jms.hornetq.HornetQAutoConfiguration;
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration; import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
@ -86,14 +87,16 @@ public class BasicErrorControllerDirectMockMvcTests {
@Configuration @Configuration
@EnableAutoConfiguration(exclude = { SecurityAutoConfiguration.class, @EnableAutoConfiguration(exclude = { SecurityAutoConfiguration.class,
HibernateJpaAutoConfiguration.class, DataSourceAutoConfiguration.class }) HibernateJpaAutoConfiguration.class, DataSourceAutoConfiguration.class,
HornetQAutoConfiguration.class})
protected static class ParentConfiguration { protected static class ParentConfiguration {
} }
@Configuration @Configuration
@EnableAutoConfiguration(exclude = { SecurityAutoConfiguration.class, @EnableAutoConfiguration(exclude = { SecurityAutoConfiguration.class,
HibernateJpaAutoConfiguration.class, DataSourceAutoConfiguration.class }) HibernateJpaAutoConfiguration.class, DataSourceAutoConfiguration.class,
HornetQAutoConfiguration.class})
@EnableWebMvc @EnableWebMvc
protected static class WebMvcIncludedConfiguration { protected static class WebMvcIncludedConfiguration {
// For manual testing // For manual testing
@ -105,7 +108,8 @@ public class BasicErrorControllerDirectMockMvcTests {
@Configuration @Configuration
@EnableAutoConfiguration(exclude = { SecurityAutoConfiguration.class, @EnableAutoConfiguration(exclude = { SecurityAutoConfiguration.class,
HibernateJpaAutoConfiguration.class, DataSourceAutoConfiguration.class }) HibernateJpaAutoConfiguration.class, DataSourceAutoConfiguration.class,
HornetQAutoConfiguration.class})
protected static class VanillaConfiguration { protected static class VanillaConfiguration {
// For manual testingm // For manual testingm
public static void main(String[] args) { public static void main(String[] args) {
@ -116,7 +120,8 @@ public class BasicErrorControllerDirectMockMvcTests {
@Configuration @Configuration
@EnableAutoConfiguration(exclude = { SecurityAutoConfiguration.class, @EnableAutoConfiguration(exclude = { SecurityAutoConfiguration.class,
HibernateJpaAutoConfiguration.class, DataSourceAutoConfiguration.class }) HibernateJpaAutoConfiguration.class, DataSourceAutoConfiguration.class,
HornetQAutoConfiguration.class})
protected static class ChildConfiguration { protected static class ChildConfiguration {
// For manual testing // For manual testing
public static void main(String[] args) { public static void main(String[] args) {