From e7c95addeb11fe03440d6918ae05159f43bf0e0c Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sat, 15 Aug 2015 13:32:14 +0200 Subject: [PATCH] Rename test classes to avoid confusion --- .../web/client/match/ContentRequestMatchersTests.java | 2 +- ...rsTests.java => MockRestRequestMatchersTests.java} | 2 +- .../web/client/match/XpathRequestMatchersTests.java | 5 +++-- ...va => ContentRequestMatchersIntegrationTests.java} | 11 ++++++----- ...ava => HeaderRequestMatchersIntegrationTests.java} | 5 +++-- ...a => JsonPathRequestMatchersIntegrationTests.java} | 2 +- ...=> XmlContentRequestMatchersIntegrationTests.java} | 10 +++++----- ...java => XpathRequestMatchersIntegrationTests.java} | 10 +++++----- 8 files changed, 25 insertions(+), 22 deletions(-) rename spring-test/src/test/java/org/springframework/test/web/client/match/{RequestMatchersTests.java => MockRestRequestMatchersTests.java} (98%) rename spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/{ContentRequestMatcherTests.java => ContentRequestMatchersIntegrationTests.java} (92%) rename spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/{HeaderRequestMatcherTests.java => HeaderRequestMatchersIntegrationTests.java} (96%) rename spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/{JsonPathRequestMatcherTests.java => JsonPathRequestMatchersIntegrationTests.java} (99%) rename spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/{XmlContentRequestMatcherTests.java => XmlContentRequestMatchersIntegrationTests.java} (95%) rename spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/{XpathRequestMatcherTests.java => XpathRequestMatchersIntegrationTests.java} (97%) diff --git a/spring-test/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 index 5d89dc0ee5..eada001d66 100644 --- a/spring-test/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 @@ -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 */ diff --git a/spring-test/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/client/match/MockRestRequestMatchersTests.java similarity index 98% rename from spring-test/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java rename to spring-test/src/test/java/org/springframework/test/web/client/match/MockRestRequestMatchersTests.java index a0b49dcb31..787020d604 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java +++ b/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(); diff --git a/spring-test/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 index a4b8ef35a0..c6a285b51d 100644 --- a/spring-test/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 @@ -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 */ diff --git a/spring-test/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/ContentRequestMatchersIntegrationTests.java similarity index 92% rename from spring-test/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/ContentRequestMatchersIntegrationTests.java index 0a1692759f..d6c1d876b3 100644 --- a/spring-test/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/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 XmlContentRequestMatcherTests - * @see XpathRequestMatcherTests + * @see JsonPathRequestMatchersIntegrationTests + * @see XmlContentRequestMatchersIntegrationTests + * @see XpathRequestMatchersIntegrationTests */ -public class ContentRequestMatcherTests { +public class ContentRequestMatchersIntegrationTests { private MockRestServiceServer mockServer; diff --git a/spring-test/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/HeaderRequestMatchersIntegrationTests.java similarity index 96% rename from spring-test/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/HeaderRequestMatchersIntegrationTests.java index 98c52b02d7..7ffb5eb9b7 100644 --- a/spring-test/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/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\"}"; diff --git a/spring-test/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/JsonPathRequestMatchersIntegrationTests.java similarity index 99% rename from spring-test/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/JsonPathRequestMatchersIntegrationTests.java index 4b666b1577..e1aa5f998e 100644 --- a/spring-test/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/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; diff --git a/spring-test/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/XmlContentRequestMatchersIntegrationTests.java similarity index 95% rename from spring-test/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/XmlContentRequestMatchersIntegrationTests.java index 2ca2a8c99b..0d4fba55c7 100644 --- a/spring-test/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/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 ContentRequestMatcherTests - * @see XpathRequestMatcherTests + * @see ContentRequestMatchersIntegrationTests + * @see XpathRequestMatchersIntegrationTests */ -public class XmlContentRequestMatcherTests { +public class XmlContentRequestMatchersIntegrationTests { private static final String PEOPLE_XML = "" + diff --git a/spring-test/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/XpathRequestMatchersIntegrationTests.java similarity index 97% rename from spring-test/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/XpathRequestMatchersIntegrationTests.java index b3bb5ba6a7..49a3059184 100644 --- a/spring-test/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/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 ContentRequestMatcherTests - * @see XmlContentRequestMatcherTests + * @see ContentRequestMatchersIntegrationTests + * @see XmlContentRequestMatchersIntegrationTests */ -public class XpathRequestMatcherTests { +public class XpathRequestMatchersIntegrationTests { private static final Map NS = Collections.singletonMap("ns", "http://example.org/music/people");