Update link formatting to conform to Fitnesse

onlyskin · onlyskin · commit 3ed731d340ca · 2017-12-11T19:02:06.000+02:00
diff --git a/src/main/java/httpserver/file/Html.java b/src/main/java/httpserver/file/Html.java
@@ -13,7 +13,7 @@ public static String hrefString(Path root, Path fullFilePath) {
 
     public static String linkString(Path root, Path fullFilePath) {
         String href = hrefString(root, fullFilePath);
-        return "<div><a href=\"" + href +
-                "\">" + href + "</a></div>";
+        return "<div><a href=\"/" + href +
+                "\">/" + href + "</a></div>";
     }
 }
diff --git a/src/test/java/httpserver/SocketHandlerTest.java b/src/test/java/httpserver/SocketHandlerTest.java
@@ -56,8 +56,8 @@ public void writesContentTypeForGif() throws Exception {
 
     @Test
     public void writesRequestedDirContentsAsHtmlToOutputStreamForGET() throws Exception {
-        String expectedBody = "<div><a href=\"" + relativePath1 + "\">" + relativePath1 + "</a></div>" +
-                "<div><a href=\"" + relativePath2 + "\">" + relativePath2 + "</a></div>";
+        String expectedBody = "<div><a href=\"/" + relativePath1 + "\">/" + relativePath1 + "</a></div>" +
+                "<div><a href=\"/" + relativePath2 + "\">/" + relativePath2 + "</a></div>";
 
         byte[] request = ("GET / HTTP/1.1\r\nHost: 127.0.0.1:5000\r\n\r\n").getBytes();
 
diff --git a/src/test/java/httpserver/file/HtmlTest.java b/src/test/java/httpserver/file/HtmlTest.java
@@ -44,10 +44,10 @@ public void makesHtmlLinkFromRootPathAndDirPath() throws Exception {
                 .substring(root.toString().length() + 1);
         String expectedDirPath = fullDirPath.toString()
                 .substring(root.toString().length() + 1) + "/";
-        String expectedFileLink = "<div><a href=\"" + expectedFilePath +
-                "\">" + expectedFilePath + "</a></div>";
-        String expectedDirLink = "<div><a href=\"" + expectedDirPath +
-                "\">" + expectedDirPath + "</a></div>";
+        String expectedFileLink = "<div><a href=\"/" + expectedFilePath +
+                "\">/" + expectedFilePath + "</a></div>";
+        String expectedDirLink = "<div><a href=\"/" + expectedDirPath +
+                "\">/" + expectedDirPath + "</a></div>";
 
         assertEquals(expectedFileLink, Html.linkString(root, fullFilePath));
         assertEquals(expectedDirLink, Html.linkString(root, fullDirPath));

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public static String hrefString(Path root, Path fullFilePath) {`
`13`	`13`
`14`	`14`	`public static String linkString(Path root, Path fullFilePath) {`
`15`	`15`	`String href = hrefString(root, fullFilePath);`
`16`		`- return "<div><a href=\"" + href +`
`17`		`- "\">" + href + "</a></div>";`
	`16`	`+ return "<div><a href=\"/" + href +`
	`17`	`+ "\">/" + href + "</a></div>";`
`18`	`18`	`}`
`19`	`19`	`}`