git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timeout is now 5 seconds max.
[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 93d2e917c6d8af8cfa3457c5ed318a83adc9104c..638d64e4e98e79e789893221acac89fb30c0c39e 100644
(file)
--- a/
support/test/org/wamblee/xml/XmlUtils.java
+++ b/
support/test/org/wamblee/xml/XmlUtils.java
@@
-43,7
+43,8
@@
public final class XmlUtils {
/**
* Checks equality of two XML documents excluding comment and processing
/**
* Checks equality of two XML documents excluding comment and processing
- * nodes and trimming the text of the elements.
+ * 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 aMsg
* @param aExpected
@@
-57,7
+58,8
@@
public final class XmlUtils {
/**
* Checks equality of two XML documents excluding comment and processing
/**
* Checks equality of two XML documents excluding comment and processing
- * nodes and trimming the text of the elements.
+ * 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 aMsg
* @param aExpected
@@
-65,12
+67,13
@@
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());
}
/**
* Checks equality of two XML elements excluding comment and processing
}
/**
* Checks equality of two XML elements excluding comment and processing
- * nodes and trimming the text of the elements.
+ * 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 aMsg
* @param aExpected
@@
-93,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();
@@
-103,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)
@@
-125,7
+128,8
@@
public final class XmlUtils {
}
/**
}
/**
- * Checks equality of two attributes.
+ * 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 aMsg
* @param aExpected