From a436a57503a8bebc19cede5560e24ba37dba24e6 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sat, 8 Dec 2012 14:26:47 +0100 Subject: [PATCH] Move tests to spring-test module When Spr9799XmlConfigTests and Spr9799AnnotationConfigTests were created, there were issues with the classpath related to slf4j dependencies that made it impossible for these classes to reside in the spring-test module. Consequently, these tests were added to the spring-test-mvc module. However, the issues with slf4j have since been resolved in the Gradle build, and this commit therefore moves these test classes to the spring-test module where they belong. Issue: SPR-9799 --- .../junit4/spr9799/Spr9799AnnotationConfigTests.java | 6 +----- .../test/context/junit4/spr9799/Spr9799XmlConfigTests.java | 6 +----- .../junit4/spr9799/Spr9799XmlConfigTests-context.xml | 0 3 files changed, 2 insertions(+), 10 deletions(-) rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799AnnotationConfigTests.java (89%) rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests.java (86%) rename {spring-test-mvc => spring-test}/src/test/resources/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests-context.xml (100%) diff --git a/spring-test-mvc/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799AnnotationConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799AnnotationConfigTests.java similarity index 89% rename from spring-test-mvc/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799AnnotationConfigTests.java rename to spring-test/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799AnnotationConfigTests.java index b21c65469a..647b0960ee 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799AnnotationConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799AnnotationConfigTests.java @@ -27,11 +27,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; /** * Integration tests used to assess claims raised in * SPR-9799. - * - *

Note: this test class would normally reside in the {@code spring-test} source - * tree; however, due to classpath issues with slf4j, this class must reside in - * the {@code spring-test-mvc} source tree. - * + * * @author Sam Brannen * @since 3.2 * @see Spr9799XmlConfigTests diff --git a/spring-test-mvc/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests.java similarity index 86% rename from spring-test-mvc/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests.java rename to spring-test/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests.java index 0b0245366b..4e93b67ce5 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests.java @@ -24,11 +24,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * Integration tests used to assess claims raised in * SPR-9799. - * - *

Note: this test class would normally reside in the {@code spring-test} source - * tree; however, due to classpath issues with slf4j, this class must reside in - * the {@code spring-test-mvc} source tree. - * + * * @author Sam Brannen * @since 3.2 * @see Spr9799AnnotationConfigTests diff --git a/spring-test-mvc/src/test/resources/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests-context.xml similarity index 100% rename from spring-test-mvc/src/test/resources/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests-context.xml