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 (backported from 3.2.x)

This commit is contained in:
Juergen Hoeller 2013-12-03 01:37:01 +01:00
parent 2a52decbbc
commit f5a310ad57
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
View File

@ -40,7 +40,6 @@ import static org.springframework.test.util.MatcherAssertionErrors.*;
*/ */
public class XmlExpectationsHelper { public class XmlExpectationsHelper {
/** /**
* Parse the content as {@link Node} and apply a {@link Matcher}. * Parse the content as {@link Node} and apply a {@link Matcher}.
*/ */
@ -54,8 +53,7 @@ public class XmlExpectationsHelper {
factory.setNamespaceAware(true); factory.setNamespaceAware(true);
DocumentBuilder documentBuilder = factory.newDocumentBuilder(); DocumentBuilder documentBuilder = factory.newDocumentBuilder();
InputSource inputSource = new InputSource(new StringReader(xml)); InputSource inputSource = new InputSource(new StringReader(xml));
Document document = documentBuilder.parse(inputSource); return documentBuilder.parse(inputSource);
return document;
} }
/** /**
@ -79,7 +77,6 @@ public class XmlExpectationsHelper {
* @see org.springframework.test.web.servlet.result.MockMvcResultMatchers#xpath(String, Map, Object...) * @see org.springframework.test.web.servlet.result.MockMvcResultMatchers#xpath(String, Map, Object...)
*/ */
public void assertXmlEqual(String expected, String actual) throws Exception { public void assertXmlEqual(String expected, String actual) throws Exception {
XMLUnit.setIgnoreWhitespace(true); XMLUnit.setIgnoreWhitespace(true);
XMLUnit.setIgnoreComments(true); XMLUnit.setIgnoreComments(true);
XMLUnit.setIgnoreAttributeOrder(true); XMLUnit.setIgnoreAttributeOrder(true);