root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1322 from msysyamamoto:fix-javadoc 

* pr/1322:
  Update copyright header
  Fix Javadoc in ContentResultMatchers
This commit is contained in:
Stephane Nicoll 2017-02-09 16:06:12 +01:00
parent 09d18f2ef5 75b18d7b7b
commit 12de9643a6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -127,7 +127,7 @@ public class ContentResultMatchers {
* Assert the response body content with a Hamcrest {@link Matcher}. * Assert the response body content with a Hamcrest {@link Matcher}.
* <pre class="code"> * <pre class="code">
* mockMvc.perform(get("/path")) * mockMvc.perform(get("/path"))
* .andExpect(content(containsString("text"))); * .andExpect(content().string(containsString("text")));
* </pre> * </pre>
*/ */
public ResultMatcher string(final Matcher<? super String> matcher) { public ResultMatcher string(final Matcher<? super String> matcher) {