Remove commented out Methods and consolidate two tests in RequestParser

onlyskin · onlyskin · commit a59061b3226b · 2017-12-06T14:09:31.000+02:00
diff --git a/src/main/java/httpserver/Method.java b/src/main/java/httpserver/Method.java
@@ -7,11 +7,8 @@
 
 public enum Method {
     GET(new GetResponder()),
-    //HEAD(null),
     POST(new PostResponder()),
     PUT(new PutResponder()),
-    //DELETE(null),
-    //OPTIONS(null),
     INVALID(new InvalidMethodResponder());
 
     private final Responder responder;
diff --git a/src/test/java/httpserver/MethodTest.java b/src/test/java/httpserver/MethodTest.java
@@ -8,10 +8,7 @@ public class MethodTest {
     @Test
     public void valuesAreGetPost() throws Exception {
         assertNotNull(Method.GET);
-        //assertNotNull(Method.HEAD);
         assertNotNull(Method.POST);
         assertNotNull(Method.PUT);
-        //assertNotNull(Method.DELETE);
-        //assertNotNull(Method.OPTIONS);
     }
 }
diff --git a/src/test/java/httpserver/RequestParserTest.java b/src/test/java/httpserver/RequestParserTest.java
@@ -1,6 +1,5 @@
 package httpserver;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
@@ -18,20 +17,12 @@ public RequestParserTest() {
     }
 
     @Test
-    public void parsesMethod() throws Exception {
+    public void parsesMethodAndPath() throws Exception {
         String input = "GET /text-file.txt HTTP/1.1\r\nHost: 0.0.0.0:5000\r\nUser-Agent: curl/7.54.0\r\nAccept: */*\r\n\r\n";
 
         Request request = requestForInput(input);
 
         assertEquals(Method.GET, request.getMethod());
-    }
-
-    @Test
-    public void parsesPath() throws Exception {
-        String input = "GET /text-file.txt HTTP/1.1\r\nHost: 0.0.0.0:5000\r\nUser-Agent: curl/7.54.0\r\nAccept: */*\r\n\r\n";
-
-        Request request = requestForInput(input);
-
         assertEquals("/text-file.txt", request.getPath());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,7 @@ public class MethodTest {`
`8`	`8`	`@Test`
`9`	`9`	`public void valuesAreGetPost() throws Exception {`
`10`	`10`	`assertNotNull(Method.GET);`
`11`		`- //assertNotNull(Method.HEAD);`
`12`	`11`	`assertNotNull(Method.POST);`
`13`	`12`	`assertNotNull(Method.PUT);`
`14`		`- //assertNotNull(Method.DELETE);`
`15`		`- //assertNotNull(Method.OPTIONS);`
`16`	`13`	`}`
`17`	`14`	`}`