Merge pull request #51 from sanhee/fix-content-length

Fix content length
sanhee · Aug 30, 2021 · 8d86d07 · 8d86d07
2 parents 06950c8 + c198b5e
commit 8d86d07
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/test/java/webserver/FileForTest.java b/src/test/java/webserver/FileForTest.java
@@ -0,0 +1,8 @@
+package webserver;
+
+import java.io.File;
+
+public class FileForTest {
+    public static final File INDEX_HTML = new File("./webapp/index.html");
+    public static final File FORM_HTML = new File("./webapp/index.html");
+}
diff --git a/src/test/java/webserver/RequestHandlerTest.java b/src/test/java/webserver/RequestHandlerTest.java
@@ -4,6 +4,7 @@
 import model.User;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -24,6 +25,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static webserver.FileForTest.*;
 
 class RequestHandlerTest {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -96,9 +98,9 @@ static Stream<Arguments> run() throws IOException {
                                 "" + System.lineSeparator(),
                         "HTTP/1.1 200 OK" + System.lineSeparator() +
                                 "Content-Type: text/html;charset=utf-8" + System.lineSeparator() +
-                                "Content-Length: 6903" + System.lineSeparator() +
+                                "Content-Length: " + INDEX_HTML.length() + System.lineSeparator() +
                                 "" + System.lineSeparator() +
-                                Files.lines(new File("./webapp/index.html").toPath())
+                                Files.lines(INDEX_HTML.toPath())
                                         .collect(Collectors.joining(System.lineSeparator()))
                 ), Arguments.arguments(
                         "GET /index2.html HTTP/1.1" + System.lineSeparator() +
@@ -115,9 +117,9 @@ static Stream<Arguments> run() throws IOException {
                                 "" + System.lineSeparator(),
                         "HTTP/1.1 200 OK" + System.lineSeparator() +
                                 "Content-Type: text/html;charset=utf-8" + System.lineSeparator() +
-                                "Content-Length: 5169" + System.lineSeparator() +
+                                "Content-Length: " + FORM_HTML.length() + System.lineSeparator() +
                                 "" + System.lineSeparator() +
-                                Files.lines(new File("./webapp/user/form.html").toPath())
+                                Files.lines(FORM_HTML.toPath())
                                         .collect(Collectors.joining(System.lineSeparator()))
                 ), Arguments.arguments(
                         "POST /user/create HTTP/1.1" + System.lineSeparator() +