Rename test classes to avoid confusion

spring-test/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java

@@ -24,7 +24,7 @@ import org.springframework.mock.http.client.MockClientHttpRequest;
 import static org.hamcrest.Matchers.*;
 
 /**
- * Tests for {@link ContentRequestMatchers}.
+ * Unit tests for {@link ContentRequestMatchers}.
  *
  * @author Rossen Stoyanchev
  */

spring-test/src/test/java/org/springframework/test/web/client/match/MockRestRequestMatchersTests.java

@@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.*;
  * @author Craig Walls
  * @author Rossen Stoyanchev
  */
-public class RequestMatchersTests {
+public class MockRestRequestMatchersTests {
 
 	private final MockClientHttpRequest request = new MockClientHttpRequest();
 

spring-test/src/test/java/org/springframework/test/web/client/match/XpathRequestMatchersTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.client.match;
 
 import java.io.IOException;
@@ -24,7 +25,7 @@ import org.junit.Test;
 import org.springframework.mock.http.client.MockClientHttpRequest;
 
 /**
- * Tests for {@link XpathRequestMatchers}.
+ * Unit tests for {@link XpathRequestMatchers}.
  *
  * @author Rossen Stoyanchev
  */

spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/ContentRequestMatchersIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.client.samples.matchers;
 
 import java.net.URI;
@@ -39,11 +40,11 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat
  *
  * @author Rossen Stoyanchev
  *
- * @see JsonPathRequestMatcherTests
+ * @see JsonPathRequestMatchersIntegrationTests
- * @see XmlContentRequestMatcherTests
+ * @see XmlContentRequestMatchersIntegrationTests
- * @see XpathRequestMatcherTests
+ * @see XpathRequestMatchersIntegrationTests
  */
-public class ContentRequestMatcherTests {
+public class ContentRequestMatchersIntegrationTests {
 
 	private MockRestServiceServer mockServer;
 

spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/HeaderRequestMatchersIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.client.samples.matchers;
 
 import java.net.URI;
@@ -39,7 +40,7 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat
  *
  * @author Rossen Stoyanchev
  */
-public class HeaderRequestMatcherTests {
+public class HeaderRequestMatchersIntegrationTests {
 
 	private static final String RESPONSE_BODY = "{\"name\" : \"Ludwig van Beethoven\", \"someDouble\" : \"1.6035\"}";
 

spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatchersIntegrationTests.java

@@ -43,7 +43,7 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat
  * @author Rossen Stoyanchev
  * @see org.springframework.test.web.client.match.JsonPathRequestMatchers
  */
-public class JsonPathRequestMatcherTests {
+public class JsonPathRequestMatchersIntegrationTests {
 
 	private MockRestServiceServer mockServer;
 

spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatchersIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.client.samples.matchers;
 
 import java.net.URI;
@@ -42,11 +43,10 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat
  * Examples of defining expectations on XML request content with XMLUnit.
  *
  * @author Rossen Stoyanchev
- *
+ * @see ContentRequestMatchersIntegrationTests
- * @see ContentRequestMatcherTests
+ * @see XpathRequestMatchersIntegrationTests
- * @see XpathRequestMatcherTests
  */
-public class XmlContentRequestMatcherTests {
+public class XmlContentRequestMatchersIntegrationTests {
 
 	private static final String PEOPLE_XML =
 			"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" +

spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatchersIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.client.samples.matchers;
 
 import java.net.URI;
@@ -44,11 +45,10 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat
  * Examples of defining expectations on XML request content with XPath expressions.
  *
  * @author Rossen Stoyanchev
- *
+ * @see ContentRequestMatchersIntegrationTests
- * @see ContentRequestMatcherTests
+ * @see XmlContentRequestMatchersIntegrationTests
- * @see XmlContentRequestMatcherTests
  */
-public class XpathRequestMatcherTests {
+public class XpathRequestMatchersIntegrationTests {
 
 	private static final Map<String, String> NS =
 			Collections.singletonMap("ns", "http://example.org/music/people");