From 32a19f590ddef011d020823df926d9dac3d123c3 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 28 Jul 2014 15:39:45 +0100 Subject: [PATCH] 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 --- .../SpringApplicationConfigurationMixedConfigurationTests.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationMixedConfigurationTests.java b/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationMixedConfigurationTests.java index decdfc72f0..5cc6aeb8de 100644 --- a/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationMixedConfigurationTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationMixedConfigurationTests.java @@ -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