You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ju...@apache.org on 2003/04/02 17:32:58 UTC
cvs commit: jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor XMLResponseBodyAssert.java
juergen 2003/04/02 07:32:58
Modified: testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor
XMLResponseBodyAssert.java
Log:
ignore the order in following properties:
1) /multistatus/response/propstat/prop/supported-report-set
2) /multistatus/response/propstat/prop/supported-live-property-set
Revision Changes Path
1.19 +10 -4 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XMLResponseBodyAssert.java 27 Nov 2002 13:47:02 -0000 1.18
+++ XMLResponseBodyAssert.java 2 Apr 2003 15:32:58 -0000 1.19
@@ -429,10 +429,16 @@
result = getHrefNormalised(e.getTextTrim());
} else if (getPathName(pathName, e.getName()).equals("/multistatus/response") && e.getChild("href", e.getNamespace()) != null) {
result = getHrefNormalised(e.getChild("href", e.getNamespace()).getTextTrim());
+ } else if (getPathName(pathName, e.getName()).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",
+ ((Element)e.getChild("report",e.getNamespace()).getChildren().get(0)).getName());
+ } else if (getPathName(pathName, e.getName()).equals("/multistatus/response/propstat/prop/supported-live-property-set/supported-live-property") && e.getChild("prop",e.getNamespace()) != null && e.getChildren().size() == 1) {
+ result = getPathName("/multistatus/response/propstat/prop/supported-live-property-set/supported-live-property/prop",
+ ((Element)e.getChild("prop",e.getNamespace()).getChildren().get(0)).getName());
} else {
result = e.getName();
}
- //System.out.println("##### get display name " + getPathName(pathName, e.getName()) + " --> " + result);
+//System.out.println("##### get display name " + getPathName(pathName, e.getName()) + " --> " + result);
return result;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org