olegk 2003/01/25 04:52:07
Modified: httpclient/src/test/org/apache/commons/httpclient
TestMethodsRedirectNoHost.java
SimpleHttpConnection.java TestRequestHeaders.java
Log:
Removed references to deprecated HttpConnection constructors from test cases
Revision Changes Path
1.4 +7 -7
jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestMethodsRedirectNoHost.java
Index: TestMethodsRedirectNoHost.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestMethodsRedirectNoHost.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestMethodsRedirectNoHost.java 23 Jan 2003 22:48:27 -0000 1.3
+++ TestMethodsRedirectNoHost.java 25 Jan 2003 12:52:07 -0000 1.4
@@ -218,7 +218,7 @@
}
public void testRedirectDifferentHost() throws Exception {
- conn = new SimpleHttpConnection("oldhost", 80, false);
+ conn = new SimpleHttpConnection("oldhost", 80);
addRedirectResponse("http://newhost/newfile";);
addOkResponse();
conn.open();
@@ -232,7 +232,7 @@
}
public void testRedirectDifferentPort() throws Exception {
- conn = new SimpleHttpConnection("oldhost", 80, false);
+ conn = new SimpleHttpConnection("oldhost", 80);
addRedirectResponse("http://oldhost:8080/newfile";);
addOkResponse();
conn.open();
@@ -247,7 +247,7 @@
public void testRedirectDifferentProtocol() throws Exception {
- conn = new SimpleHttpConnection("oldhost", 80, false);
+ conn = new SimpleHttpConnection("oldhost", 80);
addRedirectResponse("https://oldhost:80/newfile";);
addOkResponse();
conn.open();
1.7 +11 -6
jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/SimpleHttpConnection.java
Index: SimpleHttpConnection.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/SimpleHttpConnection.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SimpleHttpConnection.java 23 Jan 2003 22:48:22 -0000 1.6
+++ SimpleHttpConnection.java 25 Jan 2003 12:52:07 -0000 1.7
@@ -63,6 +63,7 @@
package org.apache.commons.httpclient;
+import org.apache.commons.httpclient.protocol.Protocol;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -109,11 +110,15 @@
}
public SimpleHttpConnection() {
- super(null, -1, "localhost", 80, false);
+ super(null, -1, "localhost", 80, Protocol.getProtocol("http"));
}
- public SimpleHttpConnection(String host, int port, boolean isSecure){
- super(host, port, isSecure);
+ public SimpleHttpConnection(String host, int port){
+ super(host, port, Protocol.getProtocol("http"));
+ }
+
+ public SimpleHttpConnection(String host, int port, String schema){
+ super(host, port, Protocol.getProtocol(schema));
}
public void assertOpen() throws IllegalStateException {
1.5 +9 -9
jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestRequestHeaders.java
Index: TestRequestHeaders.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestRequestHeaders.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestRequestHeaders.java 23 Jan 2003 22:48:27 -0000 1.4
+++ TestRequestHeaders.java 25 Jan 2003 12:52:07 -0000 1.5
@@ -107,31 +107,31 @@
}
public void testNullHeader() throws Exception {
- conn = new SimpleHttpConnection("some.host.name", 80, false);
+ conn = new SimpleHttpConnection("some.host.name", 80, "http");
assertEquals(null, method.getRequestHeader(null));
assertEquals(null, method.getRequestHeader("bogus"));
}
public void testHostHeaderPortHTTP80() throws Exception {
- conn = new SimpleHttpConnection("some.host.name", 80, false);
+ conn = new SimpleHttpConnection("some.host.name", 80, "http");
method.addRequestHeaders(state, conn);
assertEquals("Host: some.host.name",
method.getRequestHeader("Host").toString().trim());
}
public void testHostHeaderPortHTTP81() throws Exception {
- conn = new SimpleHttpConnection("some.host.name", 81, false);
+ conn = new SimpleHttpConnection("some.host.name", 81, "http");
method.addRequestHeaders(state, conn);
assertEquals("Host: some.host.name:81",
method.getRequestHeader("Host").toString().trim());
}
public void testHostHeaderPortHTTPS443() throws Exception {
- conn = new SimpleHttpConnection("some.host.name", 443, true);
+ conn = new SimpleHttpConnection("some.host.name", 443, "https");
method.addRequestHeaders(state, conn);
assertEquals("Host: some.host.name",
method.getRequestHeader("Host").toString().trim());
}
public void testHostHeaderPortHTTPS444() throws Exception {
- conn = new SimpleHttpConnection("some.host.name", 444, true);
+ conn = new SimpleHttpConnection("some.host.name", 444, "https");
method.addRequestHeaders(state, conn);
assertEquals("Host: some.host.name:444",
method.getRequestHeader("Host").toString().trim());
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
