Update method to use new appconfig and start TDDing LogsReponder

onlyskin · onlyskin · commit b3d51b3672a8 · 2017-12-11T17:04:08.000+02:00
diff --git a/src/main/java/httpserver/Method.java b/src/main/java/httpserver/Method.java
@@ -17,7 +17,7 @@ public enum Method {
         this.responder = responder;
     }
 
-    public Response respond(Path root, Request request) {
+    public Response respond(AppConfig root, Request request) {
         return responder.respond(root, request);
     }
 }
diff --git a/src/main/java/httpserver/SocketHandler.java b/src/main/java/httpserver/SocketHandler.java
@@ -9,14 +9,12 @@
 import java.nio.file.Path;
 
 public class SocketHandler implements Runnable {
-    private final Path root;
-    private final Logger logger;
+    private final AppConfig appConfig;
     private final InputStream inputStream;
     private final OutputStream outputStream;
 
     public SocketHandler(Path root, Logger logger, InputStream inputStream, OutputStream outputStream) {
-        this.root = root;
-        this.logger = logger;
+        this.appConfig = new AppConfig(root, logger);
         this.inputStream = inputStream;
         this.outputStream = outputStream;
     }
@@ -25,8 +23,8 @@ public void run() {
         Response response;
 
         try {
-            Request request = new RequestParser(logger).parse(inputStream);
-            response = new GeneralResponder().respond(root, request);
+            Request request = new RequestParser(appConfig).parse(inputStream);
+            response = new GeneralResponder().respond(appConfig, request);
         } catch (Exception e) {
             response = new NotFoundResponse();
         }
diff --git a/src/main/java/httpserver/responder/LogsResponder.java b/src/main/java/httpserver/responder/LogsResponder.java
@@ -0,0 +1,15 @@
+package httpserver.responder;
+
+import httpserver.AppConfig;
+import httpserver.Header;
+import httpserver.Request;
+import httpserver.response.OkResponse;
+import httpserver.response.Response;
+
+public class LogsResponder implements Responder {
+    @Override
+    public Response respond(AppConfig appConfig, Request request) {
+        byte[] log = appConfig.getLogger().readLog();
+        return new OkResponse(log, new Header[0]);
+    }
+}
diff --git a/src/test/java/httpserver/responder/LogsResponderTest.java b/src/test/java/httpserver/responder/LogsResponderTest.java
@@ -0,0 +1,26 @@
+package httpserver.responder;
+
+import httpserver.AppConfig;
+import httpserver.Logger;
+import httpserver.Request;
+import httpserver.response.Response;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+public class LogsResponderTest {
+    @Test
+    public void callsReadLogOnAppConfigLogger() {
+        Logger loggerMock = mock(Logger.class);
+        AppConfig appConfigMock = mock(AppConfig.class);
+        when(appConfigMock.getLogger()).thenReturn(loggerMock);
+        LogsResponder logsResponder = new LogsResponder();
+
+        Response response = logsResponder.respond(appConfigMock, mock(Request.class));
+
+        verify(loggerMock).readLog();
+        assertEquals(200, response.getStatusCode());
+    }
+
+}

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public enum Method {`
`17`	`17`	`this.responder = responder;`
`18`	`18`	`}`
`19`	`19`
`20`		`- public Response respond(Path root, Request request) {`
	`20`	`+ public Response respond(AppConfig root, Request request) {`
`21`	`21`	`return responder.respond(root, request);`
`22`	`22`	`}`
`23`	`23`	`}`