juergen 2003/08/08 03:37:16
Modified:
testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor
XMLResponseBodyAssert.java
Log:
enable the sorting for response elements again.
Revision Changes Path
1.23 +25 -6
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/XMLResponseBodyAssert.java
Index: XMLResponseBodyAssert.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/XMLResponseBodyAssert.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- XMLResponseBodyAssert.java 6 Aug 2003 11:00:30 -0000 1.22
+++ XMLResponseBodyAssert.java 8 Aug 2003 10:37:16 -0000 1.23
@@ -223,6 +223,25 @@
if (children1.size() != children2.size()){
return false;
}
+
+// if (children1.size() > 3) {
+//
+// Iterator iter = children1.iterator();
+// while (iter.hasNext())
+// {
+// Element element = (Element)iter.next();
+// System.out.println(" element1: " + getDisplayName(element,
elementName));
+// }
+// System.out.println();
+// Iterator iter2 = children2.iterator();
+// while (iter2.hasNext())
+// {
+// Element element = (Element)iter2.next();
+// System.out.println(" element2: " + getDisplayName(element,
elementName));
+// }
+// }
+
+
// finally check all children too via recursion
Iterator iter1 = children1.iterator();
Iterator iter2 = children2.iterator();
@@ -430,11 +449,11 @@
String fullPathName = getPathName(pathName, e.getName());
if (fullPathName.equals("/multistatus/response/href") &&
sortMultistatusResponseHrefElements() ) {
result = getPathName("/multistatus/response/href",
getHrefNormalised(e.getTextTrim()));
+ } else if (fullPathName.equals("/multistatus/response") &&
e.getChild("href", e.getNamespace()) != null && sortMultistatusResponseHrefElements()
) {
+ result = getHrefNormalised(e.getChild("href",
e.getNamespace()).getTextTrim());
} else if
(fullPathName.equals("/multistatus/response/propstat/prop/workspace-checkout-set/href"))
{
result = getHrefNormalised(e.getTextTrim());
-// } else if (fullPathName.equals("/multistatus/response") &&
e.getChild("href", e.getNamespace()) != null) {
-// result = getHrefNormalised(e.getChild("href",
e.getNamespace()).getTextTrim());
- } else if (fullPathName.equals("/multistatus/response/propstat") &&
e.getChild("status",e.getNamespace()) != null ) {
+ } else if (fullPathName.equals("/multistatus/response/propstat") &&
e.getChild("status",e.getNamespace()) != null ) {
result = getPathName("/multistatus/response/propstat/status",
e.getChildText("status",e.getNamespace()));
} else if
(fullPathName.equals("/multistatus/response/propstat/prop/supported-report-set/supported-report")
&& e.getChild("report",e.getNamespace()) != null && e.getChildren().size() == 1) {
result =
getPathName("/multistatus/response/propstat/prop/supported-report-set/supported-report/report",
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
