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 (including removal of javadoc imports that show as package cycles in IntelliJ) 

(cherry picked from commit 2a52dec)
This commit is contained in:
Juergen Hoeller 2013-12-03 01:28:45 +01:00
parent 25c7e3645b
commit 6224ddd0cb
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2013 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,11 +16,8 @@
package org.springframework.test.util; package org.springframework.test.util;
import static org.springframework.test.util.MatcherAssertionErrors.assertThat;
import java.io.StringReader; import java.io.StringReader;
import java.util.Map; import java.util.Map;
import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.Source; import javax.xml.transform.Source;
@ -29,11 +26,12 @@ import javax.xml.transform.dom.DOMSource;
import org.custommonkey.xmlunit.Diff; import org.custommonkey.xmlunit.Diff;
import org.custommonkey.xmlunit.XMLUnit; import org.custommonkey.xmlunit.XMLUnit;
import org.hamcrest.Matcher; import org.hamcrest.Matcher;
import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import static org.springframework.test.util.MatcherAssertionErrors.*;
/** /**
* A helper class for assertions on XML content. * A helper class for assertions on XML content.
* *
@ -42,7 +40,6 @@ import org.xml.sax.InputSource;
*/ */
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}.
*/ */
@ -56,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;
} }
/** /**
@ -73,18 +69,14 @@ public class XmlExpectationsHelper {
* Parse the expected and actual content strings as XML and assert that the * Parse the expected and actual content strings as XML and assert that the
* two are "similar" -- i.e. they contain the same elements and attributes * two are "similar" -- i.e. they contain the same elements and attributes
* regardless of order. * regardless of order.
*
* <p>Use of this method assumes the * <p>Use of this method assumes the
* <a href="http://xmlunit.sourceforge.net/">XMLUnit<a/> library is available. * <a href="http://xmlunit.sourceforge.net/">XMLUnit<a/> library is available.
*
* @param expected the expected XML content * @param expected the expected XML content
* @param actual the actual XML content * @param actual the actual XML content
* * @see org.springframework.test.web.servlet.result.MockMvcResultMatchers#xpath(String, Object...)
* @see MockMvcResultMatchers#xpath(String, Object...) * @see org.springframework.test.web.servlet.result.MockMvcResultMatchers#xpath(String, Map, Object...)
* @see 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);