Fold spring-test-mvc sources into spring-test

With spring-test compiling against Servlet 3.0 it is no longer required to compile Spring MVC Test sources separately (from spring-test).
12 years ago · 2e57cf8bfc
137 changed files with 27 additions and 48 deletions
--- a/build.gradle
+++ b/build.gradle
@ -780,12 +780,33 @@ project("spring-test") {
				@@ -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") {
				@@ -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"
--- a/settings.gradle
+++ b/settings.gradle
@ -17,7 +17,6 @@ include "spring-orm"
				@@ -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"
--- a/spring-test-mvc/src/test/resources/log4j.properties
+++ b/spring-test-mvc/src/test/resources/log4j.properties
@ -1,7 +0,0 @@
				@@ -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
--- a/spring-test-mvc/src/main/java/org/springframework/test/util/JsonPathExpectationsHelper.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/util/JsonPathExpectationsHelper.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/util/MatcherAssertionErrors.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/util/MatcherAssertionErrors.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/util/XpathExpectationsHelper.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/util/XpathExpectationsHelper.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcher.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcher.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcherClientHttpRequest.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcherClientHttpRequest.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/ResponseActions.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/ResponseActions.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/ResponseCreator.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/ResponseCreator.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/XpathRequestMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/XpathRequestMatchers.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/package-info.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/package-info.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/package-info.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/package-info.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/package-info.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/package-info.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvc.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvc.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilder.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MvcResult.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MvcResult.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultActions.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultActions.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/package-info.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/package-info.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/RequestPostProcessor.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/RequestPostProcessor.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/package-info.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/package-info.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultHandlers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultHandlers.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/package-info.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/package-info.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/package-info.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/package-info.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/util/JsonPathExpectationsHelperTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/util/JsonPathExpectationsHelperTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/Person.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/Person.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/MockClientHttpRequestFactoryTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/MockClientHttpRequestFactoryTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/JsonPathRequestMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/JsonPathRequestMatchersTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/XpathRequestMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/XpathRequestMatchersTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/response/ResponseCreatorsTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/response/ResponseCreatorsTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/MockMvcClientHttpRequestFactoryTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/MockMvcClientHttpRequestFactoryTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/SampleTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/SampleTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/ContentRequestMatcherTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/ContentRequestMatcherTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/HeaderRequestMatcherTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/HeaderRequestMatcherTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatcherTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatcherTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatcherTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatcherTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/Spr10025Tests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/Spr10025Tests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/Spr10093Tests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/Spr10093Tests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilderTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilderTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ContentResultMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ContentResultMatchersTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchersTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/JsonPathResultMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/JsonPathResultMatchersTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/MockMvcResultMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/MockMvcResultMatchersTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ModelResultMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ModelResultMatchersTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/XpathResultMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/XpathResultMatchersTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/PersonController.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/PersonController.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/PersonDao.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/PersonDao.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/WebAppResourceTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/WebAppResourceTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ExceptionHandlerTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ExceptionHandlerTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java
--- a/Show More
+++ b/Show More