report proxy exception in ChannelInboundHandlerAdapter, add more unit…

… tests for error in proxy

Signed-off-by: alexlehm <alexlehm@gmail.com>

src/main/java/io/vertx/core/net/impl/ProxyChannelProvider.java

@@ -87,6 +87,12 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
                 }
                 ctx.fireUserEventTriggered(evt);
               }
+
+              @Override
+              public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause)
+                      throws Exception {
+                channelHandler.handle(Future.failedFuture(cause));
+              }
             });
           }
         });

src/test/java/io/vertx/test/core/ProxyErrorTest.java

@@ -4,11 +4,6 @@
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
-import io.netty.util.internal.logging.InternalLoggerFactory;
-import io.netty.util.internal.logging.Log4JLoggerFactory;
-import io.vertx.core.Vertx;
 import io.vertx.core.http.HttpClient;
 import io.vertx.core.http.HttpClientOptions;
 import io.vertx.core.logging.Logger;
@@ -26,39 +21,39 @@ public class ProxyErrorTest extends VertxTestBase {
 
   private static final Logger log = LoggerFactory.getLogger(ProxyErrorTest.class);
 
-  private ConnectHttpProxy proxy;
+  private ConnectHttpProxy proxy = null;
 
   // we don't start a https server, due to the error, it will not be queried 
-  @Override
-  public void setUp() throws Exception {
-//    InternalLoggerFactory.setDefaultFactory(Log4JLoggerFactory.INSTANCE);
-    super.setUp();
+
+  private void startProxy(int error, String username) throws InterruptedException {
     CountDownLatch latch = new CountDownLatch(1);
-    proxy = new ConnectHttpProxy(null);
-    proxy.setError(403);
+    proxy = new ConnectHttpProxy(username);
+    proxy.setError(error);
     proxy.start(vertx, v -> latch.countDown());
     latch.await();
-    log.info("proxy");
   }
 
   @Override
   public void tearDown() throws Exception {
     super.tearDown();
-    proxy.stop();
+    if (proxy!=null) {
+      proxy.stop();
+    }
   }
 
   @Test
   public void testProxyError() throws Exception {
+    startProxy(403, null);
+
     CountDownLatch latch = new CountDownLatch(1);
 
     final HttpClientOptions options = new HttpClientOptions()
         .setProxyOptions(new ProxyOptions()
             .setType(ProxyType.HTTP)
             .setHost("localhost")
-            .setPort(13128));
+            .setPort(proxy.getPort()));
     HttpClient client = vertx.createHttpClient(options);
 
-    log.info("starting request");
     client.getAbs("https://localhost/", resp -> {
       log.info("this request is supposed to fail");
       fail();
@@ -68,7 +63,58 @@ public void testProxyError() throws Exception {
       latch.countDown();
     })
     .end();
-    log.info("request.end");
+
+    latch.await();
+  }
+
+  @Test
+  public void testProxyAuthFail() throws Exception {
+    startProxy(0, "user");
+
+    CountDownLatch latch = new CountDownLatch(1);
+
+    final HttpClientOptions options = new HttpClientOptions()
+        .setProxyOptions(new ProxyOptions()
+            .setType(ProxyType.HTTP)
+            .setHost("localhost")
+            .setPort(proxy.getPort()));
+    HttpClient client = vertx.createHttpClient(options);
+
+    client.getAbs("https://localhost/", resp -> {
+      log.info("this request is supposed to fail");
+      fail();
+    })
+    .exceptionHandler(e -> {
+      log.warn("Exception", e);
+      latch.countDown();
+    })
+    .end();
+
+    latch.await();
+  }
+
+  @Test
+  public void testProxyHostUnknown() throws Exception {
+    startProxy(0, null);
+
+    CountDownLatch latch = new CountDownLatch(1);
+
+    final HttpClientOptions options = new HttpClientOptions()
+        .setProxyOptions(new ProxyOptions()
+            .setType(ProxyType.HTTP)
+            .setHost("localhost")
+            .setPort(proxy.getPort()));
+    HttpClient client = vertx.createHttpClient(options);
+
+    client.getAbs("https://unknown.hostname/", resp -> {
+      log.info("this request is supposed to fail");
+      fail();
+    })
+    .exceptionHandler(e -> {
+      log.warn("Exception", e);
+      latch.countDown();
+    })
+    .end();
 
     latch.await();
   }