Return-Path: Delivered-To: apmail-hc-commits-archive@www.apache.org Received: (qmail 47584 invoked from network); 4 Feb 2008 00:59:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Feb 2008 00:59:04 -0000 Received: (qmail 35368 invoked by uid 500); 4 Feb 2008 00:58:56 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 35335 invoked by uid 500); 4 Feb 2008 00:58:55 -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 35326 invoked by uid 99); 4 Feb 2008 00:58:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Feb 2008 16:58:55 -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:58:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7AB461A983E; Sun, 3 Feb 2008 16:58:43 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r618138 - /httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/conn/params/TestRouteParams.java Date: Mon, 04 Feb 2008 00:58:43 -0000 To: commits@hc.apache.org From: rolandw@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080204005843.7AB461A983E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rolandw Date: Sun Feb 3 16:58:42 2008 New Revision: 618138 URL: http://svn.apache.org/viewvc?rev=618138&view=rev Log: tests for hierarchical unsetting of default proxy 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=618138&r1=618137&r2=618138&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:58:42 2008 @@ -40,9 +40,14 @@ import org.apache.http.HttpHost; import org.apache.http.params.HttpParams; import org.apache.http.params.BasicHttpParams; +import org.apache.http.params.DefaultedHttpParams; import org.apache.http.conn.params.HttpConnectionManagerParams; import org.apache.http.conn.routing.HttpRoute; +// for hierarchy testing +import org.apache.http.impl.client.ClientParamsStack; + + /** * Unit tests for parameters. @@ -124,6 +129,43 @@ HttpRouteParams.setForcedRoute(params, HttpRouteParams.NO_ROUTE); assertNull("null route not detected", HttpRouteParams.getForcedRoute(params)); + } + + + public void testUnsetHierarchy() { + // hierarchical unsetting is only tested for the default proxy + HttpParams daddy = new BasicHttpParams(); + HttpParams dummy = new BasicHttpParams(); + HttpParams child = new BasicHttpParams(); + + HttpRouteParams.setDefaultProxy(daddy, TARGET1); + HttpRouteParams.setDefaultProxy(child, HttpRouteParams.NO_HOST); + + HttpParams hierarchy = + new ClientParamsStack(null, daddy, child, null); + assertNull("1", HttpRouteParams.getDefaultProxy(hierarchy)); + + hierarchy = new ClientParamsStack + (null, + daddy, + new ClientParamsStack(null, child, dummy, null), + null); + assertNull("2", HttpRouteParams.getDefaultProxy(hierarchy)); + + hierarchy = new ClientParamsStack + (null, daddy, new DefaultedHttpParams(child, dummy), null); + assertNull("3", HttpRouteParams.getDefaultProxy(hierarchy)); + + hierarchy = new DefaultedHttpParams(child, daddy); + assertNull("4", HttpRouteParams.getDefaultProxy(hierarchy)); + + hierarchy = new DefaultedHttpParams + (new DefaultedHttpParams(child, dummy), daddy); + assertNull("5", HttpRouteParams.getDefaultProxy(hierarchy)); + + hierarchy = new DefaultedHttpParams + (child, new DefaultedHttpParams(dummy, daddy)); + assertNull("6", HttpRouteParams.getDefaultProxy(hierarchy)); }