Update RouteMap to Router, change routerForRequest method to respond method

onlyskin · onlyskin · commit 72ae6c7196cf · 2018-01-11T16:39:17.000+02:00
diff --git a/src/main/java/httpserver/route/Router.java b/src/main/java/httpserver/route/Router.java
@@ -24,7 +24,7 @@ public boolean canRespond(Request request) {
         return false;
     }
 
-    public Route routeForRequest(Request request) {
+    private Route routeForRequest(Request request) {
         for (Route route : routes) {
             if (route.allows(request)) {
                 return route;
@@ -37,7 +37,7 @@ public Response respond(AppConfig appConfig, Request request) {
         Route route = routeForRequest(request);
         try {
             return route.respond(appConfig, request);
-        } catch (IOException e) {
+        } catch (IOException | NullPointerException e) {
             return new ServerErrorResponse();
         }
     }
diff --git a/src/test/java/httpserver/route/RouterTest.java b/src/test/java/httpserver/route/RouterTest.java
@@ -30,31 +30,21 @@ public RouterTest() {
     }
 
     @Test
-    public void hasRouteTrueWhenARouteAllowsPath() throws Exception {
+    public void canRespondTrueWhenARouteAllowsPath() throws Exception {
         when(routeMock1.allows(any())).thenReturn(false);
         when(routeMock2.allows(any())).thenReturn(true);
 
         assertTrue(router.canRespond(null));
     }
 
     @Test
-    public void hasRouteFalseWhenNoRouteAllowsPath() throws Exception {
+    public void canRespondFalseWhenNoRouteAllowsPath() throws Exception {
         when(routeMock1.allows(any())).thenReturn(false);
         when(routeMock2.allows(any())).thenReturn(false);
 
         assertFalse(router.canRespond(null));
     }
 
-    @Test
-    public void returnsRouteForRequest() throws Exception {
-        when(routeMock1.allows(any())).thenReturn(false);
-        when(routeMock2.allows(any())).thenReturn(true);
-
-        Route actual = router.routeForRequest(null);
-
-        assertEquals(actual, routeMock2);
-    }
-
     @Test
     public void respondsToRequest() throws Exception {
         when(routeMock1.allows(any())).thenReturn(false);
@@ -69,7 +59,7 @@ public void respondsToRequest() throws Exception {
     }
 
     @Test
-    public void returns500WhenRouteRespondErrors() throws Exception {
+    public void returns500WhenRouteRespondThrowsIOException() throws Exception {
         when(routeMock1.allows(any())).thenReturn(false);
         when(routeMock2.allows(any())).thenReturn(true);
         when(routeMock2.respond(any(), any())).thenThrow(new IOException());
@@ -78,4 +68,14 @@ public void returns500WhenRouteRespondErrors() throws Exception {
 
         assertEquals(500, response.getStatusCode());
     }
+
+    @Test
+    public void returns500WhenRouteRespondThrowsNullPointerException() throws Exception {
+        when(routeMock1.allows(any())).thenReturn(false);
+        when(routeMock2.allows(any())).thenReturn(false);
+
+        Response response = router.respond(appConfigMock, requestMock);
+
+        assertEquals(500, response.getStatusCode());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public boolean canRespond(Request request) {`
`24`	`24`	`return false;`
`25`	`25`	`}`
`26`	`26`
`27`		`- public Route routeForRequest(Request request) {`
	`27`	`+ private Route routeForRequest(Request request) {`
`28`	`28`	`for (Route route : routes) {`
`29`	`29`	`if (route.allows(request)) {`
`30`	`30`	`return route;`
`@@ -37,7 +37,7 @@ public Response respond(AppConfig appConfig, Request request) {`
`37`	`37`	`Route route = routeForRequest(request);`
`38`	`38`	`try {`
`39`	`39`	`return route.respond(appConfig, request);`
`40`		`- } catch (IOException e) {`
	`40`	`+ } catch (IOException \| NullPointerException e) {`
`41`	`41`	`return new ServerErrorResponse();`
`42`	`42`	`}`
`43`	`43`	`}`