Add ServerErrorResponses and general try/catch over all responders in the GeneralResponder

onlyskin · onlyskin · commit 4343e4b0f413 · 2017-12-14T14:08:28.000+02:00
diff --git a/src/main/java/httpserver/responder/GeneralResponder.java b/src/main/java/httpserver/responder/GeneralResponder.java
@@ -4,6 +4,9 @@
 import httpserver.Request;
 import httpserver.ResponderSupplier;
 import httpserver.response.Response;
+import httpserver.response.ServerErrorResponse;
+
+import java.io.IOException;
 
 
 public class GeneralResponder implements Responder {
@@ -16,6 +19,10 @@ public GeneralResponder(ResponderSupplier responderSupplier) {
     @Override
     public Response respond(AppConfig appConfig, Request request) {
         Responder responder = responderSupplier.responderForMethodString(request.getMethodString());
-        return responder.respond(appConfig, request);
+        try {
+            return responder.respond(appConfig, request);
+        } catch (IOException e) {
+            return new ServerErrorResponse();
+        }
     }
 }
diff --git a/src/main/java/httpserver/response/ServerErrorResponse.java b/src/main/java/httpserver/response/ServerErrorResponse.java
@@ -0,0 +1,8 @@
+package httpserver.response;
+
+public class ServerErrorResponse extends Response {
+    @Override
+    public int getStatusCode() {
+        return 500;
+    }
+}
diff --git a/src/test/java/httpserver/responder/GeneralResponderTest.java b/src/test/java/httpserver/responder/GeneralResponderTest.java
@@ -3,11 +3,25 @@
 import httpserver.AppConfig;
 import httpserver.Request;
 import httpserver.ResponderSupplier;
+import httpserver.response.Response;
 import org.junit.Test;
 
+import java.io.IOException;
+
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 public class GeneralResponderTest {
+
+    private final AppConfig appConfigMock;
+    private final Request requestMock;
+
+    public GeneralResponderTest() {
+        appConfigMock = mock(AppConfig.class);
+        requestMock = mock(Request.class);
+        when(requestMock.getMethodString()).thenReturn("methodString");
+    }
+
     @Test
     public void callsResponderForMethodStringOnResponderSupplier() throws Exception {
         ResponderSupplier responderSupplierMock = mock(ResponderSupplier.class);
@@ -16,12 +30,23 @@ public void callsResponderForMethodStringOnResponderSupplier() throws Exception
 
         GeneralResponder generalResponder = new GeneralResponder(responderSupplierMock);
 
-        AppConfig appConfigMock = mock(AppConfig.class);
-        Request requestMock = mock(Request.class);
-        when(requestMock.getMethodString()).thenReturn("methodString");
         generalResponder.respond(appConfigMock, requestMock);
 
         verify(responderSupplierMock).responderForMethodString("methodString");
         verify(responderMock).respond(appConfigMock, requestMock);
     }
+
+    @Test
+    public void returnsServerErrorResponseIfTheResponderCalledReturnsAnError() throws Exception {
+        ResponderSupplier responderSupplierMock = mock(ResponderSupplier.class);
+        Responder responderMock = mock(Responder.class);
+        when(responderMock.respond(any(), any())).thenThrow(new IOException());
+        when(responderSupplierMock.responderForMethodString(any())).thenReturn(responderMock);
+
+        GeneralResponder generalResponder = new GeneralResponder(responderSupplierMock);
+
+        Response response = generalResponder.respond(appConfigMock, requestMock);
+
+        assertEquals(500, response.getStatusCode());
+    }
 }
diff --git a/src/test/java/httpserver/response/ServerErrorResponseTest.java b/src/test/java/httpserver/response/ServerErrorResponseTest.java
@@ -0,0 +1,14 @@
+package httpserver.response;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class ServerErrorResponseTest {
+    @Test
+    public void has500ResponseCode() throws Exception {
+        ServerErrorResponse serverErrorResponse = new ServerErrorResponse();
+
+        assertEquals(500, serverErrorResponse.getStatusCode());
+    }
+}
