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

Polishing

Browse Source 
See gh-2023
This commit is contained in:
Rossen Stoyanchev
2019-11-11 15:03:52 +00:00
parent 6db8306e46
commit 347f16c8ac
3 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2019 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.
@@ -103,17 +103,18 @@ public class XpathExpectationsHelper {
MatcherAssert.assertThat("XPath " + this.expression, node, matcher);
}
/**
* Parse the content, evaluate the XPath expression as a {@link NodeList},
* and assert it with the given {@code Matcher<NodeList>}.
*/
public void assertNodeList(byte[] content, @Nullable String encoding, final Matcher<? super NodeList> matcher)
throws Exception {
/**
* Parse the content, evaluate the XPath expression as a {@link NodeList},
* and assert it with the given {@code Matcher<NodeList>}.
* @since 5.2.2
*/
public void assertNodeList(byte[] content, @Nullable String encoding, final Matcher<? super NodeList> matcher)
throws Exception {
Document document = parseXmlByteArray(content, encoding);
NodeList nodeList = evaluateXpath(document, XPathConstants.NODESET, NodeList.class);
MatcherAssert.assertThat("XPath " + this.getXpathExpression(), nodeList, matcher);
}
Document document = parseXmlByteArray(content, encoding);
NodeList nodeList = evaluateXpath(document, XPathConstants.NODESET, NodeList.class);
MatcherAssert.assertThat("XPath " + this.getXpathExpression(), nodeList, matcher);
}
/**
* Apply the XPath expression and assert the resulting content exists.

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

@@ -70,16 +70,17 @@ public class XpathResultMatchers {
};
}
/**
* Evaluate the XPath and assert the {@link NodeList} content found with the
* given Hamcrest {@link Matcher}.
*/
public ResultMatcher nodeList(final Matcher<? super NodeList> matcher) {
return result -> {
MockHttpServletResponse response = result.getResponse();
this.xpathHelper.assertNodeList(response.getContentAsByteArray(), getDefinedEncoding(response), matcher);
};
}
/**
* Evaluate the XPath and assert the {@link NodeList} content found with the
* given Hamcrest {@link Matcher}.
* @since 5.2.2
*/
public ResultMatcher nodeList(final Matcher<? super NodeList> matcher) {
return result -> {
MockHttpServletResponse response = result.getResponse();
this.xpathHelper.assertNodeList(response.getContentAsByteArray(), getDefinedEncoding(response), matcher);
};
}
/**
* Get the response encoding if explicitly defined in the response, {code null} otherwise.

21
spring-test/src/test/java/org/springframework/test/web/servlet/result/XpathResultMatchersTests.java
View File

@@ -43,7 +43,7 @@ public class XpathResultMatchersTests {
}
@Test
public void nodeNoMatch() throws Exception {
public void nodeNoMatch() {
assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
new XpathResultMatchers("/foo/bar", null).node(Matchers.nullValue()).match(getStubMvcResult()));
}
@@ -53,9 +53,10 @@ public class XpathResultMatchersTests {
new XpathResultMatchers("/foo/bar", null).nodeList(Matchers.notNullValue()).match(getStubMvcResult());
}
@Test(expected = AssertionError.class)
public void nodeListNoMatch() throws Exception {
new XpathResultMatchers("/foo/bar", null).nodeList(Matchers.nullValue()).match(getStubMvcResult());
@Test
public void nodeListNoMatch() {
assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
new XpathResultMatchers("/foo/bar", null).nodeList(Matchers.nullValue()).match(getStubMvcResult()));
}
@Test
@@ -64,7 +65,7 @@ public class XpathResultMatchersTests {
}
@Test
public void existsNoMatch() throws Exception {
public void existsNoMatch() {
assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
new XpathResultMatchers("/foo/Bar", null).exists().match(getStubMvcResult()));
}
@@ -75,7 +76,7 @@ public class XpathResultMatchersTests {
}
@Test
public void doesNotExistNoMatch() throws Exception {
public void doesNotExistNoMatch() {
assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
new XpathResultMatchers("/foo/bar", null).doesNotExist().match(getStubMvcResult()));
}
@@ -86,7 +87,7 @@ public class XpathResultMatchersTests {
}
@Test
public void nodeCountNoMatch() throws Exception {
public void nodeCountNoMatch() {
assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
new XpathResultMatchers("/foo/bar", null).nodeCount(1).match(getStubMvcResult()));
}
@@ -97,7 +98,7 @@ public class XpathResultMatchersTests {
}
@Test
public void stringNoMatch() throws Exception {
public void stringNoMatch() {
assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
new XpathResultMatchers("/foo/bar[1]", null).string("112").match(getStubMvcResult()));
}
@@ -108,7 +109,7 @@ public class XpathResultMatchersTests {
}
@Test
public void numberNoMatch() throws Exception {
public void numberNoMatch() {
assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
new XpathResultMatchers("/foo/bar[1]", null).number(111.1).match(getStubMvcResult()));
}
@@ -119,7 +120,7 @@ public class XpathResultMatchersTests {
}
@Test
public void booleanValueNoMatch() throws Exception {
public void booleanValueNoMatch() {
assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
new XpathResultMatchers("/foo/bar[2]", null).booleanValue(false).match(getStubMvcResult()));
}