Return-Path: Delivered-To: apmail-hc-commits-archive@www.apache.org Received: (qmail 40310 invoked from network); 4 Feb 2008 00:29:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Feb 2008 00:29:35 -0000 Received: (qmail 17849 invoked by uid 500); 4 Feb 2008 00:29:27 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 17820 invoked by uid 500); 4 Feb 2008 00:29:26 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 17811 invoked by uid 99); 4 Feb 2008 00:29:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Feb 2008 16:29:26 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Feb 2008 00:29:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A68C41A9832; Sun, 3 Feb 2008 16:29:11 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r618133 - /httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/conn/params/TestRouteParams.java Date: Mon, 04 Feb 2008 00:29:11 -0000 To: commits@hc.apache.org From: rolandw@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080204002911.A68C41A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rolandw Date: Sun Feb 3 16:29:06 2008 New Revision: 618133 URL: http://svn.apache.org/viewvc?rev=618133&view=rev Log: more tests for route params, coverage complete Modified: httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/conn/params/TestRouteParams.java Modified: httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/conn/params/TestRouteParams.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/conn/params/TestRouteParams.java?rev=618133&r1=618132&r2=618133&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/conn/params/TestRouteParams.java (original) +++ httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/conn/params/TestRouteParams.java Sun Feb 3 16:29:06 2008 @@ -31,6 +31,8 @@ package org.apache.http.conn.params; +import java.net.InetAddress; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -52,6 +54,16 @@ HttpHost TARGET1 = new HttpHost("target1.test.invalid"); public final static HttpRoute ROUTE1 = new HttpRoute(TARGET1); + public final static InetAddress LOCAL1; + + // need static initializer to deal with exceptions + static { + try { + LOCAL1 = InetAddress.getByAddress(new byte[]{ 127, 0, 0, 1 }); + } catch (Exception x) { + throw new ExceptionInInitializerError(x); + } + } public TestRouteParams(String testName) { @@ -65,6 +77,53 @@ public static Test suite() { return new TestSuite(TestRouteParams.class); + } + + + + public void testSetGet() { + HttpParams params = new BasicHttpParams(); + + assertNull("phantom proxy", + HttpRouteParams.getDefaultProxy(params)); + assertNull("phantom route", + HttpRouteParams.getForcedRoute(params)); + assertNull("phantom address", + HttpRouteParams.getLocalAddress(params)); + + HttpRouteParams.setDefaultProxy(params, TARGET1); + assertSame("wrong proxy", TARGET1, + HttpRouteParams.getDefaultProxy(params)); + HttpRouteParams.setForcedRoute(params, ROUTE1); + assertSame("wrong route", ROUTE1, + HttpRouteParams.getForcedRoute(params)); + HttpRouteParams.setLocalAddress(params, LOCAL1); + assertSame("wrong address", LOCAL1, + HttpRouteParams.getLocalAddress(params)); + } + + + public void testSetNull() { + HttpParams params = new BasicHttpParams(); + + HttpRouteParams.setDefaultProxy(params, null); + HttpRouteParams.setForcedRoute(params, null); + HttpRouteParams.setLocalAddress(params, null); + + assertNull("phantom proxy", + HttpRouteParams.getDefaultProxy(params)); + assertNull("phantom route", + HttpRouteParams.getForcedRoute(params)); + assertNull("phantom address", + HttpRouteParams.getLocalAddress(params)); + + HttpRouteParams.setDefaultProxy(params, HttpRouteParams.NO_HOST); + assertNull("null proxy not detected", + HttpRouteParams.getDefaultProxy(params)); + + HttpRouteParams.setForcedRoute(params, HttpRouteParams.NO_ROUTE); + assertNull("null route not detected", + HttpRouteParams.getForcedRoute(params)); }