An instance of this class is typically accessed via + * {@link MockMvcResultMatchers#content}. * * @author Rossen Stoyanchev * @since 3.2 @@ -213,7 +214,7 @@ public class ContentResultMatchers { /** * Parse the response content and the given string as JSON and assert the two - * are "similar" - i.e. they contain the same attribute-value pairs + * are "similar" — i.e. they contain the same attribute-value pairs * regardless of order and formatting. *
Use of this matcher requires the JSONassert library. diff --git a/spring-test/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 index ef17a562b2..caa5ad1465 100644 --- a/spring-test/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 @@ -27,8 +27,9 @@ import static org.hamcrest.MatcherAssert.*; import static org.springframework.test.util.AssertionErrors.*; /** - * Factory for response cookie assertions. An instance of this class is - * typically accessed via {@link MockMvcResultMatchers#cookie()}. + * Factory for response cookie assertions. + *
An instance of this class is typically accessed via + * {@link MockMvcResultMatchers#cookie}. * * @author Rossen Stoyanchev * @author Thomas Bruyelle diff --git a/spring-test/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 index 3fca6b9518..78bf09d05a 100644 --- a/spring-test/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 @@ -25,8 +25,9 @@ import static org.hamcrest.MatcherAssert.*; import static org.springframework.test.util.AssertionErrors.*; /** - * Factory for "output" flash attribute assertions. An instance of this class is - * typically accessed via {@link MockMvcResultMatchers#flash()}. + * Factory for "output" flash attribute assertions. + *
An instance of this class is typically accessed via + * {@link MockMvcResultMatchers#flash}. * * @author Rossen Stoyanchev * @since 3.2 diff --git a/spring-test/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 index 2095dc9a5f..982eacdfb5 100644 --- a/spring-test/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 @@ -31,8 +31,9 @@ import static org.hamcrest.MatcherAssert.*; import static org.springframework.test.util.AssertionErrors.*; /** - * Factory for assertions on the selected handler. An instance of this class is - * typically accessed via {@link MockMvcResultMatchers#handler()}. + * Factory for assertions on the selected handler. + *
An instance of this class is typically accessed via + * {@link MockMvcResultMatchers#handler}. * * @author Rossen Stoyanchev * @since 3.2 diff --git a/spring-test/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 index 8eeb9bbe56..058aa5cd5a 100644 --- a/spring-test/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 @@ -25,8 +25,9 @@ import static org.hamcrest.MatcherAssert.*; import static org.springframework.test.util.AssertionErrors.*; /** - * Factory for response header assertions. An instance of this - * class is usually accessed via {@link MockMvcResultMatchers#header()}. + * Factory for response header assertions. + *
An instance of this class is usually accessed via + * {@link MockMvcResultMatchers#header}. * * @author Rossen Stoyanchev * @author Sam Brannen diff --git a/spring-test/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 index d18719790c..f9328a0446 100644 --- a/spring-test/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 @@ -25,7 +25,7 @@ import org.springframework.test.web.servlet.ResultMatcher; /** * Factory for assertions on the response content using * JSONPath expressions. - * An instance of this class is typically accessed via + *
An instance of this class is typically accessed via * {@link MockMvcResultMatchers#jsonPath}. * * @author Rossen Stoyanchev diff --git a/spring-test/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 index 270db9ad71..9cc7c40b7f 100644 --- a/spring-test/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 @@ -29,10 +29,11 @@ import org.springframework.test.web.servlet.ResultHandler; import org.springframework.util.CollectionUtils; /** - * Static, factory methods for {@link ResultHandler}-based result actions. + * Static factory methods for {@link ResultHandler}-based result actions. * - *
Eclipse users: consider adding this class as a Java editor - * favorite. To navigate to this setting, open the Preferences and type "favorites". + *
Consider adding this class as a Java editor favorite. To navigate to + * this setting, open the Preferences and type "favorites". * * @author Rossen Stoyanchev * @author Sam Brannen diff --git a/spring-test/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 index c647f6595c..8eb2111761 100644 --- a/spring-test/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 @@ -28,10 +28,11 @@ import org.springframework.util.AntPathMatcher; import static org.springframework.test.util.AssertionErrors.*; /** - * Static, factory methods for {@link ResultMatcher}-based result actions. + * Static factory methods for {@link ResultMatcher}-based result actions. * - *
Eclipse users: consider adding this class as a Java editor - * favorite. To navigate, open the Preferences and type "favorites". + *
Consider adding this class as a Java editor favorite. To navigate to + * this setting, open the Preferences and type "favorites". * * @author Rossen Stoyanchev * @author Brian Clozel diff --git a/spring-test/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 index a454f5b4ee..1e96725be1 100644 --- a/spring-test/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 @@ -29,8 +29,9 @@ import static org.hamcrest.MatcherAssert.*; import static org.springframework.test.util.AssertionErrors.*; /** - * Factory for assertions on the model. An instance of this class is - * typically accessed via {@link MockMvcResultMatchers#model()}. + * Factory for assertions on the model. + *
An instance of this class is typically accessed via + * {@link MockMvcResultMatchers#model}. * * @author Rossen Stoyanchev * @since 3.2 diff --git a/spring-test/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 index c378e4a472..10456759bb 100644 --- a/spring-test/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 @@ -31,8 +31,9 @@ import static org.hamcrest.MatcherAssert.*; import static org.springframework.test.util.AssertionErrors.*; /** - * Factory for assertions on the request. An instance of this class is - * typically accessed via {@link MockMvcResultMatchers#request()}. + * Factory for assertions on the request. + *
An instance of this class is typically accessed via + * {@link MockMvcResultMatchers#request}. * * @author Rossen Stoyanchev * @since 3.2 diff --git a/spring-test/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 index 3ec7e5f04e..5efa9100ea 100644 --- a/spring-test/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 @@ -26,8 +26,9 @@ import static org.hamcrest.MatcherAssert.*; import static org.springframework.test.util.AssertionErrors.*; /** - * Factory for assertions on the response status. An instance of this class is - * typically accessed via {@link MockMvcResultMatchers#status()}. + * Factory for assertions on the response status. + *
An instance of this class is typically accessed via + * {@link MockMvcResultMatchers#status}. * * @author Keesun Baik * @author Rossen Stoyanchev diff --git a/spring-test/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 index 0548c664fb..790050398a 100644 --- a/spring-test/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 @@ -26,8 +26,9 @@ import static org.hamcrest.MatcherAssert.*; import static org.springframework.test.util.AssertionErrors.*; /** - * Factory for assertions on the selected view. An instance of this class is - * typically accessed via {@link MockMvcResultMatchers#view()}. + * Factory for assertions on the selected view. + *
An instance of this class is typically accessed via + * {@link MockMvcResultMatchers#view}. * * @author Rossen Stoyanchev * @since 3.2 diff --git a/spring-test/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 index da4be59ac1..798a5f0d9f 100644 --- a/spring-test/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 @@ -28,8 +28,8 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultMatcher; /** - * Factory for response content {@code ResultMatcher}'s using an XPath - * expression. An instance of this class is typically accessed via + * Factory for assertions on the response content using XPath expressions. + *
An instance of this class is typically accessed via * {@link MockMvcResultMatchers#xpath}. * * @author Rossen Stoyanchev diff --git a/spring-test/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 index 936c30e09d..8ee752a27b 100644 --- a/spring-test/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 @@ -1,7 +1,7 @@ /** * Contains built-in {@code ResultMatcher} and {@code ResultHandler} implementations. - * Use {@link org.springframework.test.web.servlet.result.MockMvcResultMatchers} + *
Use {@link org.springframework.test.web.servlet.result.MockMvcResultMatchers} * and {@link org.springframework.test.web.servlet.result.MockMvcResultHandlers} - * to access to instances of those implementations. + * to access instances of those implementations. */ package org.springframework.test.web.servlet.result;