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

Polishing

This commit is contained in:
Sam Brannen 2019-11-12 14:01:13 +01:00
parent a276c667d1
commit a26d37b407
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-test/src/main/java/org/springframework/test/util/XpathExpectationsHelper.java
View File

@ -41,7 +41,6 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.util.xml.SimpleNamespaceContext; import org.springframework.util.xml.SimpleNamespaceContext;
/** /**
* A helper class for applying assertions via XPath expressions. * A helper class for applying assertions via XPath expressions.
* *
@ -96,7 +95,7 @@ public class XpathExpectationsHelper {
* Parse the content, evaluate the XPath expression as a {@link Node}, * Parse the content, evaluate the XPath expression as a {@link Node},
* and assert it with the given {@code Matcher<Node>}. * and assert it with the given {@code Matcher<Node>}.
*/ */
public void assertNode(byte[] content, @Nullable String encoding, final Matcher<? super Node> matcher) public void assertNode(byte[] content, @Nullable String encoding, Matcher<? super Node> matcher)
throws Exception { throws Exception {
Node node = evaluateXpath(content, encoding, Node.class); Node node = evaluateXpath(content, encoding, Node.class);
@ -108,7 +107,7 @@ public class XpathExpectationsHelper {
* and assert it with the given {@code Matcher<NodeList>}. * and assert it with the given {@code Matcher<NodeList>}.
* @since 5.2.2 * @since 5.2.2
*/ */
public void assertNodeList(byte[] content, @Nullable String encoding, final Matcher<? super NodeList> matcher) public void assertNodeList(byte[] content, @Nullable String encoding, Matcher<? super NodeList> matcher)
throws Exception { throws Exception {
Document document = parseXmlByteArray(content, encoding); Document document = parseXmlByteArray(content, encoding);
@ -122,7 +121,7 @@ public class XpathExpectationsHelper {
*/ */
public void exists(byte[] content, @Nullable String encoding) throws Exception { public void exists(byte[] content, @Nullable String encoding) throws Exception {
Node node = evaluateXpath(content, encoding, Node.class); Node node = evaluateXpath(content, encoding, Node.class);
AssertionErrors.assertTrue("XPath " + this.expression + " does not exist", node != null); AssertionErrors.assertNotNull("XPath " + this.expression + " does not exist", node);
} }
/** /**
@ -131,7 +130,7 @@ public class XpathExpectationsHelper {
*/ */
public void doesNotExist(byte[] content, @Nullable String encoding) throws Exception { public void doesNotExist(byte[] content, @Nullable String encoding) throws Exception {
Node node = evaluateXpath(content, encoding, Node.class); Node node = evaluateXpath(content, encoding, Node.class);
AssertionErrors.assertTrue("XPath " + this.expression + " exists", node == null); AssertionErrors.assertNull("XPath " + this.expression + " exists", node);
} }
/** /**

2
spring-test/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java
View File

@ -75,7 +75,7 @@ public class XpathResultMatchers {
* given Hamcrest {@link Matcher}. * given Hamcrest {@link Matcher}.
* @since 5.2.2 * @since 5.2.2
*/ */
public ResultMatcher nodeList(final Matcher<? super NodeList> matcher) { public ResultMatcher nodeList(Matcher<? super NodeList> matcher) {
return result -> { return result -> {
MockHttpServletResponse response = result.getResponse(); MockHttpServletResponse response = result.getResponse();
this.xpathHelper.assertNodeList(response.getContentAsByteArray(), getDefinedEncoding(response), matcher); this.xpathHelper.assertNodeList(response.getContentAsByteArray(), getDefinedEncoding(response), matcher);