TDD ServerFactory

onlyskin · onlyskin · commit da164c749037 · 2017-12-09T20:10:56.000+02:00
diff --git a/src/main/java/httpserver/ServerFactory.java b/src/main/java/httpserver/ServerFactory.java
@@ -5,7 +5,6 @@
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 
 public class ServerFactory {
     private ServerSocketFactory serverSocketFactory;
@@ -17,7 +16,7 @@ public ServerFactory(PathExaminer pathExaminer, ServerSocketFactory serverSocket
     }
     public Server makeServer(int port, String fileDirectory) throws IOException {
         Path root = pathExaminer.getPath(fileDirectory);
-        Path logPath = Paths.get(root.toString(), "logs");
+        Path logPath = pathExaminer.concatenate(root,"logs");
         ServerSocket serverSocket = serverSocketFactory.newServerSocket(port);
 
         return new Server(serverSocket, root, logPath);
diff --git a/src/main/java/httpserver/file/PathExaminer.java b/src/main/java/httpserver/file/PathExaminer.java
@@ -7,7 +7,6 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.WeakHashMap;
 
 import static java.nio.file.Files.*;
 
diff --git a/src/test/java/httpserver/ServerFactoryTest.java b/src/test/java/httpserver/ServerFactoryTest.java
@@ -0,0 +1,49 @@
+package httpserver;
+
+import httpserver.file.PathExaminerSpy;
+import org.junit.Test;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import static org.junit.Assert.*;
+
+public class ServerFactoryTest {
+
+    private final Path spyGetPathResult;
+    private PathExaminerSpy pathExaminerSpy;
+    private ServerSocketFactorySpy serverSocketFactorySpy;
+    private ServerFactory serverFactory;
+    private String fileDirectory;
+
+    public ServerFactoryTest() {
+        spyGetPathResult = Paths.get("example, public");
+        pathExaminerSpy = new PathExaminerSpy(spyGetPathResult);
+        serverSocketFactorySpy = new ServerSocketFactorySpy();
+        serverFactory = new ServerFactory(pathExaminerSpy,
+                serverSocketFactorySpy);
+        fileDirectory = "/example/public/";
+    }
+
+    @Test
+    public void callsGetPathOnPathExaminerWithFileDirectory() throws Exception {
+        serverFactory.makeServer(5000, fileDirectory);
+
+        assertEquals(fileDirectory, pathExaminerSpy.getPathCalledWith);
+    }
+
+    @Test
+    public void callsPathExaminerConcatenateWithResultOfGetPathAndLogs() throws Exception {
+        serverFactory.makeServer(5000, fileDirectory);
+
+        assertEquals(spyGetPathResult, pathExaminerSpy.concatenateCalledWith1);
+        assertEquals("logs", pathExaminerSpy.concatenateCalledWith2);
+    }
+
+    @Test
+    public void callsNewServerSocketOnServerSocketFactoryWithPort() throws Exception {
+        serverFactory.makeServer(5000, fileDirectory);
+
+        assertEquals(5000, serverSocketFactorySpy.newServerSocketCalledWith);
+    }
+}
diff --git a/src/test/java/httpserver/ServerSocketFactorySpy.java b/src/test/java/httpserver/ServerSocketFactorySpy.java
@@ -0,0 +1,13 @@
+package httpserver;
+
+import java.net.ServerSocket;
+
+public class ServerSocketFactorySpy extends ServerSocketFactory {
+    public int newServerSocketCalledWith;
+
+    @Override
+    public ServerSocket newServerSocket(int port) {
+        newServerSocketCalledWith = port;
+        return null;
+    }
+}
diff --git a/src/test/java/httpserver/file/PathExaminerSpy.java b/src/test/java/httpserver/file/PathExaminerSpy.java
@@ -0,0 +1,28 @@
+package httpserver.file;
+
+import java.nio.file.Path;
+
+public class PathExaminerSpy extends PathExaminer {
+    public String getPathCalledWith;
+    private Path getPathResult;
+    public Path concatenateCalledWith1;
+    public String concatenateCalledWith2;
+
+    public PathExaminerSpy(Path getPathResult) {
+        this.getPathCalledWith = null;
+        this.getPathResult = getPathResult;
+    }
+
+    @Override
+    public Path getPath(String input) {
+        this.getPathCalledWith = input;
+        return getPathResult;
+    }
+
+    @Override
+    public Path concatenate(Path root, String suffix) {
+        this.concatenateCalledWith1 = root;
+        this.concatenateCalledWith2 = suffix;
+        return null;
+    }
+}
