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

Enable test that relies on class and groovy script configuration 

Since Spring 4.0.4, it's now possible to use both classes and
locations to provide a test's configuration.

Closes #1300
This commit is contained in:
Andy Wilkinson 2014-07-28 15:39:45 +01:00
parent cba50b8ee7
commit 32a19f590d
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationMixedConfigurationTests.java
View File

@ -16,7 +16,6 @@
package org.springframework.boot.test; package org.springframework.boot.test;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -33,7 +32,6 @@ import static org.junit.Assert.assertNotNull;
*/ */
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = Config.class, locations = "classpath:test.groovy") @SpringApplicationConfiguration(classes = Config.class, locations = "classpath:test.groovy")
@Ignore("classes and locations together are not supported in Spring Test (for legacy reasons)")
public class SpringApplicationConfigurationMixedConfigurationTests { public class SpringApplicationConfigurationMixedConfigurationTests {
@Autowired @Autowired