X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=trunk%2Fsupport%2Ftest%2Forg%2Fwamblee%2Fxml%2FXmlUtils.java;h=638d64e4e98e79e789893221acac89fb30c0c39e;hb=05d71b9df26247a402e7ef53246641c5c9d97fbd;hp=5c6bf43c2b7b47738649458c392e3985b3129ba4;hpb=6f460ce3ad4d7f3bfefc8aad8380b3a95106bf9c;p=utils diff --git a/trunk/support/test/org/wamblee/xml/XmlUtils.java b/trunk/support/test/org/wamblee/xml/XmlUtils.java index 5c6bf43c..638d64e4 100644 --- a/trunk/support/test/org/wamblee/xml/XmlUtils.java +++ b/trunk/support/test/org/wamblee/xml/XmlUtils.java @@ -67,7 +67,7 @@ public final class XmlUtils { */ public static void assertEquals(String aMsg, Document aExpected, Document aActual) { - assertEquals(aMsg, aExpected.getRootElement(), aActual.getRootElement()); + assertEquals(aMsg + "/" + aExpected.getRootElement().getName(), aExpected.getRootElement(), aActual.getRootElement()); } /** @@ -96,7 +96,7 @@ public final class XmlUtils { List actualAttrs = aActual.attributes(); Collections.sort(actualAttrs, new AttributeComparator()); - TestCase.assertEquals(aMsg + "/count(@*)", expectedAttrs.size(), + TestCase.assertEquals("count(" + aMsg + "/@*)", expectedAttrs.size(), actualAttrs.size()); for (int i = 0; i < expectedAttrs.size(); i++) { String msg = aMsg + "/@" + expectedAttrs.get(i).getName(); @@ -106,7 +106,7 @@ public final class XmlUtils { // Nested elements. List expectedElems = aExpected.elements(); List actualElems = aActual.elements(); - TestCase.assertEquals(aMsg + "/count(*)", expectedElems.size(), + TestCase.assertEquals("count(" + aMsg + "/*)", expectedElems.size(), actualElems.size()); // determine the how-manyth element of the given name we are at. // Maps element name to the last used index (or null if not yet used)