From 38761e7e46ef262841f2acaf6bcf40a17201230d Mon Sep 17 00:00:00 2001 From: Roland Weber Date: Sun, 3 Feb 2008 18:14:48 +0000 Subject: [PATCH] HTTPCLIENT-723: basic test coverage for ProxySelectorRoutePlanner git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@618048 13f79535-47bb-0310-9956-ffa450edef68 --- RELEASE_NOTES.txt | 3 + .../http/impl/conn/TestAllConnImpl.java | 1 + .../impl/conn/TestProxySelRoutePlanner.java | 141 ++++++++++++++++++ .../http/mockup/ProxySelectorMockup.java | 94 ++++++++++++ 4 files changed, 239 insertions(+) create mode 100644 module-client/src/test/java/org/apache/http/impl/conn/TestProxySelRoutePlanner.java create mode 100644 module-client/src/test/java/org/apache/http/mockup/ProxySelectorMockup.java diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index 40f8121a1..19d5f4219 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,6 +1,9 @@ Changes since 4.0 Alpha 2 ------------------- +* [HTTPCLIENT-723] route planner based on java.net.ProxySelector + Contributed by Roland Weber + * [HTTPCLIENT-740] don't start connection GC thread in pool constructor Contributed by Roland Weber diff --git a/module-client/src/test/java/org/apache/http/impl/conn/TestAllConnImpl.java b/module-client/src/test/java/org/apache/http/impl/conn/TestAllConnImpl.java index b73c84223..5165c736c 100644 --- a/module-client/src/test/java/org/apache/http/impl/conn/TestAllConnImpl.java +++ b/module-client/src/test/java/org/apache/http/impl/conn/TestAllConnImpl.java @@ -44,6 +44,7 @@ public class TestAllConnImpl extends TestCase { TestSuite suite = new TestSuite(); suite.addTest(TestLocalServer.suite()); // doesn't really belong here + suite.addTest(TestProxySelRoutePlanner.suite()); suite.addTest(TestTSCCMNoServer.suite()); suite.addTest(TestTSCCMWithServer.suite()); diff --git a/module-client/src/test/java/org/apache/http/impl/conn/TestProxySelRoutePlanner.java b/module-client/src/test/java/org/apache/http/impl/conn/TestProxySelRoutePlanner.java new file mode 100644 index 000000000..8d8d6ad81 --- /dev/null +++ b/module-client/src/test/java/org/apache/http/impl/conn/TestProxySelRoutePlanner.java @@ -0,0 +1,141 @@ +/* + * $HeadURL$ + * $Revision$ + * $Date$ + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + +package org.apache.http.impl.conn; + + +import java.net.Proxy; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.util.List; +import java.util.ArrayList; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +import org.apache.http.HttpHost; +import org.apache.http.HttpRequest; +import org.apache.http.HttpVersion; +import org.apache.http.message.BasicHttpRequest; + +import org.apache.http.conn.PlainSocketFactory; +import org.apache.http.conn.Scheme; +import org.apache.http.conn.SchemeRegistry; +import org.apache.http.conn.SocketFactory; +import org.apache.http.conn.routing.HttpRoute; +import org.apache.http.conn.routing.HttpRoutePlanner; + +import org.apache.http.mockup.ProxySelectorMockup; + + + +/** + * Tests for ProxySelectorRoutePlanner. + */ +public class TestProxySelRoutePlanner extends TestCase { + + public TestProxySelRoutePlanner(String testName) { + super(testName); + } + + public static void main(String args[]) { + String[] testCaseName = { TestProxySelRoutePlanner.class.getName() }; + junit.textui.TestRunner.main(testCaseName); + } + + public static Test suite() { + return new TestSuite(TestProxySelRoutePlanner.class); + } + + + /** + * Instantiates a default scheme registry. + * + * @return the default scheme registry + */ + public SchemeRegistry createSchemeRegistry() { + + SchemeRegistry schreg = new SchemeRegistry(); + SocketFactory sf = PlainSocketFactory.getSocketFactory(); + schreg.register(new Scheme("http", sf, 80)); + + return schreg; + } + + + public void testDirect() throws Exception { + + HttpRoutePlanner hrp = + new ProxySelectorRoutePlanner(createSchemeRegistry(), + new ProxySelectorMockup(null)); + + HttpHost target = + new HttpHost("www.test.invalid", 80, "http"); + HttpRequest request = + new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1); + + HttpRoute route = hrp.determineRoute(target, request, null); + + assertEquals("wrong target", target, route.getTargetHost()); + assertEquals("not direct", 1, route.getHopCount()); + } + + + public void testProxy() throws Exception { + + InetAddress ia = InetAddress.getByAddress(new byte[] { + (byte)127, (byte)0, (byte)0, (byte)1 + }); + InetSocketAddress isa1 = new InetSocketAddress(ia, 11111); + InetSocketAddress isa2 = new InetSocketAddress(ia, 22222); + + List proxies = new ArrayList(2); + proxies.add(new Proxy(Proxy.Type.HTTP, isa1)); + proxies.add(new Proxy(Proxy.Type.HTTP, isa2)); + + HttpRoutePlanner hrp = + new ProxySelectorRoutePlanner(createSchemeRegistry(), + new ProxySelectorMockup(proxies)); + + HttpHost target = + new HttpHost("www.test.invalid", 80, "http"); + HttpRequest request = + new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1); + + HttpRoute route = hrp.determineRoute(target, request, null); + + assertEquals("wrong target", target, route.getTargetHost()); + assertEquals("not via proxy", 2, route.getHopCount()); + assertEquals("wrong proxy", isa1.getPort(), + route.getProxyHost().getPort()); + } + +} // class TestProxySelRoutePlanner diff --git a/module-client/src/test/java/org/apache/http/mockup/ProxySelectorMockup.java b/module-client/src/test/java/org/apache/http/mockup/ProxySelectorMockup.java new file mode 100644 index 000000000..9be9c96ed --- /dev/null +++ b/module-client/src/test/java/org/apache/http/mockup/ProxySelectorMockup.java @@ -0,0 +1,94 @@ +/* + * $HeadURL$ + * $Revision$ + * $Date$ + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + +package org.apache.http.mockup; + + +import java.net.URI; +import java.net.Proxy; +import java.net.ProxySelector; +import java.net.SocketAddress; + +import java.util.List; +import java.util.ArrayList; +import java.io.IOException; + + + +/** + * Mockup of a {@link ProxySelector}. + * Always returns a fixed list. + */ +public class ProxySelectorMockup extends ProxySelector { + + protected List proxyList; + + + /** + * Creates a mock proxy selector. + * + * @param proxies the list of proxies, or + * null for direct connections + */ + public ProxySelectorMockup(List proxies) { + + if (proxies == null) { + proxies = new ArrayList(1); + proxies.add(Proxy.NO_PROXY); + } else if (proxies.isEmpty()) { + throw new IllegalArgumentException + ("Proxy list must not be empty."); + } + + proxyList = proxies; + } + + + /** + * Obtains the constructor argument. + * + * @param ignored not used by this mockup + * + * @return the list passed to the constructor, + * or a default list with "DIRECT" as the only element + */ + public List select(URI ignored) { + return proxyList; + } + + + /** + * Does nothing. + */ + public void connectFailed(URI uri, SocketAddress sa, IOException ioe) { + // no body + } +} +