diff --git a/build.gradle b/build.gradle
index 6d88d67462..9b7412c017 100644
--- a/build.gradle
+++ b/build.gradle
@@ -780,12 +780,33 @@ project("spring-test") {
optional("javax.portlet:portlet-api:2.0")
optional("org.eclipse.persistence:javax.persistence:2.0.0")
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
- testCompile("org.hibernate:hibernate-core:3.6.9.Final")
provided("javax.inject:javax.inject:1")
provided("javax.activation:activation:1.1")
provided("javax.servlet:jstl:1.2")
+ optional("org.hamcrest:hamcrest-core:1.3")
+ optional("com.jayway.jsonpath:json-path:0.9.0")
+ optional("xmlunit:xmlunit:1.3")
+ testCompile(project(":spring-context-support"))
+ testCompile(project(":spring-oxm"))
+ testCompile(project(":spring-webmvc-tiles3"))
+ testCompile("org.hibernate:hibernate-core:3.6.9.Final")
testCompile "org.slf4j:slf4j-jcl:${slf4jVersion}"
testCompile("hsqldb:hsqldb:${hsqldbVersion}")
+ testCompile("org.hibernate:hibernate-validator:4.3.0.Final")
+ testCompile("org.codehaus.jackson:jackson-mapper-asl:1.9.12")
+ testCompile("com.fasterxml.jackson.core:jackson-databind:2.2.2")
+ testCompile("com.thoughtworks.xstream:xstream:1.4.4")
+ testCompile("rome:rome:1.0")
+ testCompile("javax.activation:activation:1.1")
+ testCompile("javax.mail:mail:1.4.7")
+ testCompile("org.apache.tiles:tiles-request-api:1.0.1")
+ testCompile("org.apache.tiles:tiles-api:3.0.1")
+ testCompile("org.apache.tiles:tiles-core:3.0.1") {
+ exclude group: "org.slf4j", module: "jcl-over-slf4j"
+ }
+ testCompile("org.apache.tiles:tiles-servlet:3.0.1") {
+ exclude group: "org.slf4j", module: "jcl-over-slf4j"
+ }
}
task testNG(type: Test) {
@@ -808,40 +829,6 @@ project("spring-test") {
}
}
-project("spring-test-mvc") {
- description = "Spring Test MVC Framework"
- merge.into = project(":spring-test")
-
- dependencies {
- optional(project(":spring-context"))
- provided(project(":spring-webmvc"))
- provided(project(":spring-webmvc-tiles3"))
- provided("javax.servlet:javax.servlet-api:3.0.1")
- optional("org.hamcrest:hamcrest-core:1.3")
- optional("com.jayway.jsonpath:json-path:0.9.0")
- optional("xmlunit:xmlunit:1.3")
- testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
- testCompile("javax.servlet:jstl:1.2")
- testCompile("org.hibernate:hibernate-validator:4.3.0.Final")
- testCompile("org.codehaus.jackson:jackson-mapper-asl:1.9.12")
- testCompile("com.fasterxml.jackson.core:jackson-databind:2.2.2")
- testCompile(project(":spring-context-support"))
- testCompile(project(":spring-oxm"))
- testCompile("com.thoughtworks.xstream:xstream:1.4.4")
- testCompile("rome:rome:1.0")
- testCompile("javax.activation:activation:1.1")
- testCompile("javax.mail:mail:1.4.7")
- testCompile("org.apache.tiles:tiles-request-api:1.0.1")
- testCompile("org.apache.tiles:tiles-api:3.0.1")
- testCompile("org.apache.tiles:tiles-core:3.0.1") {
- exclude group: "org.slf4j", module: "jcl-over-slf4j"
- }
- testCompile("org.apache.tiles:tiles-servlet:3.0.1") {
- exclude group: "org.slf4j", module: "jcl-over-slf4j"
- }
- }
-}
-
project("spring-aspects") {
description = "Spring Aspects"
apply from: "aspects.gradle"
diff --git a/settings.gradle b/settings.gradle
index d06a948315..c21e2d0827 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,7 +17,6 @@ include "spring-orm"
include "spring-orm-hibernate4"
include "spring-oxm"
include "spring-test"
-include "spring-test-mvc"
include "spring-tx"
include "spring-web"
include "spring-webmvc"
diff --git a/spring-test-mvc/src/test/resources/log4j.properties b/spring-test-mvc/src/test/resources/log4j.properties
deleted file mode 100644
index d413fa9d76..0000000000
--- a/spring-test-mvc/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-log4j.rootCategory=WARN, stdout
-# log4j.logger.org.springframework.web=INFO
-# log4j.logger.org.springframework.test=INFO
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
\ No newline at end of file
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/util/JsonPathExpectationsHelper.java b/spring-test/src/main/java/org/springframework/test/util/JsonPathExpectationsHelper.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/util/JsonPathExpectationsHelper.java
rename to spring-test/src/main/java/org/springframework/test/util/JsonPathExpectationsHelper.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/util/MatcherAssertionErrors.java b/spring-test/src/main/java/org/springframework/test/util/MatcherAssertionErrors.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/util/MatcherAssertionErrors.java
rename to spring-test/src/main/java/org/springframework/test/util/MatcherAssertionErrors.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java b/spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
rename to spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/util/XpathExpectationsHelper.java b/spring-test/src/main/java/org/springframework/test/util/XpathExpectationsHelper.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/util/XpathExpectationsHelper.java
rename to spring-test/src/main/java/org/springframework/test/util/XpathExpectationsHelper.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java b/spring-test/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java
rename to spring-test/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java b/spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
rename to spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcher.java b/spring-test/src/main/java/org/springframework/test/web/client/RequestMatcher.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcher.java
rename to spring-test/src/main/java/org/springframework/test/web/client/RequestMatcher.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcherClientHttpRequest.java b/spring-test/src/main/java/org/springframework/test/web/client/RequestMatcherClientHttpRequest.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcherClientHttpRequest.java
rename to spring-test/src/main/java/org/springframework/test/web/client/RequestMatcherClientHttpRequest.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/ResponseActions.java b/spring-test/src/main/java/org/springframework/test/web/client/ResponseActions.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/client/ResponseActions.java
rename to spring-test/src/main/java/org/springframework/test/web/client/ResponseActions.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/ResponseCreator.java b/spring-test/src/main/java/org/springframework/test/web/client/ResponseCreator.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/client/ResponseCreator.java
rename to spring-test/src/main/java/org/springframework/test/web/client/ResponseCreator.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java b/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
rename to spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java b/spring-test/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
rename to spring-test/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java b/spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
rename to spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/XpathRequestMatchers.java b/spring-test/src/main/java/org/springframework/test/web/client/match/XpathRequestMatchers.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/client/match/XpathRequestMatchers.java
rename to spring-test/src/main/java/org/springframework/test/web/client/match/XpathRequestMatchers.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/package-info.java b/spring-test/src/main/java/org/springframework/test/web/client/match/package-info.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/client/match/package-info.java
rename to spring-test/src/main/java/org/springframework/test/web/client/match/package-info.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/package-info.java b/spring-test/src/main/java/org/springframework/test/web/client/package-info.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/client/package-info.java
rename to spring-test/src/main/java/org/springframework/test/web/client/package-info.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java b/spring-test/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
rename to spring-test/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java b/spring-test/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java
rename to spring-test/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/package-info.java b/spring-test/src/main/java/org/springframework/test/web/client/response/package-info.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/client/response/package-info.java
rename to spring-test/src/main/java/org/springframework/test/web/client/response/package-info.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java b/spring-test/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvc.java b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvc.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvcBuilder.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilder.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/MockMvcBuilder.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MvcResult.java b/spring-test/src/main/java/org/springframework/test/web/servlet/MvcResult.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MvcResult.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/MvcResult.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultActions.java b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultActions.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultHandler.java b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java b/spring-test/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/package-info.java b/spring-test/src/main/java/org/springframework/test/web/servlet/package-info.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/package-info.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/package-info.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/RequestPostProcessor.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/RequestPostProcessor.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/RequestPostProcessor.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/request/RequestPostProcessor.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/package-info.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/package-info.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/package-info.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/request/package-info.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultHandlers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultHandlers.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultHandlers.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultHandlers.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/package-info.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/package-info.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/package-info.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/result/package-info.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/package-info.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/package-info.java
similarity index 100%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/package-info.java
rename to spring-test/src/main/java/org/springframework/test/web/servlet/setup/package-info.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/util/JsonPathExpectationsHelperTests.java b/spring-test/src/test/java/org/springframework/test/util/JsonPathExpectationsHelperTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/util/JsonPathExpectationsHelperTests.java
rename to spring-test/src/test/java/org/springframework/test/util/JsonPathExpectationsHelperTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/Person.java b/spring-test/src/test/java/org/springframework/test/web/Person.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/Person.java
rename to spring-test/src/test/java/org/springframework/test/web/Person.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/client/MockClientHttpRequestFactoryTests.java b/spring-test/src/test/java/org/springframework/test/web/client/MockClientHttpRequestFactoryTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/client/MockClientHttpRequestFactoryTests.java
rename to spring-test/src/test/java/org/springframework/test/web/client/MockClientHttpRequestFactoryTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java
rename to spring-test/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/JsonPathRequestMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/client/match/JsonPathRequestMatchersTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/client/match/JsonPathRequestMatchersTests.java
rename to spring-test/src/test/java/org/springframework/test/web/client/match/JsonPathRequestMatchersTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java
rename to spring-test/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/XpathRequestMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/client/match/XpathRequestMatchersTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/client/match/XpathRequestMatchersTests.java
rename to spring-test/src/test/java/org/springframework/test/web/client/match/XpathRequestMatchersTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/client/response/ResponseCreatorsTests.java b/spring-test/src/test/java/org/springframework/test/web/client/response/ResponseCreatorsTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/client/response/ResponseCreatorsTests.java
rename to spring-test/src/test/java/org/springframework/test/web/client/response/ResponseCreatorsTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/MockMvcClientHttpRequestFactoryTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/MockMvcClientHttpRequestFactoryTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/MockMvcClientHttpRequestFactoryTests.java
rename to spring-test/src/test/java/org/springframework/test/web/client/samples/MockMvcClientHttpRequestFactoryTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/SampleTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/SampleTests.java
rename to spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/ContentRequestMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/ContentRequestMatcherTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/ContentRequestMatcherTests.java
rename to spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/ContentRequestMatcherTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/HeaderRequestMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/HeaderRequestMatcherTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/HeaderRequestMatcherTests.java
rename to spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/HeaderRequestMatcherTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java
rename to spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatcherTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatcherTests.java
rename to spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatcherTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatcherTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatcherTests.java
rename to spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatcherTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/Spr10025Tests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/Spr10025Tests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/Spr10025Tests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/Spr10025Tests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/Spr10093Tests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/Spr10093Tests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/Spr10093Tests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/Spr10093Tests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java b/spring-test/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilderTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilderTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilderTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ContentResultMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/ContentResultMatchersTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ContentResultMatchersTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/result/ContentResultMatchersTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchersTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchersTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchersTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/JsonPathResultMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/JsonPathResultMatchersTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/JsonPathResultMatchersTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/result/JsonPathResultMatchersTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/MockMvcResultMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/MockMvcResultMatchersTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/MockMvcResultMatchersTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/result/MockMvcResultMatchersTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ModelResultMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/ModelResultMatchersTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ModelResultMatchersTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/result/ModelResultMatchersTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/XpathResultMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/XpathResultMatchersTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/XpathResultMatchersTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/result/XpathResultMatchersTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/PersonController.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonController.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/PersonController.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonController.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/PersonDao.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonDao.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/PersonDao.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonDao.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/WebAppResourceTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/WebAppResourceTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/WebAppResourceTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/WebAppResourceTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ExceptionHandlerTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ExceptionHandlerTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ExceptionHandlerTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ExceptionHandlerTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ViewResolutionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ViewResolutionTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ViewResolutionTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ViewResolutionTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/CookieAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/CookieAssertionTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/CookieAssertionTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/CookieAssertionTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HandlerAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HandlerAssertionTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HandlerAssertionTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HandlerAssertionTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/StatusAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/StatusAssertionTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/StatusAssertionTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/StatusAssertionTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/UrlAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/UrlAssertionTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/UrlAssertionTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/UrlAssertionTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ViewNameAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ViewNameAssertionTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ViewNameAssertionTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ViewNameAssertionTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XmlContentAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XmlContentAssertionTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XmlContentAssertionTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XmlContentAssertionTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilderTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilderTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilderTests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/Spr10277Tests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/Spr10277Tests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/Spr10277Tests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/setup/Spr10277Tests.java
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
similarity index 100%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
rename to spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
diff --git a/spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/layouts/standardLayout.jsp b/spring-test/src/test/resources/META-INF/web-resources/WEB-INF/layouts/standardLayout.jsp
similarity index 100%
rename from spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/layouts/standardLayout.jsp
rename to spring-test/src/test/resources/META-INF/web-resources/WEB-INF/layouts/standardLayout.jsp
diff --git a/spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/layouts/tiles.xml b/spring-test/src/test/resources/META-INF/web-resources/WEB-INF/layouts/tiles.xml
similarity index 100%
rename from spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/layouts/tiles.xml
rename to spring-test/src/test/resources/META-INF/web-resources/WEB-INF/layouts/tiles.xml
diff --git a/spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/views/home.jsp b/spring-test/src/test/resources/META-INF/web-resources/WEB-INF/views/home.jsp
similarity index 100%
rename from spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/views/home.jsp
rename to spring-test/src/test/resources/META-INF/web-resources/WEB-INF/views/home.jsp
diff --git a/spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/views/tiles.xml b/spring-test/src/test/resources/META-INF/web-resources/WEB-INF/views/tiles.xml
similarity index 100%
rename from spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/views/tiles.xml
rename to spring-test/src/test/resources/META-INF/web-resources/WEB-INF/views/tiles.xml
diff --git a/spring-test-mvc/src/test/resources/META-INF/web-resources/resources/Spring.js b/spring-test/src/test/resources/META-INF/web-resources/resources/Spring.js
similarity index 100%
rename from spring-test-mvc/src/test/resources/META-INF/web-resources/resources/Spring.js
rename to spring-test/src/test/resources/META-INF/web-resources/resources/Spring.js
diff --git a/spring-test-mvc/src/test/resources/org/springframework/test/web/client/samples/ludwig.json b/spring-test/src/test/resources/org/springframework/test/web/client/samples/ludwig.json
similarity index 100%
rename from spring-test-mvc/src/test/resources/org/springframework/test/web/client/samples/ludwig.json
rename to spring-test/src/test/resources/org/springframework/test/web/client/samples/ludwig.json
diff --git a/spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/root-context.xml b/spring-test/src/test/resources/org/springframework/test/web/servlet/samples/context/root-context.xml
similarity index 100%
rename from spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/root-context.xml
rename to spring-test/src/test/resources/org/springframework/test/web/servlet/samples/context/root-context.xml
diff --git a/spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/security.xml b/spring-test/src/test/resources/org/springframework/test/web/servlet/samples/context/security.xml
similarity index 100%
rename from spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/security.xml
rename to spring-test/src/test/resources/org/springframework/test/web/servlet/samples/context/security.xml
diff --git a/spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/servlet-context.xml b/spring-test/src/test/resources/org/springframework/test/web/servlet/samples/context/servlet-context.xml
similarity index 100%
rename from spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/servlet-context.xml
rename to spring-test/src/test/resources/org/springframework/test/web/servlet/samples/context/servlet-context.xml
diff --git a/spring-test-mvc/src/test/webapp/WEB-INF/layouts/main.jsp b/spring-test/src/test/webapp/WEB-INF/layouts/main.jsp
similarity index 100%
rename from spring-test-mvc/src/test/webapp/WEB-INF/layouts/main.jsp
rename to spring-test/src/test/webapp/WEB-INF/layouts/main.jsp
diff --git a/spring-test-mvc/src/test/webapp/WEB-INF/layouts/tiles.xml b/spring-test/src/test/webapp/WEB-INF/layouts/tiles.xml
similarity index 100%
rename from spring-test-mvc/src/test/webapp/WEB-INF/layouts/tiles.xml
rename to spring-test/src/test/webapp/WEB-INF/layouts/tiles.xml
diff --git a/spring-test-mvc/src/test/webapp/WEB-INF/readme.txt b/spring-test/src/test/webapp/WEB-INF/readme.txt
similarity index 100%
rename from spring-test-mvc/src/test/webapp/WEB-INF/readme.txt
rename to spring-test/src/test/webapp/WEB-INF/readme.txt
diff --git a/spring-test-mvc/src/test/webapp/WEB-INF/views/tiles.xml b/spring-test/src/test/webapp/WEB-INF/views/tiles.xml
similarity index 100%
rename from spring-test-mvc/src/test/webapp/WEB-INF/views/tiles.xml
rename to spring-test/src/test/webapp/WEB-INF/views/tiles.xml
diff --git a/spring-test-mvc/src/test/webapp/resources/Spring.js b/spring-test/src/test/webapp/resources/Spring.js
similarity index 100%
rename from spring-test-mvc/src/test/webapp/resources/Spring.js
rename to spring-test/src/test/webapp/resources/Spring.js
diff --git a/src/asciidoc/index.adoc b/src/asciidoc/index.adoc
index 38cf524407..4de1b7d4c6 100644
--- a/src/asciidoc/index.adoc
+++ b/src/asciidoc/index.adoc
@@ -14307,7 +14307,7 @@ Registered filters will be invoked through `MockFilterChain` from `spring-test`
[[spring-mvc-test-server-resources]]
====== Further Server-Side Test Examples
-The framework's own tests include https://github.com/SpringSource/spring-framework/tree/master/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples[many sample tests] intended to demonstrate how to use Spring MVC Test. Browse these examples for further ideas. Also the https://github.com/SpringSource/spring-mvc-showcase[spring-mvc-showcase] has full test coverage based on Spring MVC Test.
+The framework's own tests include https://github.com/SpringSource/spring-framework/tree/master/spring-test/src/test/java/org/springframework/test/web/servlet/samples[many sample tests] intended to demonstrate how to use Spring MVC Test. Browse these examples for further ideas. Also the https://github.com/SpringSource/spring-mvc-showcase[spring-mvc-showcase] has full test coverage based on Spring MVC Test.
[[spring-mvc-test-client]]
===== Client-Side REST Tests
@@ -14336,7 +14336,7 @@ Just like with server-side tests, the fluent API for client-side tests requires
[[spring-mvc-test-client-resources]]
====== Further Examples of Client-side REST Tests
-Spring MVC Test's own tests include https://github.com/SpringSource/spring-framework/tree/master/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples[example tests] of client-side REST tests.
+Spring MVC Test's own tests include https://github.com/SpringSource/spring-framework/tree/master/spring-test/src/test/java/org/springframework/test/web/client/samples[example tests] of client-side REST tests.
[[testing-examples-petclinic]]
==== PetClinic Example
@@ -37196,4 +37196,4 @@ Renders an HTML 'textarea'.
| false
| true
| HTML Standard Attribute
-|===
\ No newline at end of file
+|===
diff --git a/src/reference/docbook/testing.xml b/src/reference/docbook/testing.xml
index 631b86bf65..8b7915dfd8 100644
--- a/src/reference/docbook/testing.xml
+++ b/src/reference/docbook/testing.xml
@@ -3583,7 +3583,7 @@ mockMvc.perform(get("/handle").accept(MediaType.APPLICATION_XML))
Further Server-Side Test ExamplesThe framework's own tests include many
+ xl:href="https://github.com/SpringSource/spring-framework/tree/master/spring-test/src/test/java/org/springframework/test/web/servlet/samples">many
sample tests intended to demonstrate how to use Spring MVC
Test. Browse these examples for further ideas. Also the spring-mvc-showcase
@@ -3641,7 +3641,7 @@ mockServer.verify();
Further Examples of Client-side REST TestsSpring MVC Test's own tests include example
+ xl:href="https://github.com/SpringSource/spring-framework/tree/master/spring-test/src/test/java/org/springframework/test/web/client/samples">example
tests of client-side REST tests.