Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-715: changed tests and one example to not use RoutedRequest 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk@603969 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Roland Weber 2007-12-13 18:30:18 +00:00
parent 92a3847e4c
commit 389cd303f2
4 changed files with 20 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
module-client/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java
View File

@ -39,9 +39,7 @@ import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.HttpVersion;
import org.apache.http.client.HttpClient;
import org.apache.http.client.RoutedRequest;
import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.conn.HttpRoute;
import org.apache.http.conn.PlainSocketFactory;
import org.apache.http.conn.Scheme;
import org.apache.http.conn.SchemeRegistry;
@ -98,13 +96,10 @@ public class ClientExecuteDirect {
HttpRequest req = createRequest();
final HttpRoute route = new HttpRoute(target, null, false);
final RoutedRequest roureq = new RoutedRequest.Impl(req, route);
System.out.println("executing request to " + target);
HttpEntity entity = null;
try {
HttpResponse rsp = client.execute(roureq, null);
HttpResponse rsp = client.execute(target, req, null);
entity = rsp.getEntity();
System.out.println("----------------------------------------");

1
module-client/src/main/java/org/apache/http/client/HttpClient.java
View File

@ -219,5 +219,4 @@ public interface HttpClient {
throws HttpException, IOException, InterruptedException
;
} // interface HttpClient

52
module-client/src/test/java/org/apache/http/client/protocol/TestRedirects.java
View File

@ -45,7 +45,6 @@ import org.apache.http.ProtocolVersion;
import org.apache.http.client.CircularRedirectException;
import org.apache.http.client.CookieStore;
import org.apache.http.client.RedirectException;
import org.apache.http.client.RoutedRequest;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.params.ClientPNames;
@ -244,8 +243,7 @@ public class TestRedirects extends ServerTestBase {
HttpGet httpget = new HttpGet("/oldlocation/");
RoutedRequest request = new RoutedRequest.Impl(httpget, getDefaultRoute());
HttpResponse response = client.execute(request, context);
HttpResponse response = client.execute(getServerHttp(), httpget, context);
HttpEntity e = response.getEntity();
if (e != null) {
e.consumeContent();
@ -269,8 +267,7 @@ public class TestRedirects extends ServerTestBase {
HttpGet httpget = new HttpGet("/oldlocation/");
RoutedRequest request = new RoutedRequest.Impl(httpget, getDefaultRoute());
HttpResponse response = client.execute(request, context);
HttpResponse response = client.execute(getServerHttp(), httpget, context);
HttpEntity e = response.getEntity();
if (e != null) {
e.consumeContent();
@ -298,8 +295,7 @@ public class TestRedirects extends ServerTestBase {
HttpGet httpget = new HttpGet("/oldlocation/");
RoutedRequest request = new RoutedRequest.Impl(httpget, getDefaultRoute());
HttpResponse response = client.execute(request, context);
HttpResponse response = client.execute(getServerHttp(), httpget, context);
HttpEntity e = response.getEntity();
if (e != null) {
e.consumeContent();
@ -327,8 +323,7 @@ public class TestRedirects extends ServerTestBase {
HttpGet httpget = new HttpGet("/oldlocation/");
RoutedRequest request = new RoutedRequest.Impl(httpget, getDefaultRoute());
HttpResponse response = client.execute(request, context);
HttpResponse response = client.execute(getServerHttp(), httpget, context);
HttpEntity e = response.getEntity();
if (e != null) {
e.consumeContent();
@ -356,8 +351,7 @@ public class TestRedirects extends ServerTestBase {
HttpGet httpget = new HttpGet("/oldlocation/");
RoutedRequest request = new RoutedRequest.Impl(httpget, getDefaultRoute());
HttpResponse response = client.execute(request, context);
HttpResponse response = client.execute(getServerHttp(), httpget, context);
HttpEntity e = response.getEntity();
if (e != null) {
e.consumeContent();
@ -381,8 +375,7 @@ public class TestRedirects extends ServerTestBase {
HttpGet httpget = new HttpGet("/oldlocation/");
RoutedRequest request = new RoutedRequest.Impl(httpget, getDefaultRoute());
HttpResponse response = client.execute(request, context);
HttpResponse response = client.execute(getServerHttp(), httpget, context);
HttpEntity e = response.getEntity();
if (e != null) {
e.consumeContent();
@ -406,8 +399,7 @@ public class TestRedirects extends ServerTestBase {
HttpGet httpget = new HttpGet("/oldlocation/");
RoutedRequest request = new RoutedRequest.Impl(httpget, getDefaultRoute());
HttpResponse response = client.execute(request, context);
HttpResponse response = client.execute(getServerHttp(), httpget, context);
HttpEntity e = response.getEntity();
if (e != null) {
e.consumeContent();
@ -433,9 +425,8 @@ public class TestRedirects extends ServerTestBase {
HttpGet httpget = new HttpGet("/circular-oldlocation/");
RoutedRequest request = new RoutedRequest.Impl(httpget, getDefaultRoute());
try {
client.execute(request, null);
client.execute(getServerHttp(), httpget);
fail("RedirectException exception should have been thrown");
} catch (RedirectException e) {
// expected
@ -450,9 +441,8 @@ public class TestRedirects extends ServerTestBase {
HttpGet httpget = new HttpGet("/circular-oldlocation/");
RoutedRequest request = new RoutedRequest.Impl(httpget, getDefaultRoute());
try {
client.execute(request, null);
client.execute(getServerHttp(), httpget);
fail("CircularRedirectException exception should have been thrown");
} catch (CircularRedirectException e) {
// expected
@ -470,8 +460,7 @@ public class TestRedirects extends ServerTestBase {
HttpPost httppost = new HttpPost("/oldlocation/");
httppost.setEntity(new StringEntity("stuff"));
RoutedRequest request = new RoutedRequest.Impl(httppost, getDefaultRoute());
HttpResponse response = client.execute(request, context);
HttpResponse response = client.execute(getServerHttp(), httppost, context);
HttpEntity e = response.getEntity();
if (e != null) {
e.consumeContent();
@ -497,8 +486,7 @@ public class TestRedirects extends ServerTestBase {
ClientPNames.REJECT_RELATIVE_REDIRECT, false);
HttpGet httpget = new HttpGet("/oldlocation/");
RoutedRequest request = new RoutedRequest.Impl(httpget, getDefaultRoute());
HttpResponse response = client.execute(request, context);
HttpResponse response = client.execute(getServerHttp(), httpget, context);
HttpEntity e = response.getEntity();
if (e != null) {
e.consumeContent();
@ -527,8 +515,7 @@ public class TestRedirects extends ServerTestBase {
ClientPNames.REJECT_RELATIVE_REDIRECT, false);
HttpGet httpget = new HttpGet("/test/oldlocation");
RoutedRequest request = new RoutedRequest.Impl(httpget, getDefaultRoute());
HttpResponse response = client.execute(request, context);
HttpResponse response = client.execute(getServerHttp(), httpget, context);
HttpEntity e = response.getEntity();
if (e != null) {
e.consumeContent();
@ -554,9 +541,8 @@ public class TestRedirects extends ServerTestBase {
ClientPNames.REJECT_RELATIVE_REDIRECT, true);
HttpGet httpget = new HttpGet("/oldlocation/");
RoutedRequest request = new RoutedRequest.Impl(httpget, getDefaultRoute());
try {
client.execute(request, null);
client.execute(getServerHttp(), httpget);
fail("ProtocolException exception should have been thrown");
} catch (ProtocolException e) {
// expected
@ -570,9 +556,8 @@ public class TestRedirects extends ServerTestBase {
HttpGet httpget = new HttpGet("/oldlocation/");
RoutedRequest request = new RoutedRequest.Impl(httpget, getDefaultRoute());
try {
client.execute(request, null);
client.execute(getServerHttp(), httpget);
fail("IllegalStateException should have been thrown");
} catch (IllegalStateException e) {
// expected
@ -589,9 +574,8 @@ public class TestRedirects extends ServerTestBase {
HttpGet httpget = new HttpGet("/oldlocation/");
RoutedRequest request = new RoutedRequest.Impl(httpget, getDefaultRoute());
try {
client.execute(request, null);
client.execute(getServerHttp(), httpget);
fail("ProtocolException should have been thrown");
} catch (ProtocolException e) {
// expected
@ -619,9 +603,8 @@ public class TestRedirects extends ServerTestBase {
HttpContext context = client.getDefaultContext();
HttpGet httpget = new HttpGet("/oldlocation/");
RoutedRequest request = new RoutedRequest.Impl(httpget, getDefaultRoute());
HttpResponse response = client.execute(request, context);
HttpResponse response = client.execute(getServerHttp(), httpget, context);
HttpEntity e = response.getEntity();
if (e != null) {
e.consumeContent();
@ -654,9 +637,8 @@ public class TestRedirects extends ServerTestBase {
HttpGet httpget = new HttpGet("/oldlocation/");
RoutedRequest request = new RoutedRequest.Impl(httpget, getDefaultRoute());
HttpResponse response = client.execute(request, context);
HttpResponse response = client.execute(getServerHttp(), httpget, context);
HttpEntity e = response.getEntity();
if (e != null) {
e.consumeContent();

3
module-client/src/test/java/org/apache/http/localserver/ServerTestBase.java
View File

@ -176,13 +176,14 @@ public abstract class ServerTestBase extends TestCase {
"http");
}
/**
* Obtains the default route to the local test server.
*
* @return the default route to the local test server
*/
protected HttpRoute getDefaultRoute() {
return new HttpRoute(new HttpHost("localhost", localServer.getServicePort()));
return new HttpRoute(getServerHttp());
}