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 2002/08/14 17:36:14 UTC

cvs commit: jakarta-slide/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 PropfindAssert.java ReportAssert.java SearchAssert.java UncheckoutAssert.java UpdateAssert.java VersionControlAssert.java

juergen     2002/08/14 08:36:14

  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
                        PropfindAssert.java ReportAssert.java
                        SearchAssert.java UncheckoutAssert.java
                        UpdateAssert.java VersionControlAssert.java
  Log:
  the response body is checked for all  response codes.
  
  Revision  Changes    Path
  1.5       +10 -12    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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AclAssert.java	19 Jun 2002 07:08:56 -0000	1.4
  +++ AclAssert.java	14 Aug 2002 15:36:13 -0000	1.5
  @@ -97,14 +97,12 @@
        */
       public boolean assertResponseBody(){
           
  -        if (method.getStatusCode() == 204 ||
  -            method.getStatusCode() == 403 ||
  -            method.getStatusCode() == 409 ||
  -            method.getStatusCode() == 423 ||
  -            method.getStatusCode() == 201 ||
  -            method.getStatusCode() == 412  ){
  -            return true;
  -        }
  +//      if (method.getStatusCode() == 204 ||
  +//          method.getStatusCode() == 423 ||
  +//          method.getStatusCode() == 404 ||
  +//          method.getStatusCode() == 201  ){
  +//          return true;
  +//      }
           
           return super.assertResponseBody();
       }
  
  
  
  1.5       +12 -12    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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CheckinAssert.java	19 Jun 2002 07:08:56 -0000	1.4
  +++ CheckinAssert.java	14 Aug 2002 15:36:13 -0000	1.5
  @@ -97,14 +97,14 @@
        */
       public boolean assertResponseBody(){
           
  -        if (method.getStatusCode() == 204 ||
  -            method.getStatusCode() == 403 ||
  -            method.getStatusCode() == 409 ||
  -            method.getStatusCode() == 423 ||
  -            method.getStatusCode() == 201 ||
  -            method.getStatusCode() == 412  ){
  -            return true;
  -        }
  +//      if (method.getStatusCode() == 204 ||
  +//          method.getStatusCode() == 403 ||
  +//          method.getStatusCode() == 409 ||
  +//          method.getStatusCode() == 423 ||
  +//          method.getStatusCode() == 201 ||
  +//          method.getStatusCode() == 412  ){
  +//          return true;
  +//      }
           
           return super.assertResponseBody();
       }
  
  
  
  1.5       +12 -12    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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CheckoutAssert.java	19 Jun 2002 07:08:56 -0000	1.4
  +++ CheckoutAssert.java	14 Aug 2002 15:36:13 -0000	1.5
  @@ -97,14 +97,14 @@
        */
       public boolean assertResponseBody(){
           
  -        if (method.getStatusCode() == 204 ||
  -            method.getStatusCode() == 403 ||
  -            method.getStatusCode() == 409 ||
  -            method.getStatusCode() == 423 ||
  -            method.getStatusCode() == 201 ||
  -            method.getStatusCode() == 412  ){
  -            return true;
  -        }
  +//      if (method.getStatusCode() == 204 ||
  +//          method.getStatusCode() == 403 ||
  +//          method.getStatusCode() == 409 ||
  +//          method.getStatusCode() == 423 ||
  +//          method.getStatusCode() == 201 ||
  +//          method.getStatusCode() == 412  ){
  +//          return true;
  +//      }
           
           return super.assertResponseBody();
       }
  
  
  
  1.5       +12 -12    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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CopyAssert.java	19 Jun 2002 07:08:56 -0000	1.4
  +++ CopyAssert.java	14 Aug 2002 15:36:13 -0000	1.5
  @@ -95,14 +95,14 @@
        */
       public boolean assertResponseBody(){
           
  -        if (method.getStatusCode() == 204 ||
  -            method.getStatusCode() == 403 ||
  -            method.getStatusCode() == 409 ||
  -            method.getStatusCode() == 423 ||
  -            method.getStatusCode() == 201 ||
  -            method.getStatusCode() == 412  ){
  -            return true;
  -        }
  +//      if (method.getStatusCode() == 204 ||
  +//          method.getStatusCode() == 403 ||
  +//          method.getStatusCode() == 409 ||
  +//          method.getStatusCode() == 423 ||
  +//          method.getStatusCode() == 201 ||
  +//          method.getStatusCode() == 412  ){
  +//          return true;
  +//      }
           
           return super.assertResponseBody();
       }
  
  
  
  1.5       +9 -10     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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DeleteAssert.java	19 Jun 2002 07:08:56 -0000	1.4
  +++ DeleteAssert.java	14 Aug 2002 15:36:13 -0000	1.5
  @@ -97,12 +97,11 @@
       public boolean assertResponseBody(){
   
           
  -        if (method.getStatusCode() == 204 ||
  -            method.getStatusCode() == 404 ||
  -            method.getStatusCode() == 409 ||
  -            method.getStatusCode() == 423 ){
  -            return true;
  -        }
  +//      if (method.getStatusCode() == 204 ||
  +//          method.getStatusCode() == 404 ||
  +//          method.getStatusCode() == 423 ){
  +//          return true;
  +//      }
           
           return super.assertResponseBody();
       }
  
  
  
  1.6       +12 -12    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- GetAssert.java	19 Jun 2002 07:08:56 -0000	1.5
  +++ GetAssert.java	14 Aug 2002 15:36:13 -0000	1.6
  @@ -98,14 +98,14 @@
        */
       public boolean assertResponseBody(){
           
  -        if (method.getStatusCode() == 204 ||
  -            method.getStatusCode() == 403 ||
  -            method.getStatusCode() == 409 ||
  -            method.getStatusCode() == 423 ||
  -            method.getStatusCode() == 201 ||
  -            method.getStatusCode() == 412  ){
  -            return true;
  -        }
  +//      if (method.getStatusCode() == 204 ||
  +//          method.getStatusCode() == 403 ||
  +//          method.getStatusCode() == 409 ||
  +//          method.getStatusCode() == 423 ||
  +//          method.getStatusCode() == 201 ||
  +//          method.getStatusCode() == 412  ){
  +//          return true;
  +//      }
           
           return super.assertResponseBody();
       }
  
  
  
  1.3       +12 -12    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- GetXMLAssert.java	19 Jun 2002 07:08:56 -0000	1.2
  +++ GetXMLAssert.java	14 Aug 2002 15:36:13 -0000	1.3
  @@ -98,14 +98,14 @@
        */
       public boolean assertResponseBody(){
           
  -        if (method.getStatusCode() == 204 ||
  -            method.getStatusCode() == 403 ||
  -            method.getStatusCode() == 409 ||
  -            method.getStatusCode() == 423 ||
  -            method.getStatusCode() == 201 ||
  -            method.getStatusCode() == 412  ){
  -            return true;
  -        }
  +//      if (method.getStatusCode() == 204 ||
  +//          method.getStatusCode() == 403 ||
  +//          method.getStatusCode() == 409 ||
  +//          method.getStatusCode() == 423 ||
  +//          method.getStatusCode() == 201 ||
  +//          method.getStatusCode() == 412  ){
  +//          return true;
  +//      }
           
           return super.assertResponseBody();
       }
  
  
  
  1.4       +10 -10    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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LabelAssert.java	2 Aug 2002 11:27:46 -0000	1.3
  +++ LabelAssert.java	14 Aug 2002 15:36:13 -0000	1.4
  @@ -97,12 +97,12 @@
        */
       public boolean assertResponseBody(){
           
  -        if (method.getStatusCode() == 204 ||
  -            method.getStatusCode() == 423 ||
  -            method.getStatusCode() == 201 ||
  -            method.getStatusCode() == 412  ){
  -            return true;
  -        }
  +//      if (method.getStatusCode() == 204 ||
  +//          method.getStatusCode() == 423 ||
  +//          method.getStatusCode() == 201 ||
  +//          method.getStatusCode() == 412  ){
  +//          return true;
  +//      }
           
           return super.assertResponseBody();
       }
  
  
  
  1.7       +8 -8      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LockAssert.java	19 Jun 2002 07:08:56 -0000	1.6
  +++ LockAssert.java	14 Aug 2002 15:36:13 -0000	1.7
  @@ -92,10 +92,10 @@
        */
       public boolean assertResponseBody(){
           
  -        if (method.getStatusCode() == 423  ||
  -            method.getStatusCode() == 412  ){
  -            return true;
  -        }
  +//      if (method.getStatusCode() == 423  ||
  +//          method.getStatusCode() == 412  ){
  +//          return true;
  +//      }
           
           return super.assertResponseBody();
       }
  
  
  
  1.6       +10 -10    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MkWorkspaceAssert.java	2 Aug 2002 11:27:46 -0000	1.5
  +++ MkWorkspaceAssert.java	14 Aug 2002 15:36:13 -0000	1.6
  @@ -97,12 +97,12 @@
        */
       public boolean assertResponseBody(){
           
  -        if (method.getStatusCode() == 204 ||
  -            method.getStatusCode() == 423 ||
  -            method.getStatusCode() == 201 ||
  -            method.getStatusCode() == 412  ){
  -            return true;
  -        }
  +//      if (method.getStatusCode() == 204 ||
  +//          method.getStatusCode() == 423 ||
  +//          method.getStatusCode() == 201 ||
  +//          method.getStatusCode() == 412  ){
  +//          return true;
  +//      }
           
           return super.assertResponseBody();
       }
  
  
  
  1.6       +10 -10    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MoveAssert.java	2 Aug 2002 11:27:46 -0000	1.5
  +++ MoveAssert.java	14 Aug 2002 15:36:13 -0000	1.6
  @@ -97,12 +97,12 @@
        */
       public boolean assertResponseBody(){
           
  -        if (method.getStatusCode() == 204 ||
  -            method.getStatusCode() == 423 ||
  -            method.getStatusCode() == 201 ||
  -            method.getStatusCode() == 412  ){
  -            return true;
  -        }
  +//      if (method.getStatusCode() == 204 ||
  +//          method.getStatusCode() == 423 ||
  +//          method.getStatusCode() == 201 ||
  +//          method.getStatusCode() == 412  ){
  +//          return true;
  +//      }
           
           return super.assertResponseBody();
       }
  
  
  
  1.8       +12 -12    jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/PropfindAssert.java
  
  Index: PropfindAssert.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/PropfindAssert.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- PropfindAssert.java	8 Aug 2002 10:40:45 -0000	1.7
  +++ PropfindAssert.java	14 Aug 2002 15:36:13 -0000	1.8
  @@ -116,14 +116,14 @@
        */
       public boolean assertResponseBody(){
   
  -        // some response codes do not deliver a body
  -        if (method.getStatusCode() == 204 ||
  -            method.getStatusCode() == 404 ||
  -            method.getStatusCode() == 409 ||
  -            method.getStatusCode() == 403 ||
  -            method.getStatusCode() == 423 ){
  -            return true;
  -        }
  +//      // some response codes do not deliver a body
  +//      if (method.getStatusCode() == 204 ||
  +//          method.getStatusCode() == 404 ||
  +//          method.getStatusCode() == 409 ||
  +//          method.getStatusCode() == 403 ||
  +//          method.getStatusCode() == 423 ){
  +//          return true;
  +//      }
           
           return super.assertResponseBody();
       }
  
  
  
  1.6       +10 -10    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ReportAssert.java	2 Aug 2002 11:27:46 -0000	1.5
  +++ ReportAssert.java	14 Aug 2002 15:36:13 -0000	1.6
  @@ -97,12 +97,12 @@
        */
       public boolean assertResponseBody(){
           
  -        if (method.getStatusCode() == 204 ||
  -            method.getStatusCode() == 423 ||
  -            method.getStatusCode() == 201 ||
  -            method.getStatusCode() == 412  ){
  -            return true;
  -        }
  +//      if (method.getStatusCode() == 204 ||
  +//          method.getStatusCode() == 423 ||
  +//          method.getStatusCode() == 201 ||
  +//          method.getStatusCode() == 412  ){
  +//          return true;
  +//      }
           
           return super.assertResponseBody();
       }
  
  
  
  1.6       +11 -11    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SearchAssert.java	2 Aug 2002 11:27:46 -0000	1.5
  +++ SearchAssert.java	14 Aug 2002 15:36:13 -0000	1.6
  @@ -97,13 +97,13 @@
        */
       public boolean assertResponseBody(){
           
  -        if (method.getStatusCode() == 204 ||
  -            method.getStatusCode() == 423 ||
  -            method.getStatusCode() == 201 ||
  -            method.getStatusCode() == 422 ||
  -            method.getStatusCode() == 412  ){
  -            return true;
  -        }
  +//      if (method.getStatusCode() == 204 ||
  +//          method.getStatusCode() == 423 ||
  +//          method.getStatusCode() == 201 ||
  +//          method.getStatusCode() == 422 ||
  +//          method.getStatusCode() == 412  ){
  +//          return true;
  +//      }
           
           return super.assertResponseBody();
       }
  
  
  
  1.6       +10 -10    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- UncheckoutAssert.java	2 Aug 2002 11:27:46 -0000	1.5
  +++ UncheckoutAssert.java	14 Aug 2002 15:36:13 -0000	1.6
  @@ -97,12 +97,12 @@
        */
       public boolean assertResponseBody(){
           
  -        if (method.getStatusCode() == 204 ||
  -            method.getStatusCode() == 423 ||
  -            method.getStatusCode() == 201 ||
  -            method.getStatusCode() == 412  ){
  -            return true;
  -        }
  +//      if (method.getStatusCode() == 204 ||
  +//          method.getStatusCode() == 423 ||
  +//          method.getStatusCode() == 201 ||
  +//          method.getStatusCode() == 412  ){
  +//          return true;
  +//      }
           
           return super.assertResponseBody();
       }
  
  
  
  1.2       +12 -12    jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/UpdateAssert.java
  
  Index: UpdateAssert.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/UpdateAssert.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UpdateAssert.java	29 Jul 2002 11:26:29 -0000	1.1
  +++ UpdateAssert.java	14 Aug 2002 15:36:13 -0000	1.2
  @@ -97,14 +97,14 @@
        */
       public boolean assertResponseBody(){
           
  -        if (method.getStatusCode() == 204 ||
  -            method.getStatusCode() == 403 ||
  -            method.getStatusCode() == 409 ||
  -            method.getStatusCode() == 423 ||
  -            method.getStatusCode() == 201 ||
  -            method.getStatusCode() == 412  ){
  -            return true;
  -        }
  +//      if (method.getStatusCode() == 204 ||
  +//          method.getStatusCode() == 403 ||
  +//          method.getStatusCode() == 409 ||
  +//          method.getStatusCode() == 423 ||
  +//          method.getStatusCode() == 201 ||
  +//          method.getStatusCode() == 412  ){
  +//          return true;
  +//      }
            
           return super.assertResponseBody();
       }
  
  
  
  1.5       +12 -12    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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- VersionControlAssert.java	19 Jun 2002 07:08:56 -0000	1.4
  +++ VersionControlAssert.java	14 Aug 2002 15:36:13 -0000	1.5
  @@ -97,14 +97,14 @@
        */
       public boolean assertResponseBody(){
           
  -        if (method.getStatusCode() == 204 ||
  -            method.getStatusCode() == 403 ||
  -            method.getStatusCode() == 409 ||
  -            method.getStatusCode() == 423 ||
  -            method.getStatusCode() == 201 ||
  -            method.getStatusCode() == 412  ){
  -            return true;
  -        }
  +//      if (method.getStatusCode() == 204 ||
  +//          method.getStatusCode() == 403 ||
  +//          method.getStatusCode() == 409 ||
  +//          method.getStatusCode() == 423 ||
  +//          method.getStatusCode() == 201 ||
  +//          method.getStatusCode() == 412  ){
  +//          return true;
  +//      }
           
           return super.assertResponseBody();
       }
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>