juergen 2002/07/29 04:26:29
Modified:
testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor
TProcessors.java
Added:
testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor
UpdateAssert.java
Log:
added the update method.
Revision Changes Path
1.26 +9 -4
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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- TProcessors.java 25 Jun 2002 12:34:02 -0000 1.25
+++ TProcessors.java 29 Jul 2002 11:26:29 -0000 1.26
@@ -1300,6 +1300,8 @@
result = new UncheckoutAssert ((XMLResponseMethodBase) m,
expectedResponseAsDOM(expectedResponse), xdavConfiguration, xmlresult);
} else if (m instanceof VersionControlMethod){
result = new VersionControlAssert ((XMLResponseMethodBase) m,
expectedResponseAsDOM(expectedResponse), xdavConfiguration, xmlresult);
+ } else if (m instanceof UpdateMethod){
+ result = new UpdateAssert ((XMLResponseMethodBase) m,
expectedResponseAsDOM(expectedResponse), xdavConfiguration, xmlresult);
} else if (m instanceof GetMethod){
if (!m.getHeader("Content-Type").getValue().equals("text/xml")) {
result = new GetAssert ( m,
expectedResponseAsStream(expectedResponse), xdavConfiguration, xmlresult);
@@ -1387,6 +1389,9 @@
}
else if(methodName.equalsIgnoreCase("VERSION-CONTROL")){
result = new VersionControlMethod();
+ }
+ else if(methodName.equalsIgnoreCase("UPDATE")){
+ result = new UpdateMethod();
}
if (result == null)
throw new Exception("Method " + methodName + " does not exist");
1.1
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/UpdateAssert.java
Index: UpdateAssert.java
===================================================================
/*
* $Header:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/UpdateAssert.java,v
1.1 2002/07/29 11:26:29 juergen Exp $
* $Revision: 1.1 $
* $Date: 2002/07/29 11:26:29 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Slide", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* [Additional notices, if required by prior licensing conditions]
*
*/
package org.apache.slide.testsuite.testtools.tprocessor;
// Slide
import org.apache.webdav.lib.methods.XMLResponseMethodBase;
// jdom
import org.jdom.Element;
//test package
import org.apache.slide.testsuite.testtools.tutil.*;
/**
* Perform the necessary checks for the received and expected ACL body
*
* @author Software AG
* @version $Revision: 1.1 $
*/
public class UpdateAssert extends XMLResponseBodyAssert {
/** constructor
*/
public UpdateAssert(XMLResponseMethodBase method, Element elt, XConf xconf,
XMLOutput xmlresult){
super(method, elt, xconf, xmlresult);
}
/**
* checks if Expected Response and Response bodies are the same
*/
public boolean assertResponseBody(){
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: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>