Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2017-05-04 22:27:36 +02:00
parent 75117f42b8
commit 652266bcc2
5 changed files with 40 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
spring-test/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java
View File

@@ -20,6 +20,7 @@ import javax.servlet.http.Cookie;
import org.hamcrest.Matcher;
import org.springframework.test.web.servlet.MvcResult;
import org.springframework.test.web.servlet.ResultMatcher;
import static org.hamcrest.MatcherAssert.*;
@@ -50,8 +51,7 @@ public class CookieResultMatchers {
*/
public ResultMatcher value(final String name, final Matcher<? super String> matcher) {
return result -> {
Cookie cookie = result.getResponse().getCookie(name);
assertTrue("Response cookie '" + name + "' not found", cookie != null);
Cookie cookie = getCookie(result, name);
assertThat("Response cookie '" + name + "'", cookie.getValue(), matcher);
};
}
@@ -61,8 +61,7 @@ public class CookieResultMatchers {
*/
public ResultMatcher value(final String name, final String expectedValue) {
return result -> {
Cookie cookie = result.getResponse().getCookie(name);
assertTrue("Response cookie '" + name + "' not found", cookie != null);
Cookie cookie = getCookie(result, name);
assertEquals("Response cookie", expectedValue, cookie.getValue());
};
}
@@ -72,10 +71,7 @@ public class CookieResultMatchers {
* max age is 0 (i.e. expired).
*/
public ResultMatcher exists(final String name) {
return result -> {
Cookie cookie = result.getResponse().getCookie(name);
assertTrue("No cookie with name '" + name + "'", cookie != null);
};
return result -> getCookie(result, name);
}
/**
@@ -94,8 +90,7 @@ public class CookieResultMatchers {
*/
public ResultMatcher maxAge(final String name, final Matcher<? super Integer> matcher) {
return result -> {
Cookie cookie = result.getResponse().getCookie(name);
assertTrue("No cookie with name '" + name + "'", cookie != null);
Cookie cookie = getCookie(result, name);
assertThat("Response cookie '" + name + "' maxAge", cookie.getMaxAge(), matcher);
};
}
@@ -105,8 +100,7 @@ public class CookieResultMatchers {
*/
public ResultMatcher maxAge(final String name, final int maxAge) {
return result -> {
Cookie cookie = result.getResponse().getCookie(name);
assertTrue("No cookie with name: " + name, cookie != null);
Cookie cookie = getCookie(result, name);
assertEquals("Response cookie '" + name + "' maxAge", maxAge, cookie.getMaxAge());
};
}
@@ -116,14 +110,14 @@ public class CookieResultMatchers {
*/
public ResultMatcher path(final String name, final Matcher<? super String> matcher) {
return result -> {
Cookie cookie = result.getResponse().getCookie(name);
Cookie cookie = getCookie(result, name);
assertThat("Response cookie '" + name + "' path", cookie.getPath(), matcher);
};
}
public ResultMatcher path(final String name, final String path) {
return result -> {
Cookie cookie = result.getResponse().getCookie(name);
Cookie cookie = getCookie(result, name);
assertEquals("Response cookie '" + name + "' path", path, cookie.getPath());
};
}
@@ -133,7 +127,7 @@ public class CookieResultMatchers {
*/
public ResultMatcher domain(final String name, final Matcher<? super String> matcher) {
return result -> {
Cookie cookie = result.getResponse().getCookie(name);
Cookie cookie = getCookie(result, name);
assertThat("Response cookie '" + name + "' domain", cookie.getDomain(), matcher);
};
}
@@ -143,7 +137,7 @@ public class CookieResultMatchers {
*/
public ResultMatcher domain(final String name, final String domain) {
return result -> {
Cookie cookie = result.getResponse().getCookie(name);
Cookie cookie = getCookie(result, name);
assertEquals("Response cookie '" + name + "' domain", domain, cookie.getDomain());
};
}
@@ -153,7 +147,7 @@ public class CookieResultMatchers {
*/
public ResultMatcher comment(final String name, final Matcher<? super String> matcher) {
return result -> {
Cookie cookie = result.getResponse().getCookie(name);
Cookie cookie = getCookie(result, name);
assertThat("Response cookie '" + name + "' comment", cookie.getComment(), matcher);
};
}
@@ -163,7 +157,7 @@ public class CookieResultMatchers {
*/
public ResultMatcher comment(final String name, final String comment) {
return result -> {
Cookie cookie = result.getResponse().getCookie(name);
Cookie cookie = getCookie(result, name);
assertEquals("Response cookie '" + name + "' comment", comment, cookie.getComment());
};
}
@@ -173,7 +167,7 @@ public class CookieResultMatchers {
*/
public ResultMatcher version(final String name, final Matcher<? super Integer> matcher) {
return result -> {
Cookie cookie = result.getResponse().getCookie(name);
Cookie cookie = getCookie(result, name);
assertThat("Response cookie '" + name + "' version", cookie.getVersion(), matcher);
};
}
@@ -183,7 +177,7 @@ public class CookieResultMatchers {
*/
public ResultMatcher version(final String name, final int version) {
return result -> {
Cookie cookie = result.getResponse().getCookie(name);
Cookie cookie = getCookie(result, name);
assertEquals("Response cookie '" + name + "' version", version, cookie.getVersion());
};
}
@@ -193,7 +187,7 @@ public class CookieResultMatchers {
*/
public ResultMatcher secure(final String name, final boolean secure) {
return result -> {
Cookie cookie = result.getResponse().getCookie(name);
Cookie cookie = getCookie(result, name);
assertEquals("Response cookie '" + name + "' secure", secure, cookie.getSecure());
};
}
@@ -204,9 +198,16 @@ public class CookieResultMatchers {
*/
public ResultMatcher httpOnly(final String name, final boolean httpOnly) {
return result -> {
Cookie cookie = result.getResponse().getCookie(name);
Cookie cookie = getCookie(result, name);
assertEquals("Response cookie '" + name + "' httpOnly", httpOnly, cookie.isHttpOnly());
};
}
private static Cookie getCookie(MvcResult result, String name) {
Cookie cookie = result.getResponse().getCookie(name);
assertTrue("No cookie with name '" + name + "'", cookie != null);
return cookie;
}
}

1
spring-test/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java
View File

@@ -93,7 +93,6 @@ public class HandlerResultMatchers {
* mockMvc.perform(get("/"))
* .andExpect(handler().methodCall(on(SimpleController.class).handle()));
* </pre>
*
* @param obj either the value returned from a "mock" controller invocation
* or the "mock" controller itself after an invocation
*/