luetzkendorf 2004/07/13 01:49:00
Modified:
testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor
TProcessors.java
Log:
added support for SUBSCRIBE, UNSUBSCRIBE and POLL methods
Revision Changes Path
1.83 +22 -31
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.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- TProcessors.java 21 Jun 2004 09:00:25 -0000 1.82
+++ TProcessors.java 13 Jul 2004 08:48:59 -0000 1.83
@@ -63,7 +63,6 @@
package org.apache.slide.testsuite.testtools.tprocessor;
-//java
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -86,6 +85,7 @@
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;
@@ -96,34 +96,12 @@
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.PutMethod;
import org.apache.commons.httpclient.util.URIUtil;
+
import org.apache.slide.testsuite.testtools.tutil.TArgs;
import org.apache.slide.testsuite.testtools.tutil.XConf;
import org.apache.util.WebdavStatus;
import org.apache.webdav.lib.WebdavState;
-import org.apache.webdav.lib.methods.AclMethod;
-import org.apache.webdav.lib.methods.BindMethod;
-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.HttpRequestBodyMethodBase;
-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.PropFindMethod;
-import org.apache.webdav.lib.methods.PropPatchMethod;
-import org.apache.webdav.lib.methods.RebindMethod;
-import org.apache.webdav.lib.methods.ReportMethod;
-import org.apache.webdav.lib.methods.SearchMethod;
-import org.apache.webdav.lib.methods.UnbindMethod;
-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.apache.webdav.lib.methods.*;
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
@@ -1510,12 +1488,16 @@
result = new VersionControlAssert ((XMLResponseMethodBase) m,
expectedResponseAsDOM(expectedResponseElement), xdavConfiguration, xmlresult,
expectedResponseCodes);
} else if (m instanceof UpdateMethod){
result = new UpdateAssert ((XMLResponseMethodBase) m,
expectedResponseAsDOM(expectedResponseElement), xdavConfiguration, xmlresult,
expectedResponseCodes);
- } else if (m instanceof GetMethod){
+ } else if (m instanceof GetMethod) {
if (m.getResponseHeader("Content-Type") == null ||
!m.getResponseHeader("Content-Type").getValue().trim().startsWith("text/xml")) {
result = new GetAssert ( m,
expectedResponseAsStream(expectedResponseElement), xdavConfiguration, xmlresult,
expectedResponseCodes);
} else {
result = new GetXMLAssert ( m,
expectedResponseAsStream(expectedResponseElement), xdavConfiguration, xmlresult,
expectedResponseCodes);
}
+ } else if (m instanceof PollMethod) {
+ result = new PollAssert((XMLResponseMethodBase) m,
+ expectedResponseAsDOM(expectedResponseElement),
+ xdavConfiguration, xmlresult, expectedResponseCodes);
}
return result;
}
@@ -1609,9 +1591,18 @@
else if(methodName.equalsIgnoreCase("UPDATE")){
result = new UpdateMethod();
}
- result.setFollowRedirects(true);
+ else if(methodName.equalsIgnoreCase("SUBSCRIBE")){
+ result = new SubscribeMethod();
+ }
+ else if(methodName.equalsIgnoreCase("UNSUBSCRIBE")){
+ result = new UnsubscribeMethod();
+ }
+ else if(methodName.equalsIgnoreCase("POLL")){
+ result = new PollMethod();
+ }
if (result == null)
throw new IOException("Method " + methodName + " does not exist");
+ result.setFollowRedirects(true);
return result;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
