git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
library names now start with wamblee- to make them unique.
[utils]
/
support
/
test
/
org
/
wamblee
/
xml
/
XmlUtils.java
diff --git
a/support/test/org/wamblee/xml/XmlUtils.java
b/support/test/org/wamblee/xml/XmlUtils.java
index 5c6bf43c2b7b47738649458c392e3985b3129ba4..638d64e4e98e79e789893221acac89fb30c0c39e 100644
(file)
--- a/
support/test/org/wamblee/xml/XmlUtils.java
+++ b/
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) {
*/
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<Attribute> actualAttrs = aActual.attributes();
Collections.sort(actualAttrs, new AttributeComparator());
List<Attribute> 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();
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<Element> expectedElems = aExpected.elements();
List<Element> actualElems = aActual.elements();
// Nested elements.
List<Element> expectedElems = aExpected.elements();
List<Element> 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)
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)