root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

Browse Source
pull/1120/merge
Andy Wilkinson 10 years ago
parent 29b388e6a9 32a19f590d
commit ba2c38c803
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File

2
spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationMixedConfigurationTests.java
Unescape Escape 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

Write Preview
Loading…
Cancel
Save