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
pull/1332/head
Andy Wilkinson 10 years ago
parent cba50b8ee7
commit 32a19f590d

@ -16,7 +16,6 @@
package org.springframework.boot.test;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@ -33,7 +32,6 @@ import static org.junit.Assert.assertNotNull;
*/
@RunWith(SpringJUnit4ClassRunner.class)
@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 {
@Autowired

Loading…
Cancel
Save