Add pathExaminer.concatenate

onlyskin · onlyskin · commit 99c0b7ecdc37 · 2017-12-09T20:01:41.000+02:00
diff --git a/src/main/java/httpserver/file/PathExaminer.java b/src/main/java/httpserver/file/PathExaminer.java
@@ -7,6 +7,7 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.WeakHashMap;
 
 import static java.nio.file.Files.*;
 
@@ -54,4 +55,8 @@ public Path[] directoryContents(Path dir) {
         }
         return result.toArray(new Path[0]);
     }
+
+    public Path concatenate(Path root, String suffix) {
+        return Paths.get(root.toString(), suffix);
+    }
 }
diff --git a/src/test/java/httpserver/file/PathExaminerTest.java b/src/test/java/httpserver/file/PathExaminerTest.java
@@ -95,4 +95,13 @@ public void makesRootPathFromStringInput() throws Exception {
         assertEquals(Paths.get("/Users", "example", "public"),
                 pathExaminer.getPath(input2));
     }
+
+    @Test
+    public void concatenatesTwoPaths() throws Exception {
+        Path path = Paths.get("/example", "test");
+        String suffix = "logs";
+
+        String expected = "/example/test/logs";
+        assertEquals(expected, pathExaminer.concatenate(path, suffix).toString());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`import java.nio.file.Paths;`
`8`	`8`	`import java.util.ArrayList;`
`9`	`9`	`import java.util.List;`
	`10`	`+import java.util.WeakHashMap;`
`10`	`11`
`11`	`12`	`import static java.nio.file.Files.*;`
`12`	`13`
`@@ -54,4 +55,8 @@ public Path[] directoryContents(Path dir) {`
`54`	`55`	`}`
`55`	`56`	`return result.toArray(new Path[0]);`
`56`	`57`	`}`
	`58`	`+`
	`59`	`+ public Path concatenate(Path root, String suffix) {`
	`60`	`+ return Paths.get(root.toString(), suffix);`
	`61`	`+ }`
`57`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,4 +95,13 @@ public void makesRootPathFromStringInput() throws Exception {`
`95`	`95`	`assertEquals(Paths.get("/Users", "example", "public"),`
`96`	`96`	`pathExaminer.getPath(input2));`
`97`	`97`	`}`
	`98`	`+`
	`99`	`+ @Test`
	`100`	`+ public void concatenatesTwoPaths() throws Exception {`
	`101`	`+ Path path = Paths.get("/example", "test");`
	`102`	`+ String suffix = "logs";`
	`103`	`+`
	`104`	`+ String expected = "/example/test/logs";`
	`105`	`+ assertEquals(expected, pathExaminer.concatenate(path, suffix).toString());`
	`106`	`+ }`
`98`	`107`	`}`