Skip to content

Commit 32a19f5

Browse files
committed
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
1 parent cba50b8 commit 32a19f5

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationMixedConfigurationTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package org.springframework.boot.test;
1818

19-
import org.junit.Ignore;
2019
import org.junit.Test;
2120
import org.junit.runner.RunWith;
2221
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +32,6 @@
3332
*/
3433
@RunWith(SpringJUnit4ClassRunner.class)
3534
@SpringApplicationConfiguration(classes = Config.class, locations = "classpath:test.groovy")
36-
@Ignore("classes and locations together are not supported in Spring Test (for legacy reasons)")
3735
public class SpringApplicationConfigurationMixedConfigurationTests {
3836

3937
@Autowired

0 commit comments

Comments
 (0)