X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fxml%2FXmlUtils.java;h=02545714a32a6ba49198edd91033a8bedb9734d5;hb=8de36ff0206c996baf3ee4adc3e2293b12ff5f39;hp=f35b50cfcfbd0992faacdcc6cd91d1f9265693f3;hpb=89c06d4d52b46c154128c97d6e758fa1f4fc7a6e;p=utils diff --git a/support/general/src/test/java/org/wamblee/xml/XmlUtils.java b/support/general/src/test/java/org/wamblee/xml/XmlUtils.java index f35b50cf..02545714 100644 --- a/support/general/src/test/java/org/wamblee/xml/XmlUtils.java +++ b/support/general/src/test/java/org/wamblee/xml/XmlUtils.java @@ -27,16 +27,15 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; - /** * XML test support utilities. - * + * * @author Erik Brakkee */ public final class XmlUtils { /** * Disabled constructor. - * + * */ private XmlUtils() { // Empty @@ -46,22 +45,22 @@ public final class XmlUtils { * Checks equality of two XML documents excluding comment and processing * nodes and trimming the text of the elements. In case of problems, it * provides an xpath-like expression describing where the problem is. - * + * * @param aMsg * @param aExpected * @param aActual */ public static void assertEquals(String aMsg, org.w3c.dom.Document aExpected, org.w3c.dom.Document aActual) { - assertEquals(aMsg, DomUtils.convert(aExpected), - DomUtils.convert(aActual)); + assertEquals(aMsg, DomUtils.convert(aExpected), DomUtils + .convert(aActual)); } /** * Checks equality of two XML documents excluding comment and processing - * nodes and trimming the text of the elements. In case of problems, it + * nodes and trimming the text of the elements. In case of problems, it * provides an xpath-like expression describing where the problem is. - * + * * @param aMsg * @param aExpected * @param aActual @@ -76,7 +75,7 @@ public final class XmlUtils { * Checks equality of two XML elements excluding comment and processing * nodes and trimming the text of the elements. In case of problems, it * provides an xpath-like expression describing where the problem is. - * + * * @param aMsg * @param aExpected * @param aActual @@ -84,8 +83,8 @@ public final class XmlUtils { public static void assertEquals(String aMsg, Element aExpected, Element aActual) { // Name. - TestCase.assertEquals(aMsg + "/name()", aExpected.getName(), - aActual.getName()); + TestCase.assertEquals(aMsg + "/name()", aExpected.getName(), aActual + .getName()); // Text TestCase.assertEquals(aMsg + "/text()", aExpected.getTextTrim(), @@ -136,28 +135,29 @@ public final class XmlUtils { } /** - * Checks equality of two attributes. In case of problems, it - * provides an xpath-like expression describing where the problem is. - * + * Checks equality of two attributes. In case of problems, it provides an + * xpath-like expression describing where the problem is. + * * @param aMsg * @param aExpected * @param aActual */ public static void assertEquals(String aMsg, Attribute aExpected, Attribute aActual) { - TestCase.assertEquals(aMsg + ":name", aExpected.getName(), - aActual.getName()); - TestCase.assertEquals(aMsg + ":value", aExpected.getValue(), - aActual.getValue()); + TestCase.assertEquals(aMsg + ":name", aExpected.getName(), aActual + .getName()); + TestCase.assertEquals(aMsg + ":value", aExpected.getValue(), aActual + .getValue()); } /** * Comparator which compares attributes by name. */ - private static final class AttributeComparator implements Comparator { + private static final class AttributeComparator implements + Comparator { /* * (non-Javadoc) - * + * * @see java.util.Comparator#compare(T, T) */ public int compare(Attribute aAttribute1, Attribute aAttribute2) {