juergen 2002/06/19 00:08:57
Modified:
testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor
AclAssert.java CheckinAssert.java
CheckoutAssert.java CopyAssert.java
DeleteAssert.java GetAssert.java GetXMLAssert.java
LabelAssert.java LockAssert.java
MkWorkspaceAssert.java MoveAssert.java
ReportAssert.java ResponseBodyAssert.java
SearchAssert.java StreamResponseBodyAssert.java
TProcessors.java UncheckoutAssert.java
VersionControlAssert.java
XMLResponseBodyAssert.java
Log:
prepare for JDK 1.4 (assert is a keyword). Thanks to cmlenz.
Revision Changes Path
1.4 +6 -6
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/AclAssert.java
Index: AclAssert.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/AclAssert.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AclAssert.java 25 Apr 2002 21:12:29 -0000 1.3
+++ AclAssert.java 19 Jun 2002 07:08:56 -0000 1.4
@@ -95,7 +95,7 @@
/**
* checks if Expected Response and Response bodies are the same
*/
- public boolean assert(){
+ public boolean assertResponseBody(){
if (method.getStatusCode() == 204 ||
method.getStatusCode() == 403 ||
@@ -106,7 +106,7 @@
return true;
}
- return super.assert();
+ return super.assertResponseBody();
}
1.4 +6 -6
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/CheckinAssert.java
Index: CheckinAssert.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/CheckinAssert.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CheckinAssert.java 25 Apr 2002 21:12:29 -0000 1.3
+++ CheckinAssert.java 19 Jun 2002 07:08:56 -0000 1.4
@@ -95,7 +95,7 @@
/**
* checks if Expected Response and Response bodies are the same
*/
- public boolean assert(){
+ public boolean assertResponseBody(){
if (method.getStatusCode() == 204 ||
method.getStatusCode() == 403 ||
@@ -106,7 +106,7 @@
return true;
}
- return super.assert();
+ return super.assertResponseBody();
}
1.4 +6 -6
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/CheckoutAssert.java
Index: CheckoutAssert.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/CheckoutAssert.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CheckoutAssert.java 25 Apr 2002 21:12:29 -0000 1.3
+++ CheckoutAssert.java 19 Jun 2002 07:08:56 -0000 1.4
@@ -95,7 +95,7 @@
/**
* checks if Expected Response and Response bodies are the same
*/
- public boolean assert(){
+ public boolean assertResponseBody(){
if (method.getStatusCode() == 204 ||
method.getStatusCode() == 403 ||
@@ -106,7 +106,7 @@
return true;
}
- return super.assert();
+ return super.assertResponseBody();
}
1.4 +6 -6
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/CopyAssert.java
Index: CopyAssert.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/CopyAssert.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CopyAssert.java 25 Apr 2002 21:12:29 -0000 1.3
+++ CopyAssert.java 19 Jun 2002 07:08:56 -0000 1.4
@@ -93,7 +93,7 @@
/**
* checks if Expected Response and Response are same
*/
- public boolean assert(){
+ public boolean assertResponseBody(){
if (method.getStatusCode() == 204 ||
method.getStatusCode() == 403 ||
@@ -104,7 +104,7 @@
return true;
}
- return super.assert();
+ return super.assertResponseBody();
}
1.4 +6 -6
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/DeleteAssert.java
Index: DeleteAssert.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/DeleteAssert.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DeleteAssert.java 25 Apr 2002 21:12:29 -0000 1.3
+++ DeleteAssert.java 19 Jun 2002 07:08:56 -0000 1.4
@@ -94,7 +94,7 @@
/**
* checks if Expected Response and Response are same
*/
- public boolean assert(){
+ public boolean assertResponseBody(){
if (method.getStatusCode() == 204 ||
@@ -104,7 +104,7 @@
return true;
}
- return super.assert();
+ return super.assertResponseBody();
}
1.5 +6 -6
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/GetAssert.java
Index: GetAssert.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/GetAssert.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GetAssert.java 25 Apr 2002 21:12:29 -0000 1.4
+++ GetAssert.java 19 Jun 2002 07:08:56 -0000 1.5
@@ -96,7 +96,7 @@
/**
* checks if Expected Response and Response are same
*/
- public boolean assert(){
+ public boolean assertResponseBody(){
if (method.getStatusCode() == 204 ||
method.getStatusCode() == 403 ||
@@ -107,7 +107,7 @@
return true;
}
- return super.assert();
+ return super.assertResponseBody();
}
1.2 +6 -6
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/GetXMLAssert.java
Index: GetXMLAssert.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/GetXMLAssert.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GetXMLAssert.java 23 May 2002 15:54:52 -0000 1.1
+++ GetXMLAssert.java 19 Jun 2002 07:08:56 -0000 1.2
@@ -96,7 +96,7 @@
/**
* checks if Expected Response and Response are same
*/
- public boolean assert(){
+ public boolean assertResponseBody(){
if (method.getStatusCode() == 204 ||
method.getStatusCode() == 403 ||
@@ -107,7 +107,7 @@
return true;
}
- return super.assert();
+ return super.assertResponseBody();
}
1.2 +6 -6
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/LabelAssert.java
Index: LabelAssert.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/LabelAssert.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LabelAssert.java 18 Jun 2002 11:26:36 -0000 1.1
+++ LabelAssert.java 19 Jun 2002 07:08:56 -0000 1.2
@@ -95,7 +95,7 @@
/**
* checks if Expected Response and Response bodies are the same
*/
- public boolean assert(){
+ public boolean assertResponseBody(){
if (method.getStatusCode() == 204 ||
method.getStatusCode() == 403 ||
@@ -106,7 +106,7 @@
return true;
}
- return super.assert();
+ return super.assertResponseBody();
}
1.6 +6 -6
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LockAssert.java 25 Apr 2002 21:30:18 -0000 1.5
+++ LockAssert.java 19 Jun 2002 07:08:56 -0000 1.6
@@ -90,14 +90,14 @@
/**
* checks if Expected Response and Response are same
*/
- public boolean assert(){
+ public boolean assertResponseBody(){
if (method.getStatusCode() == 423 ||
method.getStatusCode() == 412 ){
return true;
}
- return super.assert();
+ return super.assertResponseBody();
}
1.4 +6 -6
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/MkWorkspaceAssert.java
Index: MkWorkspaceAssert.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/MkWorkspaceAssert.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MkWorkspaceAssert.java 25 Apr 2002 21:30:18 -0000 1.3
+++ MkWorkspaceAssert.java 19 Jun 2002 07:08:56 -0000 1.4
@@ -95,7 +95,7 @@
/**
* checks if Expected Response and Response bodies are the same
*/
- public boolean assert(){
+ public boolean assertResponseBody(){
if (method.getStatusCode() == 204 ||
method.getStatusCode() == 403 ||
@@ -106,7 +106,7 @@
return true;
}
- return super.assert();
+ return super.assertResponseBody();
}
1.4 +6 -6
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/MoveAssert.java
Index: MoveAssert.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/MoveAssert.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MoveAssert.java 25 Apr 2002 21:30:18 -0000 1.3
+++ MoveAssert.java 19 Jun 2002 07:08:56 -0000 1.4
@@ -95,7 +95,7 @@
/**
* checks if Expected Response and Response are same
*/
- public boolean assert(){
+ public boolean assertResponseBody(){
if (method.getStatusCode() == 204 ||
method.getStatusCode() == 403 ||
@@ -106,7 +106,7 @@
return true;
}
- return super.assert();
+ return super.assertResponseBody();
}
1.4 +6 -6
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/ReportAssert.java
Index: ReportAssert.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/ReportAssert.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ReportAssert.java 25 Apr 2002 21:30:18 -0000 1.3
+++ ReportAssert.java 19 Jun 2002 07:08:56 -0000 1.4
@@ -95,7 +95,7 @@
/**
* checks if Expected Response and Response bodies are the same
*/
- public boolean assert(){
+ public boolean assertResponseBody(){
if (method.getStatusCode() == 204 ||
method.getStatusCode() == 403 ||
@@ -106,7 +106,7 @@
return true;
}
- return super.assert();
+ return super.assertResponseBody();
}
1.4 +5 -5
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/ResponseBodyAssert.java
Index: ResponseBodyAssert.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/ResponseBodyAssert.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResponseBodyAssert.java 25 Apr 2002 21:30:18 -0000 1.3
+++ ResponseBodyAssert.java 19 Jun 2002 07:08:56 -0000 1.4
@@ -98,7 +98,7 @@
/**
* checks if Expected Response and the received Response body are logically
identical
*/
- public abstract boolean assert();
+ public abstract boolean assertResponseBody();
1.4 +6 -6
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/SearchAssert.java
Index: SearchAssert.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/SearchAssert.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SearchAssert.java 25 Apr 2002 21:30:18 -0000 1.3
+++ SearchAssert.java 19 Jun 2002 07:08:56 -0000 1.4
@@ -95,7 +95,7 @@
/**
* checks if Expected Response and Response bodies are the same
*/
- public boolean assert(){
+ public boolean assertResponseBody(){
if (method.getStatusCode() == 204 ||
method.getStatusCode() == 403 ||
@@ -107,7 +107,7 @@
return true;
}
- return super.assert();
+ return super.assertResponseBody();
}
1.7 +5 -5
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/StreamResponseBodyAssert.java
Index: StreamResponseBodyAssert.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/StreamResponseBodyAssert.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StreamResponseBodyAssert.java 23 May 2002 15:54:52 -0000 1.6
+++ StreamResponseBodyAssert.java 19 Jun 2002 07:08:56 -0000 1.7
@@ -120,7 +120,7 @@
/**
* checks if Expected Response and Response are same
*/
- public boolean assert(){
+ public boolean assertResponseBody(){
if (method.getStatusCode() < 200 || method.getStatusCode() > 300 ){
return true;
}
1.24 +5 -5
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/TProcessors.java
Index: TProcessors.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/TProcessors.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- TProcessors.java 18 Jun 2002 11:26:36 -0000 1.23
+++ TProcessors.java 19 Jun 2002 07:08:56 -0000 1.24
@@ -872,7 +872,7 @@
expectedResponseCodes.contains(new Integer(404)))
||
responseHeaderAssert(m, elt, header);
- firstPart = (methodAssert!=null)?methodAssert.assert():true;
+ firstPart = (methodAssert!=null)?methodAssert.assertResponseBody():true;
return ( firstPart && secondPart);
1.4 +6 -6
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/UncheckoutAssert.java
Index: UncheckoutAssert.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/UncheckoutAssert.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UncheckoutAssert.java 25 Apr 2002 21:15:13 -0000 1.3
+++ UncheckoutAssert.java 19 Jun 2002 07:08:56 -0000 1.4
@@ -95,7 +95,7 @@
/**
* checks if Expected Response and Response bodies are the same
*/
- public boolean assert(){
+ public boolean assertResponseBody(){
if (method.getStatusCode() == 204 ||
method.getStatusCode() == 403 ||
@@ -106,7 +106,7 @@
return true;
}
- return super.assert();
+ return super.assertResponseBody();
}
1.4 +6 -6
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/VersionControlAssert.java
Index: VersionControlAssert.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/VersionControlAssert.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VersionControlAssert.java 25 Apr 2002 21:15:13 -0000 1.3
+++ VersionControlAssert.java 19 Jun 2002 07:08:56 -0000 1.4
@@ -95,7 +95,7 @@
/**
* checks if Expected Response and Response bodies are the same
*/
- public boolean assert(){
+ public boolean assertResponseBody(){
if (method.getStatusCode() == 204 ||
method.getStatusCode() == 403 ||
@@ -106,7 +106,7 @@
return true;
}
- return super.assert();
+ return super.assertResponseBody();
}
1.9 +4 -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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XMLResponseBodyAssert.java 23 May 2002 13:28:03 -0000 1.8
+++ XMLResponseBodyAssert.java 19 Jun 2002 07:08:56 -0000 1.9
@@ -123,7 +123,7 @@
/**
* checks if Expected Response and Response are same
*/
- public boolean assert(){
+ public boolean assertResponseBody(){
if (method.getStatusCode() == 409 ){ // 409/conflict never delievers a XML
body
return true;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
