rwaldhoff 01/08/15 16:19:35
Modified: httpclient/src/java/org/apache/commons/httpclient/methods
Tag: rlwrefactoring GetMethod.java PutMethod.java
httpclient/src/java/org/apache/commons/httpclient Tag:
rlwrefactoring HttpMethod.java HttpMethodBase.java
httpclient/src/test/org/apache/commons/httpclient Tag:
rlwrefactoring TestGetMethodLocal.java
TestHttps.java TestMethodsExternalHost.java
TestMethodsLocalHost.java TestWebappHeaders.java
TestWebappMethods.java TestWebappParameters.java
TestWebappRedirect.java
Log:
Moving getResponseBody, getResponseBodyAsString and getResponseBodyAsStream up to
HttpMethod/HttpMethodBase (from PutMethod)
Removing getData, getDataAsString, etc. from GetMethod (replaced by getResponseBody)
Revision Changes Path
No revision
No revision
1.2.2.6 +39 -35
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/GetMethod.java
Index: GetMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/GetMethod.java,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -r1.2.2.5 -r1.2.2.6
--- GetMethod.java 2001/08/13 23:35:29 1.2.2.5
+++ GetMethod.java 2001/08/15 23:19:34 1.2.2.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/GetMethod.java,v
1.2.2.5 2001/08/13 23:35:29 rwaldhoff Exp $
- * $Revision: 1.2.2.5 $
- * $Date: 2001/08/13 23:35:29 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/GetMethod.java,v
1.2.2.6 2001/08/15 23:19:34 rwaldhoff Exp $
+ * $Revision: 1.2.2.6 $
+ * $Date: 2001/08/15 23:19:34 $
*
* ====================================================================
*
@@ -314,11 +314,46 @@
setFollowRedirects(true);
}
+ public byte[] getResponseBody() {
+ // should flip this around so AsString uses bytes
+ return getResponseBodyAsString().getBytes();
+ }
+
+ public String getResponseBodyAsString() {
+ // should flip this around so AsString uses bytes
+ checkUsed();
+ if (useDisk) {
+ try {
+ InputStream is = new FileInputStream(fileData);
+ byte[] buffer = new byte[4096];
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ int nb = 0;
+ while (true) {
+ nb = is.read(buffer);
+ if (nb == -1)
+ break;
+ os.write(buffer, 0, nb);
+ }
+ is.close();
+ return os.toString();
+ } catch(IOException e) {
+ log.error("Exception in GetMethod.getResponseBodyAsString() while
retrieving data from file \"" + fileData + "\".",e);
+ return null;
+ }
+ } else {
+ if (memoryData != null) {
+ return new String(memoryData);
+ } else {
+ return "";
+ }
+ }
+ }
+
/**
* Get read data.
*/
- public InputStream getData()
+ public InputStream getResponseBodyAsStream()
throws IOException {
checkUsed();
@@ -329,37 +364,6 @@
if (memoryData == null)
throw new IOException("Data not found");
return new ByteArrayInputStream(memoryData);
- }
-
- }
-
-
- /**
- * Get read data as a String.
- */
- public String getDataAsString()
- throws IOException {
-
- checkUsed();
-
- if (useDisk) {
- InputStream is = new FileInputStream(fileData);
- byte[] buffer = new byte[4096];
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- int nb = 0;
- while (true) {
- nb = is.read(buffer);
- if (nb == -1)
- break;
- os.write(buffer, 0, nb);
- }
- is.close();
- return os.toString();
- } else {
- if (memoryData != null)
- return new String(memoryData);
- else
- return "";
}
}
1.3.2.7 +3 -11
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/PutMethod.java
Index: PutMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/PutMethod.java,v
retrieving revision 1.3.2.6
retrieving revision 1.3.2.7
diff -u -r1.3.2.6 -r1.3.2.7
--- PutMethod.java 2001/08/14 23:06:17 1.3.2.6
+++ PutMethod.java 2001/08/15 23:19:34 1.3.2.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/PutMethod.java,v
1.3.2.6 2001/08/14 23:06:17 rwaldhoff Exp $
- * $Revision: 1.3.2.6 $
- * $Date: 2001/08/14 23:06:17 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/PutMethod.java,v
1.3.2.7 2001/08/15 23:19:34 rwaldhoff Exp $
+ * $Revision: 1.3.2.7 $
+ * $Date: 2001/08/15 23:19:34 $
*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
@@ -256,14 +256,6 @@
} else {
return 0;
}
- }
-
- public byte[] getResponseBody() {
- return responseBody;
- }
-
- public String getResponseBodyAsString() {
- return null == responseBody ? null : new String(responseBody);
}
public void recycle() {
No revision
No revision
1.5.2.7 +9 -4
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethod.java
Index: HttpMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethod.java,v
retrieving revision 1.5.2.6
retrieving revision 1.5.2.7
diff -u -r1.5.2.6 -r1.5.2.7
--- HttpMethod.java 2001/08/15 22:55:04 1.5.2.6
+++ HttpMethod.java 2001/08/15 23:19:34 1.5.2.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethod.java,v
1.5.2.6 2001/08/15 22:55:04 rwaldhoff Exp $
- * $Revision: 1.5.2.6 $
- * $Date: 2001/08/15 22:55:04 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethod.java,v
1.5.2.7 2001/08/15 23:19:34 rwaldhoff Exp $
+ * $Revision: 1.5.2.7 $
+ * $Date: 2001/08/15 23:19:34 $
* ====================================================================
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
@@ -13,7 +13,6 @@
package org.apache.commons.httpclient;
import java.io.InputStream;
-import java.io.OutputStream;
import java.io.IOException;
import java.util.Iterator;
import java.util.Collection;
@@ -161,6 +160,12 @@
* Return the specified response headers.
*/
public Header getResponseHeader(String headerName);
+
+ public byte[] getResponseBody();
+
+ public String getResponseBodyAsString();
+
+ public InputStream getResponseBodyAsStream() throws IOException;
/**
* Return <tt>true</tt> if I have been {@link #execute executed}
1.10.2.17 +17 -4
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethodBase.java
Index: HttpMethodBase.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethodBase.java,v
retrieving revision 1.10.2.16
retrieving revision 1.10.2.17
diff -u -r1.10.2.16 -r1.10.2.17
--- HttpMethodBase.java 2001/08/15 22:55:04 1.10.2.16
+++ HttpMethodBase.java 2001/08/15 23:19:34 1.10.2.17
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethodBase.java,v
1.10.2.16 2001/08/15 22:55:04 rwaldhoff Exp $
- * $Revision: 1.10.2.16 $
- * $Date: 2001/08/15 22:55:04 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethodBase.java,v
1.10.2.17 2001/08/15 23:19:34 rwaldhoff Exp $
+ * $Revision: 1.10.2.17 $
+ * $Date: 2001/08/15 23:19:34 $
* ====================================================================
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
@@ -15,6 +15,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.ByteArrayOutputStream;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.Iterator;
import java.util.HashMap;
@@ -67,7 +68,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
* @author Rodney Waldhoff
- * @version $Id: HttpMethodBase.java,v 1.10.2.16 2001/08/15 22:55:04 rwaldhoff Exp $
+ * @version $Id: HttpMethodBase.java,v 1.10.2.17 2001/08/15 23:19:34 rwaldhoff Exp $
*/
public abstract class HttpMethodBase implements HttpMethod {
@@ -293,6 +294,18 @@
*/
public Header getResponseHeader(String headerName) {
return (Header)(responseHeaders.get(headerName.toLowerCase()));
+ }
+
+ public byte[] getResponseBody() {
+ return responseBody;
+ }
+
+ public String getResponseBodyAsString() {
+ return null == responseBody ? null : new String(responseBody);
+ }
+
+ public InputStream getResponseBodyAsStream() throws IOException {
+ return null == responseBody ? null : new ByteArrayInputStream(responseBody);
}
/**
No revision
No revision
1.1.2.3 +8 -8
jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestGetMethodLocal.java
Index: TestGetMethodLocal.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestGetMethodLocal.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TestGetMethodLocal.java 2001/08/13 15:57:43 1.1.2.2
+++ TestGetMethodLocal.java 2001/08/15 23:19:34 1.1.2.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestGetMethodLocal.java,v
1.1.2.2 2001/08/13 15:57:43 rwaldhoff Exp $
- * $Revision: 1.1.2.2 $
- * $Date: 2001/08/13 15:57:43 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestGetMethodLocal.java,v
1.1.2.3 2001/08/15 23:19:34 rwaldhoff Exp $
+ * $Revision: 1.1.2.3 $
+ * $Date: 2001/08/15 23:19:34 $
* ====================================================================
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
@@ -31,7 +31,7 @@
* "httpclient.test.localHost" property.
*
* @author Rodney Waldhoff
- * @version $Id: TestGetMethodLocal.java,v 1.1.2.2 2001/08/13 15:57:43 rwaldhoff
Exp $
+ * @version $Id: TestGetMethodLocal.java,v 1.1.2.3 2001/08/15 23:19:34 rwaldhoff
Exp $
*/
public class TestGetMethodLocal extends TestCase {
@@ -84,7 +84,7 @@
}
try {
- String data = method.getDataAsString();
+ String data = method.getResponseBodyAsString();
assert("No data returned.",(data.length() > 0));
} catch (Throwable t) {
t.printStackTrace();
@@ -107,7 +107,7 @@
}
try {
- String data = method.getDataAsString();
+ String data = method.getResponseBodyAsString();
assert("No data returned.",(data.length() > 0));
} catch (Throwable t) {
t.printStackTrace();
@@ -130,7 +130,7 @@
}
try {
- String data = method.getDataAsString();
+ String data = method.getResponseBodyAsString();
assert("No data returned.",(data.length() > 0));
} catch (Throwable t) {
t.printStackTrace();
@@ -149,7 +149,7 @@
}
try {
- String data = method.getDataAsString();
+ String data = method.getResponseBodyAsString();
assert("No data returned.",(data.length() > 0));
} catch (Throwable t) {
t.printStackTrace();
1.2.2.1 +6 -6
jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHttps.java
Index: TestHttps.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHttps.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- TestHttps.java 2001/07/27 22:52:25 1.2
+++ TestHttps.java 2001/08/15 23:19:34 1.2.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHttps.java,v
1.2 2001/07/27 22:52:25 rwaldhoff Exp $
- * $Revision: 1.2 $
- * $Date: 2001/07/27 22:52:25 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHttps.java,v
1.2.2.1 2001/08/15 23:19:34 rwaldhoff Exp $
+ * $Revision: 1.2.2.1 $
+ * $Date: 2001/08/15 23:19:34 $
* ====================================================================
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
@@ -28,7 +28,7 @@
* (see build.xml)
*
* @author Rodney Waldhoff
- * @version $Id: TestHttps.java,v 1.2 2001/07/27 22:52:25 rwaldhoff Exp $
+ * @version $Id: TestHttps.java,v 1.2.2.1 2001/08/15 23:19:34 rwaldhoff Exp $
*/
public class TestHttps extends TestCase {
@@ -70,7 +70,7 @@
}
try {
- String data = method.getDataAsString();
+ String data = method.getResponseBodyAsString();
// This enumeration musn't be empty
assert("No data returned.", (data.length() > 0));
} catch (Throwable t) {
@@ -92,7 +92,7 @@
}
try {
- String data = method.getDataAsString();
+ String data = method.getResponseBodyAsString();
// This enumeration musn't be empty
assert("No data returned.", (data.length() > 0));
} catch (Throwable t) {
1.1.2.1 +6 -6
jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestMethodsExternalHost.java
Index: TestMethodsExternalHost.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestMethodsExternalHost.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- TestMethodsExternalHost.java 2001/07/27 22:52:25 1.1
+++ TestMethodsExternalHost.java 2001/08/15 23:19:34 1.1.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestMethodsExternalHost.java,v
1.1 2001/07/27 22:52:25 rwaldhoff Exp $
- * $Revision: 1.1 $
- * $Date: 2001/07/27 22:52:25 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestMethodsExternalHost.java,v
1.1.2.1 2001/08/15 23:19:34 rwaldhoff Exp $
+ * $Revision: 1.1.2.1 $
+ * $Date: 2001/08/15 23:19:34 $
*
* ====================================================================
*
@@ -74,7 +74,7 @@
*
* @author Remy Maucherat
* @author Rodney Waldhoff
- * @version $Id: TestMethodsExternalHost.java,v 1.1 2001/07/27 22:52:25 rwaldhoff
Exp $
+ * @version $Id: TestMethodsExternalHost.java,v 1.1.2.1 2001/08/15 23:19:34
rwaldhoff Exp $
*/
public class TestMethodsExternalHost extends TestCase {
@@ -145,7 +145,7 @@
}
try {
- String data = method.getDataAsString();
+ String data = method.getResponseBodyAsString();
// This enumeration musn't be empty
assert("No data returned.",
(data.length() > 0));
@@ -166,7 +166,7 @@
}
try {
- String data = method.getDataAsString();
+ String data = method.getResponseBodyAsString();
// This enumeration musn't be empty
assert("No data returned.",
(data.length() > 0));
1.1.2.2 +6 -6
jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestMethodsLocalHost.java
Index: TestMethodsLocalHost.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestMethodsLocalHost.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TestMethodsLocalHost.java 2001/08/10 23:05:51 1.1.2.1
+++ TestMethodsLocalHost.java 2001/08/15 23:19:34 1.1.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestMethodsLocalHost.java,v
1.1.2.1 2001/08/10 23:05:51 rwaldhoff Exp $
- * $Revision: 1.1.2.1 $
- * $Date: 2001/08/10 23:05:51 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestMethodsLocalHost.java,v
1.1.2.2 2001/08/15 23:19:34 rwaldhoff Exp $
+ * $Revision: 1.1.2.2 $
+ * $Date: 2001/08/15 23:19:34 $
*
* ====================================================================
*
@@ -79,7 +79,7 @@
*
* @author Remy Maucherat
* @author Rodney Waldhoff
- * @version $Id: TestMethodsLocalHost.java,v 1.1.2.1 2001/08/10 23:05:51 rwaldhoff
Exp $
+ * @version $Id: TestMethodsLocalHost.java,v 1.1.2.2 2001/08/15 23:19:34 rwaldhoff
Exp $
*/
public class TestMethodsLocalHost extends TestCase {
@@ -157,7 +157,7 @@
}
try {
- String data = method.getDataAsString();
+ String data = method.getResponseBodyAsString();
// This enumeration musn't be empty
assert("No data returned.",
(data.length() > 0));
@@ -178,7 +178,7 @@
}
try {
- String data = method.getDataAsString();
+ String data = method.getResponseBodyAsString();
// This enumeration musn't be empty
assert("No data returned.",
(data.length() > 0));
1.1.2.2 +8 -8
jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestWebappHeaders.java
Index: TestWebappHeaders.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestWebappHeaders.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TestWebappHeaders.java 2001/08/13 16:02:57 1.1.2.1
+++ TestWebappHeaders.java 2001/08/15 23:19:34 1.1.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestWebappHeaders.java,v
1.1.2.1 2001/08/13 16:02:57 rwaldhoff Exp $
- * $Revision: 1.1.2.1 $
- * $Date: 2001/08/13 16:02:57 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestWebappHeaders.java,v
1.1.2.2 2001/08/15 23:19:34 rwaldhoff Exp $
+ * $Revision: 1.1.2.2 $
+ * $Date: 2001/08/15 23:19:34 $
* ====================================================================
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
@@ -32,7 +32,7 @@
* "httpclient.test.webappContext" property.
*
* @author Rodney Waldhoff
- * @version $Id: TestWebappHeaders.java,v 1.1.2.1 2001/08/13 16:02:57 rwaldhoff Exp
$
+ * @version $Id: TestWebappHeaders.java,v 1.1.2.2 2001/08/15 23:19:34 rwaldhoff Exp
$
*/
public class TestWebappHeaders extends TestCase {
@@ -85,8 +85,8 @@
fail("Unable to execute method : " + t.toString());
}
// Tomcat 4 at least converts the header name to lower case
-
assert(method.getDataAsString().indexOf("name=\"addrequestheader(header)\";value=\"True\"<br>")
>= 0);
-
assert(method.getDataAsString().indexOf("name=\"addrequestheader(string,string)\";value=\"Also
True\"<br>") >= 0);
+
assert(method.getResponseBodyAsString().indexOf("name=\"addrequestheader(header)\";value=\"True\"<br>")
>= 0);
+
assert(method.getResponseBodyAsString().indexOf("name=\"addrequestheader(string,string)\";value=\"Also
True\"<br>") >= 0);
}
/**
@@ -106,7 +106,7 @@
fail("Unable to execute method : " + t.toString());
}
// Tomcat 4 at least converts the header name to lower case
- assert(!(method.getDataAsString().indexOf("xxx-a-header") >= 0));
+ assert(!(method.getResponseBodyAsString().indexOf("xxx-a-header") >= 0));
}
/**
@@ -126,7 +126,7 @@
fail("Unable to execute method : " + t.toString());
}
// Tomcat 4 at least converts the header name to lower case
-
assert(method.getDataAsString().indexOf("name=\"xxx-a-header\";value=\"two\"<br>") >=
0);
+
assert(method.getResponseBodyAsString().indexOf("name=\"xxx-a-header\";value=\"two\"<br>")
>= 0);
}
/**
1.1.2.3 +9 -9
jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestWebappMethods.java
Index: TestWebappMethods.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestWebappMethods.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TestWebappMethods.java 2001/08/14 23:06:46 1.1.2.2
+++ TestWebappMethods.java 2001/08/15 23:19:34 1.1.2.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestWebappMethods.java,v
1.1.2.2 2001/08/14 23:06:46 rwaldhoff Exp $
- * $Revision: 1.1.2.2 $
- * $Date: 2001/08/14 23:06:46 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestWebappMethods.java,v
1.1.2.3 2001/08/15 23:19:34 rwaldhoff Exp $
+ * $Revision: 1.1.2.3 $
+ * $Date: 2001/08/15 23:19:34 $
* ====================================================================
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
@@ -32,7 +32,7 @@
* "httpclient.test.webappContext" property.
*
* @author Rodney Waldhoff
- * @version $Id: TestWebappMethods.java,v 1.1.2.2 2001/08/14 23:06:46 rwaldhoff Exp
$
+ * @version $Id: TestWebappMethods.java,v 1.1.2.3 2001/08/15 23:19:34 rwaldhoff Exp
$
*/
public class TestWebappMethods extends TestCase {
@@ -83,7 +83,7 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getDataAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
+ assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
assertEquals(200,method.getStatusCode());
method.recycle();
@@ -95,7 +95,7 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getDataAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
+ assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
assertEquals(200,method.getStatusCode());
}
@@ -113,7 +113,7 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getDataAsString().indexOf("<title>Param Servlet:
POST</title>") >= 0);
+ assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet:
POST</title>") >= 0);
assertEquals(200,method.getStatusCode());
method.recycle();
@@ -125,7 +125,7 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getDataAsString().indexOf("<title>Param Servlet:
POST</title>") >= 0);
+ assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet:
POST</title>") >= 0);
assertEquals(200,method.getStatusCode());
}
@@ -272,7 +272,7 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
-
assert(method.getDataAsString().indexOf("<tt>quote=It+was+the+best+of+times%2C+it+was+the+worst+of+times.</tt>")
>= 0);
+
assert(method.getResponseBodyAsString().indexOf("<tt>quote=It+was+the+best+of+times%2C+it+was+the+worst+of+times.</tt>")
>= 0);
assertEquals(200,method.getStatusCode());
}
1.1.2.3 +27 -27
jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestWebappParameters.java
Index: TestWebappParameters.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestWebappParameters.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TestWebappParameters.java 2001/08/15 22:55:05 1.1.2.2
+++ TestWebappParameters.java 2001/08/15 23:19:34 1.1.2.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestWebappParameters.java,v
1.1.2.2 2001/08/15 22:55:05 rwaldhoff Exp $
- * $Revision: 1.1.2.2 $
- * $Date: 2001/08/15 22:55:05 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestWebappParameters.java,v
1.1.2.3 2001/08/15 23:19:34 rwaldhoff Exp $
+ * $Revision: 1.1.2.3 $
+ * $Date: 2001/08/15 23:19:34 $
* ====================================================================
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
@@ -32,7 +32,7 @@
* "httpclient.test.webappContext" property.
*
* @author Rodney Waldhoff
- * @version $Id: TestWebappParameters.java,v 1.1.2.2 2001/08/15 22:55:05 rwaldhoff
Exp $
+ * @version $Id: TestWebappParameters.java,v 1.1.2.3 2001/08/15 23:19:34 rwaldhoff
Exp $
*/
public class TestWebappParameters extends TestCase {
@@ -84,9 +84,9 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getDataAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
+ assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
assertEquals(200,method.getStatusCode());
-
assert(method.getDataAsString().indexOf("<p>QueryString=\"hadQuestionMark=true\"</p>")
>= 0);
+
assert(method.getResponseBodyAsString().indexOf("<p>QueryString=\"hadQuestionMark=true\"</p>")
>= 0);
}
/**
@@ -105,9 +105,9 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getDataAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
+ assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
assertEquals(200,method.getStatusCode());
-
assert(method.getDataAsString().indexOf("<p>QueryString=\"hadQuestionMark=false\"</p>")
>= 0);
+
assert(method.getResponseBodyAsString().indexOf("<p>QueryString=\"hadQuestionMark=false\"</p>")
>= 0);
}
/**
@@ -126,9 +126,9 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getDataAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
+ assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
assertEquals(200,method.getStatusCode());
-
assert(method.getDataAsString().indexOf("<p>QueryString=\"param-one=param-value\"</p>")
>= 0);
+
assert(method.getResponseBodyAsString().indexOf("<p>QueryString=\"param-one=param-value\"</p>")
>= 0);
}
/**
@@ -151,11 +151,11 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getDataAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
+ assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
assertEquals(200,method.getStatusCode());
-
assert(method.getDataAsString().indexOf("name=\"special-chars\";value=\":/?~.\"") >=
0);
-
assert(method.getDataAsString().indexOf("name=\"param-one\";value=\"param-value\"") >=
0);
-
assert(method.getDataAsString().indexOf("name=\"param-two\";value=\"param-value2\"")
>= 0);
+
assert(method.getResponseBodyAsString().indexOf("name=\"special-chars\";value=\":/?~.\"")
>= 0);
+
assert(method.getResponseBodyAsString().indexOf("name=\"param-one\";value=\"param-value\"")
>= 0);
+
assert(method.getResponseBodyAsString().indexOf("name=\"param-two\";value=\"param-value2\"")
>= 0);
}
/**
@@ -174,9 +174,9 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getDataAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
+ assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
assertEquals(200,method.getStatusCode());
-
assert(method.getDataAsString().indexOf("<p>QueryString=\"param-without-value\"</p>")
>= 0);
+
assert(method.getResponseBodyAsString().indexOf("<p>QueryString=\"param-without-value\"</p>")
>= 0);
}
/**
@@ -198,10 +198,10 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getDataAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
+ assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
assertEquals(200,method.getStatusCode());
- assert(method.getDataAsString().indexOf("name=\"foo\";value=\"one\"") >= 0);
- assert(method.getDataAsString().indexOf("name=\"foo\";value=\"two\"") >= 0);
+
assert(method.getResponseBodyAsString().indexOf("name=\"foo\";value=\"one\"") >= 0);
+
assert(method.getResponseBodyAsString().indexOf("name=\"foo\";value=\"two\"") >= 0);
}
public void testGetMethodOverwriteQueryString() throws Exception {
@@ -220,11 +220,11 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getDataAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
+ assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
assertEquals(200,method.getStatusCode());
- assert(method.getDataAsString().indexOf("name=\"query\";value=\"string\"")
== -1);
- assert(method.getDataAsString().indexOf("name=\"param\";value=\"eter\"") >=
0);
- assert(method.getDataAsString().indexOf("name=\"para\";value=\"meter\"") >=
0);
+
assert(method.getResponseBodyAsString().indexOf("name=\"query\";value=\"string\"") ==
-1);
+
assert(method.getResponseBodyAsString().indexOf("name=\"param\";value=\"eter\"") >= 0);
+
assert(method.getResponseBodyAsString().indexOf("name=\"para\";value=\"meter\"") >= 0);
}
/**
@@ -246,11 +246,11 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getDataAsString().indexOf("<title>Param Servlet:
POST</title>") >= 0);
+ assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet:
POST</title>") >= 0);
assertEquals(200,method.getStatusCode());
-
assert(method.getDataAsString().indexOf("<p>QueryString=\"query=string\"</p>") >= 0);
-
assert(method.getDataAsString(),method.getDataAsString().indexOf("name=\"param\";value=\"eter\"")
>= 0);
- assert(method.getDataAsString().indexOf("name=\"para\";value=\"meter\"") >=
0);
+
assert(method.getResponseBodyAsString().indexOf("<p>QueryString=\"query=string\"</p>")
>= 0);
+
assert(method.getResponseBodyAsString(),method.getResponseBodyAsString().indexOf("name=\"param\";value=\"eter\"")
>= 0);
+
assert(method.getResponseBodyAsString().indexOf("name=\"para\";value=\"meter\"") >= 0);
}
}
1.1.2.3 +13 -13
jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestWebappRedirect.java
Index: TestWebappRedirect.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestWebappRedirect.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TestWebappRedirect.java 2001/08/14 23:06:46 1.1.2.2
+++ TestWebappRedirect.java 2001/08/15 23:19:34 1.1.2.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestWebappRedirect.java,v
1.1.2.2 2001/08/14 23:06:46 rwaldhoff Exp $
- * $Revision: 1.1.2.2 $
- * $Date: 2001/08/14 23:06:46 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/Attic/TestWebappRedirect.java,v
1.1.2.3 2001/08/15 23:19:34 rwaldhoff Exp $
+ * $Revision: 1.1.2.3 $
+ * $Date: 2001/08/15 23:19:34 $
* ====================================================================
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
@@ -33,7 +33,7 @@
* "httpclient.test.webappContext" property.
*
* @author Rodney Waldhoff
- * @version $Id: TestWebappRedirect.java,v 1.1.2.2 2001/08/14 23:06:46 rwaldhoff
Exp $
+ * @version $Id: TestWebappRedirect.java,v 1.1.2.3 2001/08/15 23:19:34 rwaldhoff
Exp $
*/
public class TestWebappRedirect extends TestCase {
@@ -83,7 +83,7 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getDataAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
+ assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
}
public void testRedirectWithQueryString() throws Exception {
@@ -99,8 +99,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getDataAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
-
assert(method.getDataAsString().indexOf("<p>QueryString=\"foo=bar&bar=foo\"</p>") >=
0);
+ assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
+
assert(method.getResponseBodyAsString().indexOf("<p>QueryString=\"foo=bar&bar=foo\"</p>")
>= 0);
}
public void testRecursiveRedirect() throws Exception {
@@ -121,8 +121,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getDataAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
-
assert(method.getDataAsString().indexOf("<p>QueryString=\"foo=bar&bar=foo\"</p>") >=
0);
+ assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet:
GET</title>") >= 0);
+
assert(method.getResponseBodyAsString().indexOf("<p>QueryString=\"foo=bar&bar=foo\"</p>")
>= 0);
}
public void testPostRedirect() throws Exception {
@@ -140,10 +140,10 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getDataAsString().indexOf("<title>Param Servlet:
POST</title>") >= 0);
-
assert(method.getDataAsString().indexOf("<p>QueryString=\"foo=bar&bar=foo\"</p>") >=
0);
- assert(method.getDataAsString().indexOf("name=\"para\";value=\"meter\"") >=
0);
- assert(method.getDataAsString().indexOf("name=\"param\";value=\"eter\"") >=
0);
+ assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet:
POST</title>") >= 0);
+
assert(method.getResponseBodyAsString().indexOf("<p>QueryString=\"foo=bar&bar=foo\"</p>")
>= 0);
+
assert(method.getResponseBodyAsString().indexOf("name=\"para\";value=\"meter\"") >= 0);
+
assert(method.getResponseBodyAsString().indexOf("name=\"param\";value=\"eter\"") >= 0);
}
public void testPutRedirect() throws Exception {
