Subrouter failure handler is ignored (vert-x3#2779)

* fix vert-x3#2772 Subrouter failure handler is ignored

* fix(test): do junit assert in vert.x and add timeout

* Revert changes in WebTestBase

We can use existing testRequest methods

Signed-off-by: Thomas Segismont <[email protected]>

---------

Signed-off-by: Thomas Segismont <[email protected]>
Co-authored-by: Thomas Segismont <[email protected]>

Author: takeseem

vertx-web/src/main/java/io/vertx/ext/web/impl/RoutingContextImplBase.java

@@ -144,6 +144,19 @@ boolean iterateNext() {
           currentRoute.handleFailure(this);
           return true;
         }
+
+        RouterImpl subRouter = (RouterImpl) currentRoute.getSubRouter();
+        if (subRouter != null) {
+          int statusCode = statusCode();
+          if (statusCode == -1) {
+            statusCode = failed ? 500 : matchFailure;
+          }
+          Handler<RoutingContext> errorHandler = subRouter.getErrorHandlerByStatusCode(statusCode);
+          if (errorHandler != null) {
+            errorHandler.handle(this);
+            return true;
+          }
+        }
       } catch (Throwable t) {
         handleInHandlerRuntimeFailure(currentRoute.getRouter(), failed, t);
         return true;

vertx-web/src/test/java/io/vertx/ext/web/SubRouterTest.java

@@ -16,13 +16,17 @@
 
 package io.vertx.ext.web;
 
+import io.netty.handler.codec.http.HttpResponseStatus;
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
 import io.vertx.core.http.HttpMethod;
 import org.junit.Test;
 
 import java.util.function.Consumer;
 
+import static io.netty.handler.codec.http.HttpResponseStatus.INTERNAL_SERVER_ERROR;
+import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND;
+
 /**
  * @author <a href="http://tfox.org">Tim Fox</a>
  */
@@ -741,4 +745,41 @@ public void testHierarchicalWithParamsSimpleWithDummy() throws Exception {
 
     testRequest(HttpMethod.GET, "/rest/product/123/bar", 200, "OK");
   }
+
+  @Test
+  public void testSetExceptionHandler() throws Exception {
+    Router restRouter = Router.router(vertx);
+    Router productRouter = Router.router(vertx);
+    Router instanceRouter = Router.router(vertx);
+
+    router.route("/rest*").subRouter(restRouter);
+    restRouter.route("/product*").subRouter(productRouter);
+    productRouter.route("/:id*").subRouter(instanceRouter);
+    instanceRouter.get("/:foo").handler(ctx -> {
+      if ("ex".equals(ctx.pathParam("foo"))) {
+        throw new RuntimeException("ouch!");
+      }
+      ctx.response().end();
+    });
+
+    testRequest(HttpMethod.GET, "/rest/product/123/ex", 500, "Internal Server Error", "Internal Server Error");
+
+    assertRouterErrorHandlers("root", router, INTERNAL_SERVER_ERROR, "/rest/product/123/ex");
+    assertRouterErrorHandlers("root", router, NOT_FOUND, "/rest/product/123/foo/404");
+
+    assertRouterErrorHandlers("rest", restRouter, INTERNAL_SERVER_ERROR, "/rest/product/123/ex");
+    assertRouterErrorHandlers("rest", restRouter, NOT_FOUND, "/rest/product/123/foo/404");
+
+    assertRouterErrorHandlers("product", productRouter, INTERNAL_SERVER_ERROR, "/rest/product/123/ex");
+    assertRouterErrorHandlers("product", productRouter, NOT_FOUND, "/rest/product/123/foo/404");
+
+    assertRouterErrorHandlers("instance", instanceRouter, INTERNAL_SERVER_ERROR, "/rest/product/123/ex");
+    assertRouterErrorHandlers("instance", instanceRouter, NOT_FOUND, "/rest/product/123/foo/404");
+  }
+
+  private void assertRouterErrorHandlers(String name, Router router, HttpResponseStatus status, String path) throws Exception {
+    String handlerKey = name + "." + status.codeAsText() + ".errorHandler";
+    router.errorHandler(status.code(), ctx -> ctx.response().setStatusCode(status.code()).end(handlerKey));
+    testRequest(HttpMethod.GET, path, status.code(), status.reasonPhrase(), handlerKey);
+  }
 }