camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bvah...@apache.org
Subject camel git commit: Fixed the failing test and polish it a bit
Date Sat, 07 May 2016 20:00:44 GMT
Repository: camel
Updated Branches:
  refs/heads/master 2163d8e84 -> 61cd48af7


Fixed the failing test and polish it a bit

Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/61cd48af
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/61cd48af
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/61cd48af

Branch: refs/heads/master
Commit: 61cd48af7d16d0e589b19dcdaf616bbb1246fef1
Parents: 2163d8e
Author: Babak Vahdat <bvahdat@apache.org>
Authored: Sat May 7 22:00:07 2016 +0200
Committer: Babak Vahdat <bvahdat@apache.org>
Committed: Sat May 7 22:00:07 2016 +0200

----------------------------------------------------------------------
 ...HttpProxyServerWithSystemPropertiesTest.java | 31 ++++++++++----------
 1 file changed, 16 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/61cd48af/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerWithSystemPropertiesTest.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerWithSystemPropertiesTest.java
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerWithSystemPropertiesTest.java
index 47cd47e..5e686da 100644
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerWithSystemPropertiesTest.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerWithSystemPropertiesTest.java
@@ -52,14 +52,13 @@ import org.junit.Test;
  * @version 
  */
 public class HttpProxyServerWithSystemPropertiesTest extends BaseHttpTest {
-    
+
     private HttpServer proxy;
-    
+
     @Before
     @Override
     public void setUp() throws Exception {
-        Map<String, String> expectedHeaders = new HashMap<String, String>();
-        expectedHeaders.put("Proxy-Connection", "Keep-Alive");
+        Map<String, String> expectedHeaders = new HashMap<>();
         proxy = ServerBootstrap.bootstrap().
                 setHttpProcessor(getBasicHttpProcessor()).
                 setConnectionReuseStrategy(getConnectionReuseStrategy()).
@@ -68,9 +67,12 @@ public class HttpProxyServerWithSystemPropertiesTest extends BaseHttpTest
{
                 setSslContext(getSSLContext()).
                 registerHandler("*", new HeaderValidationHandler("GET", null, null, getExpectedContent(),
expectedHeaders)).create();
         proxy.start();
-        
+
+        expectedHeaders.put("Connection", "Keep-Alive");
+        expectedHeaders.put("Host", getProxyHost() + ":" + getProxyPort());
+
         System.getProperties().setProperty("http.proxyHost", getProxyHost());
-        System.getProperties().setProperty("http.proxyPort", String.valueOf(getProxyPort()));
+        System.getProperties().setProperty("http.proxyPort", getProxyPort());
 
         super.setUp();
     }
@@ -84,7 +86,7 @@ public class HttpProxyServerWithSystemPropertiesTest extends BaseHttpTest
{
             proxy.stop();
         }
     }
-    
+
     @Override
     protected HttpProcessor getBasicHttpProcessor() {
         List<HttpRequestInterceptor> requestInterceptors = new ArrayList<HttpRequestInterceptor>();
@@ -95,7 +97,6 @@ public class HttpProxyServerWithSystemPropertiesTest extends BaseHttpTest
{
         ImmutableHttpProcessor httpproc = new ImmutableHttpProcessor(requestInterceptors,
responseInterceptors);
         return httpproc;
     }
-    
 
     @Test
     public void httpGetWithProxyFromSystemProperties() throws Exception {
@@ -112,14 +113,14 @@ public class HttpProxyServerWithSystemPropertiesTest extends BaseHttpTest
{
         return proxy.getInetAddress().getHostName();
     }
 
-    private int getProxyPort() {
-        return proxy.getLocalPort();
+    private String getProxyPort() {
+        return "" + proxy.getLocalPort();
     }
-    
-    class RequestProxyBasicAuth implements HttpRequestInterceptor {
+
+    private static class RequestProxyBasicAuth implements HttpRequestInterceptor {
         public void process(final HttpRequest request, final HttpContext context) throws
HttpException, IOException {
             String auth = null;
-            
+
             String requestLine = request.getRequestLine().toString();
             // assert we set a write GET URI
             if (requestLine.contains("http4://localhost")) {
@@ -154,11 +155,11 @@ public class HttpProxyServerWithSystemPropertiesTest extends BaseHttpTest
{
         }
     }
 
-    class ResponseProxyBasicUnauthorized implements HttpResponseInterceptor {
+    private static class ResponseProxyBasicUnauthorized implements HttpResponseInterceptor
{
         public void process(final HttpResponse response, final HttpContext context) throws
HttpException, IOException {
             if (response.getStatusLine().getStatusCode() == HttpStatus.SC_PROXY_AUTHENTICATION_REQUIRED)
{
                 response.addHeader(AUTH.PROXY_AUTH, "Basic realm=\"test realm\"");
             }
         }
     }
-}
\ No newline at end of file
+}


Mime
View raw message