Skip to content

S
spring-boot
Commit ba2c38c8 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.1.x'

parents 29b388e6 32a19f59
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationMixedConfigurationTests.java
View file @ ba2c38c8
...@@ -16,7 +16,6 @@ ...@@ -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; ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment