Add/make public allowed methods on Responders

onlyskin · onlyskin · commit de03be8322c2 · 2017-12-14T17:04:54.000+02:00
diff --git a/src/main/java/httpserver/responder/DeleteResponder.java b/src/main/java/httpserver/responder/DeleteResponder.java
@@ -36,7 +36,7 @@ public Response respond(AppConfig appConfig, Request request) throws IOException
         }
     }
 
-    private boolean allowed(String pathString) {
+    public boolean allowed(String pathString) {
         return pathString.equals("/form");
     }
 }
diff --git a/src/main/java/httpserver/responder/GetResponder.java b/src/main/java/httpserver/responder/GetResponder.java
@@ -66,4 +66,8 @@ private Response responseForFile(Path path) {
         okResponse.setHeader(new ContentTypeHeader(path));
         return okResponse;
     }
+
+    public boolean allowed(String s) {
+        return true;
+    }
 }
diff --git a/src/main/java/httpserver/responder/PostResponder.java b/src/main/java/httpserver/responder/PostResponder.java
@@ -35,7 +35,7 @@ public Response respond(AppConfig appConfig, Request request) throws IOException
         return new MethodNotAllowedResponse();
     }
 
-    private boolean allowed(String pathString) {
+    public boolean allowed(String pathString) {
         return pathString.equals("/form");
     }
 }
diff --git a/src/main/java/httpserver/responder/PutResponder.java b/src/main/java/httpserver/responder/PutResponder.java
@@ -35,7 +35,7 @@ public Response respond(AppConfig appConfig, Request request) throws IOException
         return new MethodNotAllowedResponse();
     }
 
-    private boolean allowed(String pathString) {
+    public boolean allowed(String pathString) {
         return pathString.equals("/form");
     }
 }
diff --git a/src/test/java/httpserver/responder/DeleteResponderTest.java b/src/test/java/httpserver/responder/DeleteResponderTest.java
@@ -65,4 +65,10 @@ public void returns405WhenNotAllowed() throws Exception {
 
         assertEquals(405, response.getStatusCode());
     }
+
+    @Test
+    public void formIsAllowed() throws Exception {
+        assertTrue(deleteResponder.allowed("/form"));
+        assertFalse(deleteResponder.allowed("/other"));
+    }
 }
diff --git a/src/test/java/httpserver/responder/GetResponderTest.java b/src/test/java/httpserver/responder/GetResponderTest.java
@@ -100,4 +100,10 @@ public void getsDirContentsForPath() throws Exception {
         verify(htmlMock).linkString(rootMock, path2);
         assertEquals(200, response.getStatusCode());
     }
+
+    @Test
+    public void formIsAllowed() throws Exception {
+        assertTrue(getResponder.allowed("/form"));
+        assertTrue(getResponder.allowed("anything"));
+    }
 }
diff --git a/src/test/java/httpserver/responder/PostResponderTest.java b/src/test/java/httpserver/responder/PostResponderTest.java
@@ -75,4 +75,10 @@ public void returns405IfNotAllowed() throws Exception {
 
         assertEquals(405, response.getStatusCode());
     }
+
+    @Test
+    public void formIsAllowed() throws Exception {
+        assertTrue(postResponder.allowed("/form"));
+        assertFalse(postResponder.allowed("/other"));
+    }
 }
diff --git a/src/test/java/httpserver/responder/PutResponderTest.java b/src/test/java/httpserver/responder/PutResponderTest.java
@@ -6,12 +6,11 @@
 import httpserver.header.Header;
 import httpserver.Request;
 import httpserver.response.Response;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.nio.file.Path;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -73,4 +72,10 @@ public void returns405IfNotAllowed() throws Exception {
 
         assertEquals(405, response.getStatusCode());
     }
+
+    @Test
+    public void formIsAllowed() throws Exception {
+        assertTrue(putResponder.allowed("/form"));
+        assertFalse(putResponder.allowed("/other"));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public Response respond(AppConfig appConfig, Request request) throws IOException`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`- private boolean allowed(String pathString) {`
	`39`	`+ public boolean allowed(String pathString) {`
`40`	`40`	`return pathString.equals("/form");`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,4 +66,8 @@ private Response responseForFile(Path path) {`
`66`	`66`	`okResponse.setHeader(new ContentTypeHeader(path));`
`67`	`67`	`return okResponse;`
`68`	`68`	`}`
	`69`	`+`
	`70`	`+ public boolean allowed(String s) {`
	`71`	`+ return true;`
	`72`	`+ }`
`69`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public Response respond(AppConfig appConfig, Request request) throws IOException`
`35`	`35`	`return new MethodNotAllowedResponse();`
`36`	`36`	`}`
`37`	`37`
`38`		`- private boolean allowed(String pathString) {`
	`38`	`+ public boolean allowed(String pathString) {`
`39`	`39`	`return pathString.equals("/form");`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,4 +65,10 @@ public void returns405WhenNotAllowed() throws Exception {`
`65`	`65`
`66`	`66`	`assertEquals(405, response.getStatusCode());`
`67`	`67`	`}`
	`68`	`+`
	`69`	`+ @Test`
	`70`	`+ public void formIsAllowed() throws Exception {`
	`71`	`+ assertTrue(deleteResponder.allowed("/form"));`
	`72`	`+ assertFalse(deleteResponder.allowed("/other"));`
	`73`	`+ }`
`68`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,4 +100,10 @@ public void getsDirContentsForPath() throws Exception {`
`100`	`100`	`verify(htmlMock).linkString(rootMock, path2);`
`101`	`101`	`assertEquals(200, response.getStatusCode());`
`102`	`102`	`}`
	`103`	`+`
	`104`	`+ @Test`
	`105`	`+ public void formIsAllowed() throws Exception {`
	`106`	`+ assertTrue(getResponder.allowed("/form"));`
	`107`	`+ assertTrue(getResponder.allowed("anything"));`
	`108`	`+ }`
`103`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,4 +75,10 @@ public void returns405IfNotAllowed() throws Exception {`
`75`	`75`
`76`	`76`	`assertEquals(405, response.getStatusCode());`
`77`	`77`	`}`
	`78`	`+`
	`79`	`+ @Test`
	`80`	`+ public void formIsAllowed() throws Exception {`
	`81`	`+ assertTrue(postResponder.allowed("/form"));`
	`82`	`+ assertFalse(postResponder.allowed("/other"));`
	`83`	`+ }`
`78`	`84`	`}`