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

Remove XmlExpectationsHelper hard XML Unit requirement 

Update XmlExpectationsHelper to use an inner class for XML Unit calls
so that the XML Unit dependency remains optional.

Issue: SPR-15156
This commit is contained in:
Phillip Webb 2017-02-13 16:17:21 -08:00
parent f380ab9d90
commit 656e7f801e
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,14 +79,39 @@ public class XmlExpectationsHelper {
* @see org.springframework.test.web.servlet.result.MockMvcResultMatchers#xpath(String, Map, Object...)
*/
public void assertXmlEqual(String expected, String actual) throws Exception {
Diff diffSimilar = DiffBuilder.compare(expected).withTest(actual)
.withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText))
.ignoreWhitespace().ignoreComments()
.checkForSimilar()
.build();
if (diffSimilar.hasDifferences()) {
AssertionErrors.fail("Body content " + diffSimilar.toString());
XmlUnitDiff diff = new XmlUnitDiff(expected, actual);
if (diff.hasDifferences()) {
AssertionErrors.fail("Body content " + diff.toString());
}
}
/**
* Inner class to prevent hard dependency on XML Unit.
*/
private static class XmlUnitDiff {
private final Diff diff;
XmlUnitDiff(String expected, String actual) {
this.diff = DiffBuilder.compare(expected).withTest(actual)
.withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText))
.ignoreWhitespace().ignoreComments()
.checkForSimilar()
.build();
}
public boolean hasDifferences() {
return diff.hasDifferences();
}
@Override
public String toString() {
return diff.toString();
}
}
}