Dry up tests

onlyskin · onlyskin · commit f6e2b3a672f3 · 2017-12-11T18:36:46.000+02:00
diff --git a/src/main/java/httpserver/Authorizer.java b/src/main/java/httpserver/Authorizer.java
@@ -5,7 +5,9 @@
 public class Authorizer {
     public boolean authorize(Request request) {
         if (request.hasHeader("Authorization")) {
-            String[] credentials = decodeBasicAuthHeader(request.getHeaderValue("Authorization"));
+            String authorizationHeader = request.getHeaderValue("Authorization");
+            String[] credentials = decodeBasicAuthHeader(authorizationHeader);
+
             if (validateCredentials(credentials)) {
                 return true;
             }
diff --git a/src/test/java/httpserver/LoggerTest.java b/src/test/java/httpserver/LoggerTest.java
@@ -3,6 +3,7 @@
 import httpserver.file.FileOperator;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
@@ -14,12 +15,16 @@
 import static org.junit.Assert.*;
 
 public class LoggerTest {
-    @Test
-    public void createsLogFileOnConstructDoesntOverwrite() throws Exception {
-        Path logPath = Paths.get(tempDir().toString(), "logs");
 
-        new Logger(logPath, new FileOperator());
+    private final Path logPath;
+    private final Logger logger;
 
+    public LoggerTest() throws IOException {
+        logPath = Paths.get(tempDir().toString(), "logs");
+        logger = new Logger(logPath, new FileOperator());
+    }
+    @Test
+    public void createsLogFileOnConstructDoesntOverwrite() throws Exception {
         assertTrue(exists(logPath));
 
         write(logPath, "fake log line\r\n".getBytes(),
@@ -31,24 +36,12 @@ public void createsLogFileOnConstructDoesntOverwrite() throws Exception {
     }
 
     @Test
-    public void onLogCallsFileOperatorAppendWithPathAndPayload() throws Exception {
-        Path logPath = Paths.get(tempDir().toString(), "logs");
-        Logger logger = new Logger(logPath, new FileOperator());
-
+    public void writesToLogAndReadsFromLog() throws Exception {
         logger.log("POST example");
         logger.log("HEAD example");
 
-        assertEquals("POST example\r\nHEAD example\r\n", new String(readAllBytes(logPath)));
-    }
-
-    @Test
-    public void readsLog() throws Exception {
-        Path logPath = Paths.get(tempDir().toString(), "logs");
-        Logger logger = new Logger(logPath, new FileOperator());
-
-        logger.log("POST example");
-        logger.log("HEAD example");
+        String log = new String(logger.readLog());
 
-        assertEquals("POST example\r\nHEAD example\r\n", new String(logger.readLog()));
+        assertEquals("POST example\r\nHEAD example\r\n", log);
     }
 }
