svn commit: r618138 - /httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/conn/params/TestRouteParams.java

[ro...@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));
     }