juergen 02/01/28 07:28:32
Modified:
testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor
XMLResponseBodyAssert.java LockAssert.java
Log:
RFC2518 is vague about infinity should be spelled (with capital or small I). So call
equalsIgnoreCase in case of depth.
Revision Changes Path
1.2 +9 -3
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLResponseBodyAssert.java 20 Nov 2001 14:35:31 -0000 1.1
+++ XMLResponseBodyAssert.java 28 Jan 2002 15:28:32 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/XMLResponseBodyAssert.java,v
1.1 2001/11/20 14:35:31 juergen Exp $
- * $Revision: 1.1 $
- * $Date: 2001/11/20 14:35:31 $
+ * $Header:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/XMLResponseBodyAssert.java,v
1.2 2002/01/28 15:28:32 juergen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/28 15:28:32 $
*
* ====================================================================
*
@@ -318,7 +318,8 @@
}
// now perform the check and print out the error message
- if (!expectedValue.equals(receivedValue) && !expectedValue.equals("*")){
+ if (!expectedValue.equals("*") &&
+ !doCompareValues(getPathName(path, name), expectedValue, receivedValue)
){
xmlresult.writeElementStart("XMLValueError");
xmlresult.writeElement("path", getPathName(path, name));
xmlresult.writeElement("expectedValue", expectedValue);
@@ -327,6 +328,11 @@
return false;
}
return result;
+ }
+
+
+ public boolean doCompareValues(String path, String received, String expected){
+ return expected.equals(received);
}
1.3 +17 -4
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/LockAssert.java
Index: LockAssert.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/LockAssert.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LockAssert.java 21 Jan 2002 18:27:43 -0000 1.2
+++ LockAssert.java 28 Jan 2002 15:28:32 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/LockAssert.java,v
1.2 2002/01/21 18:27:43 juergen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/01/21 18:27:43 $
+ * $Header:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/LockAssert.java,v
1.3 2002/01/28 15:28:32 juergen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/01/28 15:28:32 $
*
* ====================================================================
*
@@ -75,7 +75,7 @@
* Perform the necessary checks for the received and expected Lock body
*
* @author Software AG
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class LockAssert extends XMLResponseBodyAssert {
@@ -98,6 +98,19 @@
}
return super.assert();
+ }
+
+
+
+ public boolean doCompareValues(String path, String received, String expected){
+ boolean result;
+ if (path.equals("/prop/lockdiscovery/activelock/depth")) {
+ result = expected.equalsIgnoreCase(received);
+ }
+ else {
+ result = expected.equals(received);
+ }
+ return result;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
