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/11/27 14:47:03 UTC
cvs commit: jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor XMLStreamResponseBodyAssert.java XMLResponseBodyAssert.java XMLOutput.java VersionControlAssert.java UpdateAssert.java UncheckoutAssert.java TProcessors.java StringResponseBodyAssert.java StreamResponseBodyAssert.java SearchAssert.java ResponseBodyAssert.java ReportAssert.java PropPatchAssert.java PropfindAssert.java MoveAssert.java MkWorkspaceAssert.java LockAssert.java LabelAssert.java GetXMLAssert.java GetAssert.java DeleteAssert.java CopyAssert.java CheckoutAssert.java CheckinAssert.java AclAssert.java
juergen 2002/11/27 05:47:03
Modified: testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor
XMLStreamResponseBodyAssert.java
XMLResponseBodyAssert.java XMLOutput.java
VersionControlAssert.java UpdateAssert.java
UncheckoutAssert.java TProcessors.java
StringResponseBodyAssert.java
StreamResponseBodyAssert.java SearchAssert.java
ResponseBodyAssert.java ReportAssert.java
PropPatchAssert.java PropfindAssert.java
MoveAssert.java MkWorkspaceAssert.java
LockAssert.java LabelAssert.java GetXMLAssert.java
GetAssert.java DeleteAssert.java CopyAssert.java
CheckoutAssert.java CheckinAssert.java
AclAssert.java
Log:
Handle the case: multiple response code are expected, some deliver a body some do not. do not create an error in this case.
Revision Changes Path
1.6 +39 -43 jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/XMLStreamResponseBodyAssert.java
Index: XMLStreamResponseBodyAssert.java
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/XMLStreamResponseBodyAssert.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLStreamResponseBodyAssert.java 19 Aug 2002 11:12:17 -0000 1.5
+++ XMLStreamResponseBodyAssert.java 27 Nov 2002 13:47:02 -0000 1.6
@@ -64,20 +64,16 @@
package org.apache.slide.testsuite.testtools.tprocessor;
//java
-import java.io.*;
-import java.util.*;
-
-// Slide
-import org.apache.webdav.lib.methods.*;
-import org.apache.commons.httpclient.*;
-
-// JDOM
-import org.jdom.input.*;
-import org.jdom.output.*;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
import org.jdom.JDOMException;
-
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
+import org.jdom.input.SAXBuilder;
+import org.jdom.output.XMLOutputter;
@@ -88,23 +84,23 @@
* @version $Revision$
*/
public abstract class XMLStreamResponseBodyAssert extends StringResponseBodyAssert {
-
-
-
-
+
+
+
+
/** constructer
* @param WebdavMethodBase Element
*/
- public XMLStreamResponseBodyAssert(HttpMethod method, InputStream expectedBody, XConf xconf, XMLOutput xmlresult){
- super(method, expectedBody, xconf, xmlresult);
+ public XMLStreamResponseBodyAssert(HttpMethod method, InputStream expectedBody, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, expectedBody, xconf, xmlresult, expectedResponseCodes);
}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
/**
* checks if Expected and the received Response bodies are identical
*/
@@ -115,13 +111,13 @@
{
receivedCopy = readFromStream(receivedBody);
expectedCopy = readFromStream(expectedBody);
-
+
// copare on a string base
String received = new XMLOutputter("", false, "UTF-8").outputString(new SAXBuilder().build(new ByteArrayInputStream(receivedCopy)));
String expected = new XMLOutputter("", false, "UTF-8").outputString(new SAXBuilder().build(new ByteArrayInputStream(expectedCopy)));
return super.compareStrings(received, expected);
}
-
+
catch (JDOMException e) {
// if not XML compare it on a binary base
return super.compareStreams(new ByteArrayInputStream(receivedCopy),
@@ -131,17 +127,17 @@
e.printStackTrace();
xmlresult.writeException(e);
}
-
+
// return false in case of an exception
return false;
}
-
+
// -------------------------------------------------------- Private Methods
-
-
+
+
private static final int CHUNK = 1024*4;
-
-
+
+
/**
* Read the data from the stream and return the result in a byte array.
* Return null in case of an error.
@@ -155,7 +151,7 @@
int i;
int max;
int ofs;
-
+
allLen = 0;
chunk = new byte[CHUNK];
chunkLen = inputStream.read(chunk);
@@ -167,7 +163,7 @@
chunk = new byte[CHUNK];
chunkLen = inputStream.read(chunk);
}
-
+
all = new byte[allLen];
ofs = 0;
max = chunks.size();
@@ -179,8 +175,8 @@
}
return all;
}
-
-
-
+
+
+
}
1.18 +193 -155 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XMLResponseBodyAssert.java 9 Aug 2002 11:36:13 -0000 1.17
+++ XMLResponseBodyAssert.java 27 Nov 2002 13:47:02 -0000 1.18
@@ -64,37 +64,40 @@
package org.apache.slide.testsuite.testtools.tprocessor;
//java
-import java.io.*;
-import java.util.*;
-// Slide
-import org.apache.webdav.lib.methods.*;
-// jdom
-import org.jdom.*;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
+import org.apache.webdav.lib.methods.XMLResponseMethodBase;
+import org.jdom.Element;
public abstract class XMLResponseBodyAssert extends ResponseBodyAssert {
-
-
-
+
+ // debugging purpose only
+ private boolean extendedPrintlnRequest = false;
+
+
protected XMLResponseMethodBase method;
protected Element expectedXmlTree;
-
+
/** constructer
* @param WebdavMethodBase Element
*/
- public XMLResponseBodyAssert(XMLResponseMethodBase method, Element expectedXmlTree, XConf xconf, XMLOutput xmlresult){
-
- super(xconf, method.getName(), xmlresult);
+ public XMLResponseBodyAssert(XMLResponseMethodBase method, Element expectedXmlTree, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+
+ super(xconf, method.getName(), xmlresult, expectedResponseCodes);
this.method = method;
this.expectedXmlTree = expectedXmlTree;
-
+ this.expectedXmlTree = expectedXmlTree;
+
}
-
-
-
+
+
+
//
//
public org.jdom.Document responseDocument(){
@@ -108,8 +111,8 @@
}
return jdom;
}
-
-
+
+
/**
* checks if Expected Response and Response are same
*/
@@ -119,62 +122,71 @@
if ((expectedXmlTree == null) &&
((responseDocument() == null) || responseDocument().getRootElement() == null) )
return true;
-
-// // some debugging output
-// // START
-// System.out.println("#########################");
-// System.out.println("####### method = " + method.getName());
-// System.out.println("####### expected ########");
-// if (expectedXmlTree != null)
-// System.out.println(TProcessors.getElementString(expectedXmlTree));
-// else
-// System.out.println("####### NOT PRESENT");
-// System.out.println("####### received ########");
-// if (responseDocument() != null && responseDocument().getRootElement() != null)
-// System.out.println(TProcessors.getElementString(responseDocument().getRootElement()));
-// else
-// System.out.println("####### NOT PRESENT");
-// System.out.println("#########################");
-// System.out.println();
-// // STOP
-// // some debugging output
-
-
-
- // check if either expected and received bodies are not available
- if (expectedXmlTree == null ||
- responseDocument() == null ||
- responseDocument().getRootElement()== null) {
-
- xmlresult.writeElementStart("XMLValueError");
- xmlresult.writeElement("expectedValue", expectedXmlTree==null?"not present":"present");
- xmlresult.writeElement("receivedValue", responseDocument()==null?"not present":"present");
- xmlresult.writeElementEnd("XMLValueError");
-
- return false;
+
+
+ if (extendedPrintlnRequest) {
+ // some debugging output
+ // START
+ System.out.println("#########################");
+ System.out.println("####### method = " + method.getName() +
+ " response received = " + method.getStatusCode() +
+ " expected = " + listToString(expectedResponseCodes));
+ System.out.println("####### expected ########");
+ if (expectedXmlTree != null)
+ System.out.println(TProcessors.getElementString(expectedXmlTree));
+ else
+ System.out.println("####### NOT PRESENT");
+ System.out.println("####### received ########");
+ if (responseDocument() != null && responseDocument().getRootElement() != null)
+ System.out.println(TProcessors.getElementString(responseDocument().getRootElement()));
+ else
+ System.out.println("####### NOT PRESENT");
+ System.out.println("#########################");
+ System.out.println();
+ // STOP
+ // some debugging output
}
-
+
+
+
+ // check if either expected and received bodies are not available and
+ // the expected response code list does not contain more than one response code
+ if ( (expectedXmlTree == null ||
+ responseDocument() == null ||
+ responseDocument().getRootElement()== null)) {
+
+ if (expectedResponseCodes.size() <= 1) {
+ xmlresult.writeElementStart("XMLValueError");
+ xmlresult.writeElement("expectedValue", expectedXmlTree==null?"not present":"present");
+ xmlresult.writeElement("receivedValue", responseDocument()==null?"not present":"present");
+ xmlresult.writeElementEnd("XMLValueError");
+ return false;
+ }
+
+ return true;
+ }
+
// both expected and received bodies are now available
return compareTrees(expectedXmlTree, responseDocument().getRootElement());
}
-
-
-
-
-
+
+
+
+
+
public boolean compareTrees(Element element1, Element element2) {
return compareTrees("", element1, element2);
}
-
-
-
+
+
+
private boolean compareTrees(String pathName, Element element1, Element element2) {
boolean result = true;
-
-
-// System.out.println("########## comparing now " + element1 + " with " + element2);
-
-
+
+
+ // System.out.println("########## comparing now " + element1 + " with " + element2);
+
+
// check the name of the element
if (!element1.getName().equals(element2.getName())){
xmlresult.writeElementStart("XMLNameError");
@@ -184,21 +196,21 @@
xmlresult.writeElementEnd("XMLNameError");
result = false;
}
-
+
String elementName = element1.getName();
-
+
// check the value of the element
if (!compareValues(pathName, elementName, element1.getText(), element2.getText())) {
result = false;
}
-
+
// now check the children
List children1 = sort(element1.getChildren(), getPathName(pathName, elementName));
List children2 = sort(element2.getChildren(), getPathName(pathName, elementName));
-
-
-
+
+
+
// check the count of children
if (children1.size() != children2.size()){
reportDifferentSizeError(children1, children2, pathName, elementName);
@@ -206,7 +218,7 @@
children2 = repairElementList(children2, children1, getPathName(pathName, elementName));
children1 = children1Result;
}
-
+
// check if repair was sucessfull
if (children1.size() != children2.size()){
return false;
@@ -225,25 +237,25 @@
System.out.println("###################");
}
}
-
+
return result;
}
-
+
private void reportDifferentSizeError(List expected, List received, String path, String name) {
String pathName = getPathName(path, name);
List expectedAndNotReceived = getChildNames(expected, pathName);
List receivedAndNotExpected = getChildNames(received, pathName);
expectedAndNotReceived.removeAll(getChildNames(received, pathName));
receivedAndNotExpected.removeAll(getChildNames(expected, pathName));
-
+
List illegalElements = new ArrayList(expectedAndNotReceived);
illegalElements.addAll(receivedAndNotExpected);
illegalElements = removeLegalNamesFromList(pathName, illegalElements);
-
+
if (illegalElements.size() > 0 ||
repairElementList(expected, received, pathName).size() !=
repairElementList(received, expected, pathName).size()) {
-
+
xmlresult.writeElementStart("XMLSizeError");
xmlresult.writeElement("path", pathName);
xmlresult.writeElement("expectedSize", expected.size());
@@ -261,44 +273,44 @@
xmlresult.writeElementEnd("XMLSizeError");
}
}
-
-
+
+
private List repairElementList(List list1, List list2, String pathName) {
List result = list1;
-
-
+
+
List elementNamesToBeRemoved = getChildNames(list2, pathName);
elementNamesToBeRemoved.removeAll(getChildNames(list1, pathName));
result = elementsMinusDisplaynames(result, elementNamesToBeRemoved, pathName);
-
-//System.out.println("############# list1 " + list1);
-//System.out.println("############# list2 " + list2);
-//System.out.println("############# Set1 " + getChildNames(list1, pathName));
-//System.out.println("############# Set2 " + getChildNames(list2, pathName));
-//System.out.println("############# to remove " + elementNamesToBeRemoved);
-//List res = getChildNames(list1, pathName);
-//res.removeAll(elementNamesToBeRemoved);
-//System.out.println("############# expected " + res);
-//System.out.println("############# result " + result);
-
-
+
+ //System.out.println("############# list1 " + list1);
+ //System.out.println("############# list2 " + list2);
+ //System.out.println("############# Set1 " + getChildNames(list1, pathName));
+ //System.out.println("############# Set2 " + getChildNames(list2, pathName));
+ //System.out.println("############# to remove " + elementNamesToBeRemoved);
+ //List res = getChildNames(list1, pathName);
+ //res.removeAll(elementNamesToBeRemoved);
+ //System.out.println("############# expected " + res);
+ //System.out.println("############# result " + result);
+
+
List onlyLegalNames = removeLegalNamesFromList(pathName, getChildNames(result, pathName));
result = elementsRetainDisplaynames(result, onlyLegalNames, pathName);
result = sort(result, pathName);
-
-//System.out.println("#### repaired list = " + getChildNames(result, pathName));
-
- return result;
-
- }
-
-
-
-
+
+ //System.out.println("#### repaired list = " + getChildNames(result, pathName));
+
+ return result;
+
+ }
+
+
+
+
private boolean existsInConfig(String path, String name) {
return this.configuration.contains(getPathName(path, name)) || this.configuration.contains("//"+name);
}
-
+
private List removeLegalNamesFromList(String path, List names) {
List result = new ArrayList(names);
Iterator iter = names.iterator();
@@ -310,8 +322,8 @@
}
return result;
}
-
-
+
+
private Integer getSingleResponseCode(List codes) {
Integer result = null;
if (codes.size() == 1) {
@@ -320,18 +332,18 @@
}
return result;
}
-
-
+
+
public boolean compareValues(String path, String name, String expectedValue, String receivedValue) {
boolean result = true;
-
+
// check now if this name is excluded from checking
if (existsInConfig(path, name)) {
return true;
}
-
+
if (expectedValue.trim().equals("") && expectedValue.trim().equals(receivedValue.trim())) return true;
-
+
// hard coded for now, should be configurable in the config file:
// allow multiple response codes to be checked against
if (getPathName(path, name).equals("/multistatus/response/status")) {
@@ -343,8 +355,8 @@
if (receivedResponseCode != null &&
expectedResponseCodes.contains(receivedResponseCode)) return true;
}
-
-
+
+
// hard coded for now, should be configurable in the config file:
// allow multiple response codes to be checked against
if (getPathName(path, name).equals("/multistatus/response/propstat/status")) {
@@ -356,7 +368,7 @@
if (receivedResponseCode != null &&
expectedResponseCodes.contains(receivedResponseCode)) return true;
}
-
+
// now perform the check and print out the error message
if (!expectedValue.equals("*") &&
!doCompareValues(getPathName(path, name), expectedValue, receivedValue) ){
@@ -369,17 +381,17 @@
}
return result;
}
-
-
+
+
public boolean doCompareValues(String path, String received, String expected){
return expected.equals(received);
}
-
-
+
+
private List getChildNames(Element e, String pathName) {
return getChildNames(e.getChildren(), pathName);
}
-
+
private List getChildNames(List l, String pathName) {
List result = new ArrayList();
Iterator iter = l.iterator();
@@ -388,31 +400,31 @@
}
return result;
}
-
-
+
+
private String getPathName(String path, String element) {
return path + "/" + element;
}
-
-
+
+
private String getPathName(String path, Element element) {
return getPathName(path, element.getName());
}
-
-
+
+
private List sort(List l, String pathName) {
List result = new ArrayList(l);
Collections.sort(result, new ElementComparator(pathName));
return result;
}
-
-
-
-
+
+
+
+
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 = getHrefNormalised(e.getTextTrim());
} else if (getPathName(pathName, e.getName()).equals("/multistatus/response") && e.getChild("href", e.getNamespace()) != null) {
@@ -420,11 +432,11 @@
} else {
result = e.getName();
}
-//System.out.println("##### get display name " + getPathName(pathName, e.getName()) + " --> " + result);
+ //System.out.println("##### get display name " + getPathName(pathName, e.getName()) + " --> " + result);
return result;
}
-
-
+
+
private String getHrefNormalised(String pathName) {
String result = pathName;
if (result.endsWith("/")){
@@ -432,9 +444,9 @@
}
return result;
}
-
-
-
+
+
+
private List elementsMinusDisplaynames(List elementList, List displayNames, String pathName) {
List result = new ArrayList(elementList);
Iterator iter = elementList.iterator();
@@ -446,10 +458,10 @@
}
return result;
}
-
-
-
-
+
+
+
+
private List elementsRetainDisplaynames(List elementList, List displayNames, String pathName) {
List result = new ArrayList();
Iterator iter = elementList.iterator();
@@ -461,10 +473,36 @@
}
return result;
}
-
-
-
-
+
+
+ private String listToString(List list) {
+ String result = null;
+ Iterator iter = list.iterator();
+ while (iter.hasNext()){
+ Object o = iter.next();
+ String s = null;
+ if (o instanceof String) {
+ s = (String)o;
+ }
+ else if(o instanceof Integer) {
+ s = ((Integer)o).toString();
+ }
+ else {
+ s = o.toString();
+ }
+ if (result != null) {
+ result += ", " + s;
+ }
+ else {
+ result = s;
+ }
+ }
+ return result;
+ }
+
+
+
+
/**************************************************************/
/* Inner class to help to create a suitable comparator */
/**************************************************************/
@@ -479,11 +517,11 @@
return (s1.compareTo(s2));
}
}
-
-
-
-
-
+
+
+
+
+
}
1.5 +37 -35 jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/XMLOutput.java
Index: XMLOutput.java
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/XMLOutput.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLOutput.java 6 Aug 2002 10:38:36 -0000 1.4
+++ XMLOutput.java 27 Nov 2002 13:47:02 -0000 1.5
@@ -64,8 +64,10 @@
package org.apache.slide.testsuite.testtools.tprocessor;
//java
-import java.io.*;
-import java.util.*;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Hashtable;
@@ -76,28 +78,28 @@
* @version $Revision$
*/
public class XMLOutput {
-
-
+
+
private Hashtable knownXMLStringsByThread = new Hashtable();
private Hashtable level = new Hashtable();
private static int LINE_FIT = 100;
private PrintStream xmlResult;
-
+
public XMLOutput(PrintStream out) {
xmlResult = out;
}
-
+
public void writeException(Exception e) {
StringWriter sw = new StringWriter();
e.printStackTrace( new PrintWriter(sw, true) ); //autoFlush=true
String s = sw.toString();
writeElement("exception", s );
}
-
+
public void writeElement(String elementName, long value) {
writeElement(elementName, new Long(value).toString());
}
-
+
public void writeElementStart(String elementName, String attrName, String attrValue) {
putStringByThread(
getStringByThread() +
@@ -107,23 +109,23 @@
public void writeElementStart(String elementName) {
writeElementStart(elementName, null, null);
}
-
+
public void writeElementEnd(String elementName) {
decrementLevelByThread();
putStringByThread(
getStringByThread() +
getIndend() + "</" + elementName + ">");
}
-
-
+
+
public void writeElement(String elementName, String value) {
value = TProcessors.replace(value, "<", "<"); // some specific XML adoptions
value = TProcessors.replace(value, ">", ">");
writeElement(elementName, null, null, value);
}
-
-
-
+
+
+
public void writeElement(String elementName, String attrName, String attrValue, String value) {
putStringByThread(
getStringByThread() +
@@ -131,8 +133,8 @@
getIndend(value) + value +
getIndend(value) + "</" + elementName + ">" );
}
-
-
+
+
public void flush() {
synchronized (xmlResult) {
xmlResult.println();
@@ -141,7 +143,7 @@
}
putStringByThread("");
}
-
+
private String getStringByThread() {
String result = (String)knownXMLStringsByThread.get(Thread.currentThread().getName());
if (result == null) {
@@ -149,7 +151,7 @@
}
return result;
}
-
+
private int getLevelByThread() {
Integer result = (Integer)level.get(Thread.currentThread().getName());
if (result == null) {
@@ -157,21 +159,21 @@
}
return result.intValue();
}
-
+
private void incrementLevelByThread() {
level.put(Thread.currentThread().getName(), new Integer(getLevelByThread()+1));
}
private void decrementLevelByThread() {
level.put(Thread.currentThread().getName(), new Integer(getLevelByThread()-1));
}
-
-
-
+
+
+
private void putStringByThread(String result) {
knownXMLStringsByThread.put(Thread.currentThread().getName(), result);
}
-
-
+
+
private String getIndend() {
String result = "\n";
for (int i = 0; i < getLevelByThread(); i++){
@@ -179,14 +181,14 @@
}
return result;
}
-
-
+
+
private String getIndend(String value) {
String result = (value.length()>LINE_FIT?getIndend():"");
return result;
}
-
-
+
+
private String getAttribute(String attrName, String attrValue) {
String result = "";
if (attrName != null) {
@@ -194,9 +196,9 @@
}
return result;
}
-
-
-
+
+
+
}
1.6 +20 -21 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VersionControlAssert.java 14 Aug 2002 15:36:13 -0000 1.5
+++ VersionControlAssert.java 27 Nov 2002 13:47:02 -0000 1.6
@@ -65,11 +65,10 @@
// Slide
+import java.util.List;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
import org.apache.webdav.lib.methods.XMLResponseMethodBase;
-// jdom
import org.jdom.Element;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
@@ -81,22 +80,22 @@
* @version $Revision$
*/
public class VersionControlAssert extends XMLResponseBodyAssert {
-
-
+
+
/** constructor
*/
- public VersionControlAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult){
- super(method, elt, xconf, xmlresult);
+ public VersionControlAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, elt, xconf, xmlresult, expectedResponseCodes);
}
-
-
-
-
+
+
+
+
/**
* checks if Expected Response and Response bodies are the same
*/
public boolean assertResponseBody(){
-
+
// if (method.getStatusCode() == 204 ||
// method.getStatusCode() == 403 ||
// method.getStatusCode() == 409 ||
@@ -105,11 +104,11 @@
// method.getStatusCode() == 412 ){
// return true;
// }
-
+
return super.assertResponseBody();
}
-
-
-
-
+
+
+
+
}
1.4 +9 -10 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UpdateAssert.java 1 Nov 2002 14:06:36 -0000 1.3
+++ UpdateAssert.java 27 Nov 2002 13:47:02 -0000 1.4
@@ -65,12 +65,11 @@
// Slide
-import org.apache.webdav.lib.methods.XMLResponseMethodBase;
+import java.util.List;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
import org.apache.util.URLUtil;
-// jdom
+import org.apache.webdav.lib.methods.XMLResponseMethodBase;
import org.jdom.Element;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
@@ -86,8 +85,8 @@
/** constructor
*/
- public UpdateAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult){
- super(method, elt, xconf, xmlresult);
+ public UpdateAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, elt, xconf, xmlresult, expectedResponseCodes);
}
1.7 +20 -21 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UncheckoutAssert.java 14 Aug 2002 15:36:13 -0000 1.6
+++ UncheckoutAssert.java 27 Nov 2002 13:47:02 -0000 1.7
@@ -65,11 +65,10 @@
// Slide
+import java.util.List;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
import org.apache.webdav.lib.methods.XMLResponseMethodBase;
-// jdom
import org.jdom.Element;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
@@ -81,33 +80,33 @@
* @version $Revision$
*/
public class UncheckoutAssert extends XMLResponseBodyAssert {
-
-
+
+
/** constructor
*/
- public UncheckoutAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult){
- super(method, elt, xconf, xmlresult);
+ public UncheckoutAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, elt, xconf, xmlresult, expectedResponseCodes);
}
-
-
-
-
+
+
+
+
/**
* checks if Expected Response and Response bodies are the same
*/
public boolean assertResponseBody(){
-
+
// if (method.getStatusCode() == 204 ||
// method.getStatusCode() == 423 ||
// method.getStatusCode() == 201 ||
// method.getStatusCode() == 412 ){
// return true;
// }
-
+
return super.assertResponseBody();
}
-
-
-
-
+
+
+
+
}
1.41 +80 -36 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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- TProcessors.java 12 Nov 2002 09:45:25 -0000 1.40
+++ TProcessors.java 27 Nov 2002 13:47:02 -0000 1.41
@@ -64,20 +64,63 @@
package org.apache.slide.testsuite.testtools.tprocessor;
//java
-import java.io.*;
-import java.util.*;
-// Slide
-import org.apache.commons.httpclient.*;
-import org.apache.webdav.lib.*;
-import org.apache.webdav.lib.methods.*;
-import org.apache.util.WebdavStatus;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Stack;
+import java.util.StringTokenizer;
+import java.util.Vector;
+import org.apache.commons.httpclient.Credentials;
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.slide.testsuite.testtools.tutil.TArgs;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
import org.apache.util.URLUtil;
-// jdom
-import org.jdom.*;
+import org.apache.util.WebdavStatus;
+import org.apache.webdav.lib.WebdavState;
+import org.apache.webdav.lib.methods.AclMethod;
+import org.apache.webdav.lib.methods.CheckinMethod;
+import org.apache.webdav.lib.methods.CheckoutMethod;
+import org.apache.webdav.lib.methods.CopyMethod;
+import org.apache.webdav.lib.methods.DeleteMethod;
+import org.apache.webdav.lib.methods.GetMethod;
+import org.apache.webdav.lib.methods.HeadMethod;
+import org.apache.webdav.lib.methods.LabelMethod;
+import org.apache.webdav.lib.methods.LockMethod;
+import org.apache.webdav.lib.methods.MkWorkspaceMethod;
+import org.apache.webdav.lib.methods.MkcolMethod;
+import org.apache.webdav.lib.methods.MoveMethod;
+import org.apache.webdav.lib.methods.OptionsMethod;
+import org.apache.webdav.lib.methods.PostMethod;
+import org.apache.webdav.lib.methods.PropFindMethod;
+import org.apache.webdav.lib.methods.PropPatchMethod;
+import org.apache.webdav.lib.methods.PutMethod;
+import org.apache.webdav.lib.methods.ReportMethod;
+import org.apache.webdav.lib.methods.SearchMethod;
+import org.apache.webdav.lib.methods.UncheckoutMethod;
+import org.apache.webdav.lib.methods.UnlockMethod;
+import org.apache.webdav.lib.methods.UpdateMethod;
+import org.apache.webdav.lib.methods.VersionControlMethod;
+import org.apache.webdav.lib.methods.XMLResponseMethodBase;
+import org.jdom.Element;
+import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
-import org.jdom.output.*;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
+import org.jdom.output.XMLOutputter;
/**
@@ -930,12 +973,13 @@
}
// a received response code of 404 will not compare the headers
- ResponseBodyAssert methodAssert = assertFactory(m, elt);
+ ResponseBodyAssert methodAssert = assertFactory(m, elt, expectedResponseCodes);
secondPart = (m.getStatusCode() == 404 && expectedResponseCodes != null &&
expectedResponseCodes.size() != 1 &&
expectedResponseCodes.contains(new Integer(404)))
||
responseHeaderAssert(m, elt, header);
+
firstPart = (methodAssert!=null)?methodAssert.assertResponseBody():true;
@@ -1377,46 +1421,46 @@
- private ResponseBodyAssert assertFactory(HttpMethod m, Element expectedResponse) throws Exception {
+ private ResponseBodyAssert assertFactory(HttpMethod m, Element expectedResponseElement, List expectedResponseCodes) throws Exception {
ResponseBodyAssert result = null;
if(m instanceof PropFindMethod){
- result = new PropfindAssert((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponse), xdavConfiguration, xmlresult);
+ result = new PropfindAssert((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponseElement), xdavConfiguration, xmlresult, expectedResponseCodes);
} else if (m instanceof SearchMethod){
- result = new SearchAssert((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponse), xdavConfiguration, xmlresult);
+ result = new SearchAssert((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponseElement), xdavConfiguration, xmlresult, expectedResponseCodes);
} else if (m instanceof LockMethod){
- result = new LockAssert((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponse), xdavConfiguration, xmlresult);
+ result = new LockAssert((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponseElement), xdavConfiguration, xmlresult, expectedResponseCodes);
} else if (m instanceof PropPatchMethod){
- result = new PropPatchAssert((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponse), xdavConfiguration, xmlresult);
+ result = new PropPatchAssert((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponseElement), xdavConfiguration, xmlresult, expectedResponseCodes);
} else if (m instanceof DeleteMethod){
- result = new DeleteAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponse), xdavConfiguration, xmlresult);
+ result = new DeleteAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponseElement), xdavConfiguration, xmlresult, expectedResponseCodes);
} else if (m instanceof MoveMethod){
- result = new MoveAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponse), xdavConfiguration, xmlresult);
+ result = new MoveAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponseElement), xdavConfiguration, xmlresult, expectedResponseCodes);
} else if (m instanceof CopyMethod){
- result = new CopyAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponse), xdavConfiguration, xmlresult);
+ result = new CopyAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponseElement), xdavConfiguration, xmlresult, expectedResponseCodes);
} else if (m instanceof AclMethod){
- result = new AclAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponse), xdavConfiguration, xmlresult);
+ result = new AclAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponseElement), xdavConfiguration, xmlresult, expectedResponseCodes);
} else if (m instanceof CheckinMethod){
- result = new CheckinAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponse), xdavConfiguration, xmlresult);
+ result = new CheckinAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponseElement), xdavConfiguration, xmlresult, expectedResponseCodes);
} else if (m instanceof CheckoutMethod){
- result = new CheckoutAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponse), xdavConfiguration, xmlresult);
+ result = new CheckoutAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponseElement), xdavConfiguration, xmlresult, expectedResponseCodes);
} else if (m instanceof MkWorkspaceMethod){
- result = new MkWorkspaceAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponse), xdavConfiguration, xmlresult);
+ result = new MkWorkspaceAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponseElement), xdavConfiguration, xmlresult, expectedResponseCodes);
} else if (m instanceof LabelMethod){
- result = new LabelAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponse), xdavConfiguration, xmlresult);
+ result = new LabelAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponseElement), xdavConfiguration, xmlresult, expectedResponseCodes);
} else if (m instanceof ReportMethod){
- result = new ReportAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponse), xdavConfiguration, xmlresult);
+ result = new ReportAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponseElement), xdavConfiguration, xmlresult, expectedResponseCodes);
} else if (m instanceof UncheckoutMethod){
- result = new UncheckoutAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponse), xdavConfiguration, xmlresult);
+ result = new UncheckoutAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponseElement), xdavConfiguration, xmlresult, expectedResponseCodes);
} else if (m instanceof VersionControlMethod){
- result = new VersionControlAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponse), xdavConfiguration, xmlresult);
+ result = new VersionControlAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponseElement), xdavConfiguration, xmlresult, expectedResponseCodes);
} else if (m instanceof UpdateMethod){
- result = new UpdateAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponse), xdavConfiguration, xmlresult);
+ result = new UpdateAssert ((XMLResponseMethodBase) m, expectedResponseAsDOM(expectedResponseElement), xdavConfiguration, xmlresult, expectedResponseCodes);
} else if (m instanceof GetMethod){
if (m.getHeader("Content-Type") == null || !m.getHeader("Content-Type").getValue().equals("text/xml")) {
- result = new GetAssert ( m, expectedResponseAsStream(expectedResponse), xdavConfiguration, xmlresult);
+ result = new GetAssert ( m, expectedResponseAsStream(expectedResponseElement), xdavConfiguration, xmlresult, expectedResponseCodes);
} else {
- result = new GetXMLAssert ( m, expectedResponseAsStream(expectedResponse), xdavConfiguration, xmlresult);
+ result = new GetXMLAssert ( m, expectedResponseAsStream(expectedResponseElement), xdavConfiguration, xmlresult, expectedResponseCodes);
}
}
return result;
1.4 +32 -34 jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/StringResponseBodyAssert.java
Index: StringResponseBodyAssert.java
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/StringResponseBodyAssert.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StringResponseBodyAssert.java 19 Aug 2002 14:28:43 -0000 1.3
+++ StringResponseBodyAssert.java 27 Nov 2002 13:47:02 -0000 1.4
@@ -64,13 +64,11 @@
package org.apache.slide.testsuite.testtools.tprocessor;
//java
-import java.io.*;
-import java.util.*;
-// Slide
-import org.apache.webdav.lib.methods.*;
-import org.apache.commons.httpclient.*;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
@@ -81,21 +79,21 @@
* @version $Revision$
*/
public abstract class StringResponseBodyAssert extends StreamResponseBodyAssert{
-
-
+
+
private final static boolean extendedPrintlnsrequested = false;
-
-
+
+
/** constructer
* @param WebdavMethodBase Element
*/
- public StringResponseBodyAssert(HttpMethod method, InputStream expectedBody, XConf xconf, XMLOutput xmlresult){
- super(method, expectedBody, xconf, xmlresult);
+ public StringResponseBodyAssert(HttpMethod method, InputStream expectedBody, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, expectedBody, xconf, xmlresult, expectedResponseCodes);
}
-
-
-
-
+
+
+
+
/**
* checks if Expected Response and Response are same
*/
@@ -103,19 +101,19 @@
if (method.getStatusCode() < 200 || method.getStatusCode() > 300 ){
return true;
}
-
+
if (receivedBody == null ||
expectedBody == null )
return true;
return compareStreams(receivedBody, expectedBody);
}
-
-
+
+
/**
* checks if Expected and the received Response bodies are identical
*/
protected boolean compareStrings(String receivedBody, String expectedBody){
-
+
if (receivedBody.equals(expectedBody)) return true;
if (receivedBody.length() != expectedBody.length()) {
@@ -124,15 +122,15 @@
if (extendedPrintlnsrequested) System.out.println( "ContentLengthError " + "Received = " + receivedBody.length() +
" Expected = " + expectedBody.length());
}
-
+
String contentValueProblem = null;
int charsRead = 0;
while (charsRead < receivedBody.length() &&
charsRead < expectedBody.length()) {
-
+
char receivedChar = receivedBody.charAt(charsRead);
char expectedChar = expectedBody.charAt(charsRead);
-
+
if (extendedPrintlnsrequested) System.out.println(getStreamCharByte(charsRead, receivedChar, expectedChar) );
if (receivedChar != expectedChar) {
@@ -143,7 +141,7 @@
contentValueProblem += " ," + charsRead;
}
}
-
+
charsRead++;
}
@@ -154,12 +152,12 @@
// length or value are not identical
return false;
}
-
+
//////////////////////////////////////////////
// some debugging printlns and methods //
//////////////////////////////////////////////
-
+
/**
* get a byte as decimal and (try) as character with prefix
*/
@@ -176,9 +174,9 @@
}
catch (UnsupportedEncodingException e) { return new byte[]{0x00};}
}
-
-
-
+
+
+
}
1.9 +55 -56 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StreamResponseBodyAssert.java 19 Aug 2002 11:12:17 -0000 1.8
+++ StreamResponseBodyAssert.java 27 Nov 2002 13:47:02 -0000 1.9
@@ -64,13 +64,12 @@
package org.apache.slide.testsuite.testtools.tprocessor;
//java
-import java.io.*;
-import java.util.*;
-// Slide
-import org.apache.webdav.lib.methods.*;
-import org.apache.commons.httpclient.*;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
+import org.apache.webdav.lib.methods.GetMethod;
@@ -81,23 +80,23 @@
* @version $Revision$
*/
public abstract class StreamResponseBodyAssert extends ResponseBodyAssert{
-
-
+
+
private final static boolean extendedPrintlnsrequested = false;
-
-
+
+
protected HttpMethod method;
protected InputStream expectedBody;
protected InputStream receivedBody;
-
+
/** constructer
* @param WebdavMethodBase Element
*/
- public StreamResponseBodyAssert(HttpMethod method, InputStream expectedBody, XConf xconf, XMLOutput xmlresult){
-
-
- super(xconf, method.getName(), xmlresult);
-
+ public StreamResponseBodyAssert(HttpMethod method, InputStream expectedBody, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+
+
+ super(xconf, method.getName(), xmlresult, expectedResponseCodes);
+
this.method = method;
this.expectedBody = expectedBody;
// ugly quick hack to read the body
@@ -110,13 +109,13 @@
e.printStackTrace();
xmlresult.writeException(e);
}
-
-
+
+
}
-
-
-
-
+
+
+
+
/**
* checks if Expected Response and Response are same
*/
@@ -124,14 +123,14 @@
if (method.getStatusCode() < 200 || method.getStatusCode() > 300 ){
return true;
}
-
+
if (receivedBody == null ||
expectedBody == null )
return true;
return compareStreams(receivedBody, expectedBody);
}
-
-
+
+
/**
* checks if Expected and the received Response bodies are identical
*/
@@ -147,9 +146,9 @@
expectedCount=expectedBody.read(expectedBuffer);
while ((receivedCount > 0) && (expectedCount > 0)) {
bytesRead ++;
-
+
if (extendedPrintlnsrequested) System.out.println(getStreamCharByte(bytesRead, expectedBuffer, receivedBuffer) );
-
+
if (receivedBuffer[0] != expectedBuffer[0]) {
if (contentValueProblem == null) {
contentValueProblem = "Position = " + bytesRead;
@@ -166,7 +165,7 @@
e.printStackTrace();
xmlresult.writeException(e);
}
-
+
if (extendedPrintlnsrequested && expectedCount > 0) {
System.out.println(" Expected ");
printPostfixStreamCharByte(bytesRead, expectedBuffer, expectedBody);
@@ -175,29 +174,29 @@
System.out.println(" Received ");
printPostfixStreamCharByte(bytesRead, receivedBuffer, receivedBody);
}
-
+
if (receivedCount != expectedCount) {
xmlresult.writeElement("ContentLengthError", "Position = " + bytesRead );
}
-
+
if (contentValueProblem != null) {
xmlresult.writeElement("ContentValueError", contentValueProblem);
}
-
+
// length and value are identical
return (receivedCount == expectedCount) && (contentValueProblem == null);
}
-
+
//////////////////////////////////////////////
// some debugging printlns and methods //
//////////////////////////////////////////////
-
+
protected static final String[] hexadecimal =
{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
"A", "B", "C", "D", "E", "F"};
-
-
+
+
protected static String convertHexDigit( byte toEncode ) {
String result;
int low = (int) (toEncode & 0x0f);
@@ -205,26 +204,26 @@
result = hexadecimal[high] + hexadecimal[low];
return result;
}
-
-
-
+
+
+
/**
* get a byte as decimal and (try) as character
*/
protected String getStreamCharByte(byte[] input){
return " " + new String(input) + " [" + convertHexDigit(input[0]) + "]";
}
-
-
+
+
/**
* get a byte as decimal and (try) as character with prefix
*/
protected String getStreamCharByte(int counter, byte[] input){
return getPrefixStreamCharByte(counter) + getStreamCharByte(input);
}
-
-
-
+
+
+
/**
* get a byte as decimal and (try) as character with prefix
*/
@@ -236,17 +235,17 @@
" " + getStreamCharByte(rec) +
" Difference";
}
-
-
+
+
/**
* get a prefix string for printing
*/
protected String getPrefixStreamCharByte(int position){
return " " + position + ": \t" ;
}
-
-
-
+
+
+
/**
* Print the final stream content a prefix string for printing
*/
@@ -260,8 +259,8 @@
}
catch (IOException e) { e.printStackTrace();}
}
-
-
-
+
+
+
}
1.7 +20 -21 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SearchAssert.java 14 Aug 2002 15:36:13 -0000 1.6
+++ SearchAssert.java 27 Nov 2002 13:47:02 -0000 1.7
@@ -65,11 +65,10 @@
// Slide
+import java.util.List;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
import org.apache.webdav.lib.methods.XMLResponseMethodBase;
-// jdom
import org.jdom.Element;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
@@ -81,22 +80,22 @@
* @version $Revision$
*/
public class SearchAssert extends XMLResponseBodyAssert {
-
-
+
+
/** constructor
*/
- public SearchAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult){
- super(method, elt, xconf, xmlresult);
+ public SearchAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, elt, xconf, xmlresult, expectedResponseCodes);
}
-
-
-
-
+
+
+
+
/**
* checks if Expected Response and Response bodies are the same
*/
public boolean assertResponseBody(){
-
+
// if (method.getStatusCode() == 204 ||
// method.getStatusCode() == 423 ||
// method.getStatusCode() == 201 ||
@@ -104,11 +103,11 @@
// method.getStatusCode() == 412 ){
// return true;
// }
-
+
return super.assertResponseBody();
}
-
-
-
-
+
+
+
+
}
1.5 +23 -24 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResponseBodyAssert.java 19 Jun 2002 07:08:56 -0000 1.4
+++ ResponseBodyAssert.java 27 Nov 2002 13:47:02 -0000 1.5
@@ -65,8 +65,7 @@
// java
import java.util.List;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
/**
@@ -76,33 +75,33 @@
* @version $Revision$
*/
public abstract class ResponseBodyAssert {
-
-
+
+
/** specify where to write the xml results **/
protected XMLOutput xmlresult;
-
-
- protected List configuration;
-
-
-
+ protected List expectedResponseCodes;
+ protected List configuration;
+
+
+
/** constructer
* @param WebdavMethodBase Element
*/
- public ResponseBodyAssert(XConf xconf, String name, XMLOutput xmlresult){
- this.configuration = xconf.getPropertyList ("ExcludedXMLbodyElements", name);
- this.xmlresult = xmlresult;
+ public ResponseBodyAssert(XConf xconf, String name, XMLOutput xmlresult, List expectedResponseCodes){
+ this.configuration = xconf.getPropertyList ("ExcludedXMLbodyElements", name);
+ this.xmlresult = xmlresult;
+ this.expectedResponseCodes = expectedResponseCodes;
}
-
-
+
+
/**
* checks if Expected Response and the received Response body are logically identical
*/
public abstract boolean assertResponseBody();
-
-
-
-
-
+
+
+
+
+
}
1.7 +20 -21 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ReportAssert.java 14 Aug 2002 15:36:13 -0000 1.6
+++ ReportAssert.java 27 Nov 2002 13:47:02 -0000 1.7
@@ -65,11 +65,10 @@
// Slide
+import java.util.List;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
import org.apache.webdav.lib.methods.XMLResponseMethodBase;
-// jdom
import org.jdom.Element;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
@@ -81,33 +80,33 @@
* @version $Revision$
*/
public class ReportAssert extends XMLResponseBodyAssert {
-
-
+
+
/** constructor
*/
- public ReportAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult){
- super(method, elt, xconf, xmlresult);
+ public ReportAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, elt, xconf, xmlresult, expectedResponseCodes);
}
-
-
-
-
+
+
+
+
/**
* checks if Expected Response and Response bodies are the same
*/
public boolean assertResponseBody(){
-
+
// if (method.getStatusCode() == 204 ||
// method.getStatusCode() == 423 ||
// method.getStatusCode() == 201 ||
// method.getStatusCode() == 412 ){
// return true;
// }
-
+
return super.assertResponseBody();
}
-
-
-
-
+
+
+
+
}
1.5 +11 -11 jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/PropPatchAssert.java
Index: PropPatchAssert.java
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/PropPatchAssert.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PropPatchAssert.java 24 May 2002 07:59:42 -0000 1.4
+++ PropPatchAssert.java 27 Nov 2002 13:47:02 -0000 1.5
@@ -81,14 +81,14 @@
* @version $Revision$
*/
public class PropPatchAssert extends PropfindAssert {
-
-
+
+
/** constructer
*/
- public PropPatchAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult){
- super(method, elt, xconf, xmlresult);
+ public PropPatchAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, elt, xconf, xmlresult, expectedResponseCodes);
}
-
-
-
+
+
+
}
1.9 +19 -21 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PropfindAssert.java 14 Aug 2002 15:36:13 -0000 1.8
+++ PropfindAssert.java 27 Nov 2002 13:47:02 -0000 1.9
@@ -65,13 +65,11 @@
// Slide
-import org.apache.webdav.lib.methods.*;
+import java.util.List;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
import org.apache.util.URLUtil;
-// jdom
-import org.jdom.*;
-import org.jdom.input.*;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
+import org.apache.webdav.lib.methods.XMLResponseMethodBase;
+import org.jdom.Element;
/**
* Perform the necessary checks for the received and expected PropFind body
@@ -80,15 +78,15 @@
* @version $Revision$
*/
public class PropfindAssert extends XMLResponseBodyAssert {
-
-
+
+
/** constructer
*/
- public PropfindAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult){
- super(method, elt, xconf, xmlresult);
+ public PropfindAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, elt, xconf, xmlresult, expectedResponseCodes);
}
-
-
+
+
public boolean compareValues(String path, String name, String value1, String value2) {
// ignore leading and trailing "/" in the href section and un-escape
if (name.equals("href")){
@@ -109,8 +107,8 @@
}
return super.compareValues(path, name, value1, value2);
}
-
-
+
+
/**
* checks if Expected Response and Response are identical
*/
@@ -124,9 +122,9 @@
// method.getStatusCode() == 423 ){
// return true;
// }
-
+
return super.assertResponseBody();
}
-
-
+
+
}
1.7 +23 -25 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MoveAssert.java 14 Aug 2002 15:36:13 -0000 1.6
+++ MoveAssert.java 27 Nov 2002 13:47:02 -0000 1.7
@@ -64,12 +64,10 @@
package org.apache.slide.testsuite.testtools.tprocessor;
// Slide
-import org.apache.webdav.lib.methods.*;
-// jdom
-import org.jdom.*;
-import org.jdom.input.*;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
+import java.util.List;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
+import org.apache.webdav.lib.methods.XMLResponseMethodBase;
+import org.jdom.Element;
/**
* Perform the necessary checks for the received and expected Move body
@@ -78,35 +76,35 @@
* @version $Revision$
*/
public class MoveAssert extends CopyAssert {
-
-
-
-
+
+
+
+
/** constructer
*/
- public MoveAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult){
- super(method, elt, xconf, xmlresult);
+ public MoveAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, elt, xconf, xmlresult, expectedResponseCodes);
}
-
-
-
-
-
+
+
+
+
+
/**
* checks if Expected Response and Response are same
*/
public boolean assertResponseBody(){
-
+
// if (method.getStatusCode() == 204 ||
// method.getStatusCode() == 423 ||
// method.getStatusCode() == 201 ||
// method.getStatusCode() == 412 ){
// return true;
// }
-
+
return super.assertResponseBody();
}
-
-
+
+
}
1.7 +20 -21 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MkWorkspaceAssert.java 14 Aug 2002 15:36:13 -0000 1.6
+++ MkWorkspaceAssert.java 27 Nov 2002 13:47:02 -0000 1.7
@@ -65,11 +65,10 @@
// Slide
+import java.util.List;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
import org.apache.webdav.lib.methods.XMLResponseMethodBase;
-// jdom
import org.jdom.Element;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
@@ -81,33 +80,33 @@
* @version $Revision$
*/
public class MkWorkspaceAssert extends XMLResponseBodyAssert {
-
-
+
+
/** constructor
*/
- public MkWorkspaceAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult){
- super(method, elt, xconf, xmlresult);
+ public MkWorkspaceAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, elt, xconf, xmlresult, expectedResponseCodes);
}
-
-
-
-
+
+
+
+
/**
* checks if Expected Response and Response bodies are the same
*/
public boolean assertResponseBody(){
-
+
// if (method.getStatusCode() == 204 ||
// method.getStatusCode() == 423 ||
// method.getStatusCode() == 201 ||
// method.getStatusCode() == 412 ){
// return true;
// }
-
+
return super.assertResponseBody();
}
-
-
-
-
+
+
+
+
}
1.8 +22 -24 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LockAssert.java 14 Aug 2002 15:36:13 -0000 1.7
+++ LockAssert.java 27 Nov 2002 13:47:02 -0000 1.8
@@ -64,12 +64,10 @@
package org.apache.slide.testsuite.testtools.tprocessor;
// Slide
-import org.apache.webdav.lib.methods.*;
-// jdom
-import org.jdom.*;
-import org.jdom.input.*;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
+import java.util.List;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
+import org.apache.webdav.lib.methods.XMLResponseMethodBase;
+import org.jdom.Element;
/**
* Perform the necessary checks for the received and expected Lock body
@@ -78,30 +76,30 @@
* @version $Revision$
*/
public class LockAssert extends XMLResponseBodyAssert {
-
-
+
+
/** constructer
*/
- public LockAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult){
- super(method, elt, xconf, xmlresult);
+ public LockAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, elt, xconf, xmlresult, expectedResponseCodes);
}
-
-
+
+
/**
* checks if Expected Response and Response are same
*/
public boolean assertResponseBody(){
-
+
// if (method.getStatusCode() == 423 ||
// method.getStatusCode() == 412 ){
// return true;
// }
-
+
return super.assertResponseBody();
}
-
-
-
+
+
+
public boolean doCompareValues(String path, String received, String expected){
boolean result;
if (path.equals("/prop/lockdiscovery/activelock/depth")) {
@@ -112,7 +110,7 @@
}
return result;
}
-
-
-
+
+
+
}
1.5 +20 -21 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LabelAssert.java 14 Aug 2002 15:36:13 -0000 1.4
+++ LabelAssert.java 27 Nov 2002 13:47:02 -0000 1.5
@@ -65,11 +65,10 @@
// Slide
+import java.util.List;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
import org.apache.webdav.lib.methods.XMLResponseMethodBase;
-// jdom
import org.jdom.Element;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
@@ -81,33 +80,33 @@
* @version $Revision$
*/
public class LabelAssert extends XMLResponseBodyAssert {
-
-
+
+
/** constructor
*/
- public LabelAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult){
- super(method, elt, xconf, xmlresult);
+ public LabelAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, elt, xconf, xmlresult, expectedResponseCodes);
}
-
-
-
-
+
+
+
+
/**
* checks if Expected Response and Response bodies are the same
*/
public boolean assertResponseBody(){
-
+
// if (method.getStatusCode() == 204 ||
// method.getStatusCode() == 423 ||
// method.getStatusCode() == 201 ||
// method.getStatusCode() == 412 ){
// return true;
// }
-
+
return super.assertResponseBody();
}
-
-
-
-
+
+
+
+
}
1.4 +21 -23 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GetXMLAssert.java 14 Aug 2002 15:36:13 -0000 1.3
+++ GetXMLAssert.java 27 Nov 2002 13:47:02 -0000 1.4
@@ -66,12 +66,10 @@
// Slide
+import java.io.InputStream;
+import java.util.List;
import org.apache.commons.httpclient.HttpMethod;
-// java
-import java.io.*;
-import java.util.*;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
/**
@@ -81,23 +79,23 @@
* @version $Revision$
*/
public class GetXMLAssert extends XMLStreamResponseBodyAssert {
-
-
+
+
/** constructer
* @param WebdavMethodBase Element
*/
- public GetXMLAssert(HttpMethod method, InputStream expectedBody, XConf xconf, XMLOutput xmlresult){
- super(method, expectedBody, xconf, xmlresult);
+ public GetXMLAssert(HttpMethod method, InputStream expectedBody, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, expectedBody, xconf, xmlresult, expectedResponseCodes);
}
-
-
-
-
+
+
+
+
/**
* checks if Expected Response and Response are same
*/
public boolean assertResponseBody(){
-
+
// if (method.getStatusCode() == 204 ||
// method.getStatusCode() == 403 ||
// method.getStatusCode() == 409 ||
@@ -106,11 +104,11 @@
// method.getStatusCode() == 412 ){
// return true;
// }
-
+
return super.assertResponseBody();
}
-
-
-
-
+
+
+
+
}
1.7 +21 -23 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GetAssert.java 14 Aug 2002 15:36:13 -0000 1.6
+++ GetAssert.java 27 Nov 2002 13:47:03 -0000 1.7
@@ -66,12 +66,10 @@
// Slide
+import java.io.InputStream;
+import java.util.List;
import org.apache.commons.httpclient.HttpMethod;
-// java
-import java.io.*;
-import java.util.*;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
/**
@@ -81,23 +79,23 @@
* @version $Revision$
*/
public class GetAssert extends StreamResponseBodyAssert {
-
-
+
+
/** constructer
* @param WebdavMethodBase Element
*/
- public GetAssert(HttpMethod method, InputStream expectedBody, XConf xconf, XMLOutput xmlresult){
- super(method, expectedBody, xconf, xmlresult);
+ public GetAssert(HttpMethod method, InputStream expectedBody, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, expectedBody, xconf, xmlresult, expectedResponseCodes);
}
-
-
-
-
+
+
+
+
/**
* checks if Expected Response and Response are same
*/
public boolean assertResponseBody(){
-
+
// if (method.getStatusCode() == 204 ||
// method.getStatusCode() == 403 ||
// method.getStatusCode() == 409 ||
@@ -106,11 +104,11 @@
// method.getStatusCode() == 412 ){
// return true;
// }
-
+
return super.assertResponseBody();
}
-
-
-
-
+
+
+
+
}
1.6 +23 -25 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DeleteAssert.java 14 Aug 2002 15:36:13 -0000 1.5
+++ DeleteAssert.java 27 Nov 2002 13:47:03 -0000 1.6
@@ -65,12 +65,10 @@
// Slide
-import org.apache.webdav.lib.methods.*;
-// jdom
-import org.jdom.*;
-import org.jdom.input.*;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
+import java.util.List;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
+import org.apache.webdav.lib.methods.XMLResponseMethodBase;
+import org.jdom.Element;
/**
* Perform the necessary checks for the received and expected Delete body
@@ -79,34 +77,34 @@
* @version $Revision$
*/
public class DeleteAssert extends XMLResponseBodyAssert {
-
-
-
+
+
+
/** constructer
*/
- public DeleteAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult){
- super(method, elt, xconf, xmlresult);
+ public DeleteAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, elt, xconf, xmlresult, expectedResponseCodes);
}
-
-
-
-
+
+
+
+
/**
* checks if Expected Response and Response are same
*/
public boolean assertResponseBody(){
-
+
// if (method.getStatusCode() == 204 ||
// method.getStatusCode() == 404 ||
// method.getStatusCode() == 423 ){
// return true;
// }
-
+
return super.assertResponseBody();
}
-
-
-
-
+
+
+
+
}
1.6 +22 -24 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CopyAssert.java 14 Aug 2002 15:36:13 -0000 1.5
+++ CopyAssert.java 27 Nov 2002 13:47:03 -0000 1.6
@@ -65,12 +65,10 @@
// Slide
-import org.apache.webdav.lib.methods.*;
-// jdom
-import org.jdom.*;
-import org.jdom.input.*;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
+import java.util.List;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
+import org.apache.webdav.lib.methods.XMLResponseMethodBase;
+import org.jdom.Element;
/**
* Perform the necessary checks for the received and expected Copy body
@@ -79,22 +77,22 @@
* @version $Revision$
*/
public class CopyAssert extends XMLResponseBodyAssert {
-
-
+
+
/** constructer
*/
- public CopyAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult){
- super(method, elt, xconf, xmlresult);
+ public CopyAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, elt, xconf, xmlresult, expectedResponseCodes);
}
-
-
-
-
+
+
+
+
/**
* checks if Expected Response and Response are same
*/
public boolean assertResponseBody(){
-
+
// if (method.getStatusCode() == 204 ||
// method.getStatusCode() == 403 ||
// method.getStatusCode() == 409 ||
@@ -103,11 +101,11 @@
// method.getStatusCode() == 412 ){
// return true;
// }
-
+
return super.assertResponseBody();
}
-
-
-
-
+
+
+
+
}
1.6 +20 -21 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CheckoutAssert.java 14 Aug 2002 15:36:13 -0000 1.5
+++ CheckoutAssert.java 27 Nov 2002 13:47:03 -0000 1.6
@@ -65,11 +65,10 @@
// Slide
+import java.util.List;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
import org.apache.webdav.lib.methods.XMLResponseMethodBase;
-// jdom
import org.jdom.Element;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
@@ -81,22 +80,22 @@
* @version $Revision$
*/
public class CheckoutAssert extends XMLResponseBodyAssert {
-
-
+
+
/** constructor
*/
- public CheckoutAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult){
- super(method, elt, xconf, xmlresult);
+ public CheckoutAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, elt, xconf, xmlresult, expectedResponseCodes);
}
-
-
-
-
+
+
+
+
/**
* checks if Expected Response and Response bodies are the same
*/
public boolean assertResponseBody(){
-
+
// if (method.getStatusCode() == 204 ||
// method.getStatusCode() == 403 ||
// method.getStatusCode() == 409 ||
@@ -105,11 +104,11 @@
// method.getStatusCode() == 412 ){
// return true;
// }
-
+
return super.assertResponseBody();
}
-
-
-
-
+
+
+
+
}
1.6 +20 -21 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CheckinAssert.java 14 Aug 2002 15:36:13 -0000 1.5
+++ CheckinAssert.java 27 Nov 2002 13:47:03 -0000 1.6
@@ -65,11 +65,10 @@
// Slide
+import java.util.List;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
import org.apache.webdav.lib.methods.XMLResponseMethodBase;
-// jdom
import org.jdom.Element;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
@@ -81,22 +80,22 @@
* @version $Revision$
*/
public class CheckinAssert extends XMLResponseBodyAssert {
-
-
+
+
/** constructor
*/
- public CheckinAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult){
- super(method, elt, xconf, xmlresult);
+ public CheckinAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, elt, xconf, xmlresult, expectedResponseCodes);
}
-
-
-
-
+
+
+
+
/**
* checks if Expected Response and Response bodies are the same
*/
public boolean assertResponseBody(){
-
+
// if (method.getStatusCode() == 204 ||
// method.getStatusCode() == 403 ||
// method.getStatusCode() == 409 ||
@@ -105,11 +104,11 @@
// method.getStatusCode() == 412 ){
// return true;
// }
-
+
return super.assertResponseBody();
}
-
-
-
-
+
+
+
+
}
1.6 +20 -22 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AclAssert.java 14 Aug 2002 15:36:13 -0000 1.5
+++ AclAssert.java 27 Nov 2002 13:47:03 -0000 1.6
@@ -65,12 +65,10 @@
// Slide
+import java.util.List;
+import org.apache.slide.testsuite.testtools.tutil.XConf;
import org.apache.webdav.lib.methods.XMLResponseMethodBase;
-// jdom
import org.jdom.Element;
-//test package
-import org.apache.slide.testsuite.testtools.tutil.*;
-
@@ -81,33 +79,33 @@
* @version $Revision$
*/
public class AclAssert extends XMLResponseBodyAssert {
-
-
+
+
/** constructor
*/
- public AclAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult){
- super(method, elt, xconf, xmlresult);
+ public AclAssert(XMLResponseMethodBase method, Element elt, XConf xconf, XMLOutput xmlresult, List expectedResponseCodes){
+ super(method, elt, xconf, xmlresult, expectedResponseCodes);
}
-
-
-
-
+
+
+
+
/**
* checks if Expected Response and Response bodies are the same
*/
public boolean assertResponseBody(){
-
+
// if (method.getStatusCode() == 204 ||
// method.getStatusCode() == 423 ||
// method.getStatusCode() == 404 ||
// method.getStatusCode() == 201 ){
// return true;
// }
-
+
return super.assertResponseBody();
}
-
-
-
-
+
+
+
+
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>