TDD server

onlyskin · onlyskin · commit a1fa3e4689cb · 2017-12-09T21:29:47.000+02:00
diff --git a/src/main/java/httpserver/Server.java b/src/main/java/httpserver/Server.java
@@ -4,24 +4,30 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.nio.file.Path;
-import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executor;
 
 public class Server {
     private final Path logPath;
     private final Path root;
     private final ServerSocket serverSocket;
+    private boolean running;
 
     public Server(ServerSocket serverSocket, Path root, Path logPath) {
         this.serverSocket = serverSocket;
         this.root = root;
         this.logPath = logPath;
+        this.running = false;
     }
 
-    public void start(ExecutorService threadPool, SocketHandlerFactory socketHandlerFactory) throws IOException {
-        while (true) {
+    public void start(Executor executor, SocketHandlerFactory socketHandlerFactory) throws IOException {
+        //while (true) {
             Socket clientSocket = serverSocket.accept();
             SocketHandler socketHandler = socketHandlerFactory.newSocketHandler(root, logPath, clientSocket);
-            threadPool.execute(socketHandler);
-        }
+            executor.execute(socketHandler);
+        //}
+    }
+
+    public void exit() {
+        running = false;
     }
 }
diff --git a/src/test/java/httpserver/ExecutorSpy.java b/src/test/java/httpserver/ExecutorSpy.java
@@ -0,0 +1,13 @@
+package httpserver;
+
+import java.util.concurrent.Executor;
+
+public class ExecutorSpy implements Executor {
+    public Runnable executeArg;
+
+    @Override
+    public void execute(Runnable command) {
+        executeArg = command;
+        return;
+    }
+}
diff --git a/src/test/java/httpserver/ServerSocketSpy.java b/src/test/java/httpserver/ServerSocketSpy.java
@@ -0,0 +1,21 @@
+package httpserver;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+public class ServerSocketSpy extends ServerSocket {
+    private final Socket socket;
+    public boolean acceptCalled;
+
+    public ServerSocketSpy(Socket socket) throws IOException {
+        this.acceptCalled = false;
+        this.socket = socket;
+    }
+
+    @Override
+    public Socket accept() throws IOException {
+        acceptCalled = true;
+        return socket;
+    }
+}
diff --git a/src/test/java/httpserver/ServerTest.java b/src/test/java/httpserver/ServerTest.java
@@ -0,0 +1,60 @@
+package httpserver;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.net.Socket;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import static org.junit.Assert.*;
+
+public class ServerTest {
+
+    private final Path root;
+    private final Path logPath;
+    private final SocketHandler socketHandler;
+    private Socket acceptResultSocket;
+    private ServerSocketSpy serverSocketSpy;
+    private Server server;
+    private SocketHandlerFactorySpy socketHandlerFactorySpy;
+    private ExecutorSpy executorSpy;
+
+    public ServerTest() throws IOException {
+        acceptResultSocket = new Socket();
+        serverSocketSpy = new ServerSocketSpy(acceptResultSocket);
+        root = Paths.get("root");
+        logPath = Paths.get("root/logs");
+        server = new Server(serverSocketSpy, root, logPath);
+
+        socketHandler = new SocketHandler(null, null, null, null);
+        socketHandlerFactorySpy = new SocketHandlerFactorySpy(socketHandler);
+        executorSpy = new ExecutorSpy();
+    }
+
+    @Test
+    public void callsAcceptOnServerSocket() throws Exception {
+        server.start(executorSpy, socketHandlerFactorySpy);
+        server.exit();
+
+        assertTrue(serverSocketSpy.acceptCalled);
+    }
+
+    @Test
+    public void callsNewSocketHandlerWithCorrectArgs() throws Exception {
+        server.start(executorSpy, socketHandlerFactorySpy);
+        server.exit();
+
+        assertEquals(root, socketHandlerFactorySpy.newSocketHandlerArg1);
+        assertEquals(logPath, socketHandlerFactorySpy.newSocketHandlerArg2);
+        assertEquals(acceptResultSocket, socketHandlerFactorySpy.newSocketHandlerArg3);
+    }
+
+    @Test
+    public void callsExecutorExecuteWithSocketHandler() throws Exception {
+        server.start(executorSpy, socketHandlerFactorySpy);
+        server.exit();
+
+        assertEquals(socketHandler, executorSpy.executeArg);
+    }
+}
diff --git a/src/test/java/httpserver/SocketHandlerFactorySpy.java b/src/test/java/httpserver/SocketHandlerFactorySpy.java
@@ -0,0 +1,25 @@
+package httpserver;
+
+import java.io.IOException;
+import java.net.Socket;
+import java.nio.file.Path;
+
+public class SocketHandlerFactorySpy extends SocketHandlerFactory {
+    public final SocketHandler newSocketHandlerResult;
+    public Path newSocketHandlerArg1;
+    public Path newSocketHandlerArg2;
+    public Socket newSocketHandlerArg3;
+
+    public SocketHandlerFactorySpy(SocketHandler newSocketHandlerResult) {
+        this.newSocketHandlerResult = newSocketHandlerResult;
+
+    }
+    public SocketHandler newSocketHandler(Path root,
+                                          Path logPath,
+                                          Socket clientSocket) throws IOException {
+        newSocketHandlerArg1 = root;
+        newSocketHandlerArg2 = logPath;
+        newSocketHandlerArg3 = clientSocket;
+        return newSocketHandlerResult;
+    }
+}
