juergen 2002/08/09 04:36:13
Modified:
testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor
XMLResponseBodyAssert.java
Log:
bug fixing: response elements are now sorted.
Revision Changes Path
1.17 +14 -8
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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XMLResponseBodyAssert.java 8 Aug 2002 14:46:51 -0000 1.16
+++ XMLResponseBodyAssert.java 9 Aug 2002 11:36:13 -0000 1.17
@@ -412,12 +412,11 @@
private String getDisplayName(Element e, String pathName) {
String result = null;
if (getPathName(pathName, e.getName()).equals("/multistatus/response/href")
||
- getPathName(pathName,
e.getName()).equals("/multistatus/response/propstat/prop/workspace-checkout-set/href"))
{
+ getPathName(pathName,
e.getName()).equals("/multistatus/response/propstat/prop/workspace-checkout-set/href"))
{
- result = e.getTextTrim();
- if (result.endsWith("/")){
- result = result.substring(0,result.length()-1);
- }
+ 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 {
result = e.getName();
}
@@ -426,6 +425,13 @@
}
+ private String getHrefNormalised(String pathName) {
+ String result = pathName;
+ if (result.endsWith("/")){
+ result = result.substring(0,result.length()-1);
+ }
+ return result;
+ }
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
