--- a/langtools/test/com/sun/javadoc/testConstructors/TestConstructors.java	Tue Apr 15 15:55:24 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testConstructors/TestConstructors.java	Wed Apr 16 16:17:09 2014 -0700
@@ -37,82 +37,82 @@
 
     //Input for string search tests.
     private static final String[][] TEST = {
-        {BUG_ID + FS + "pkg1" + FS + "Outer.html",
-            "<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL +
-            "<dd><a href=\"../pkg1/Outer.Inner.html#Inner--\"><code>Inner()</code></a>, " + NL +
-            "<a href=\"../pkg1/Outer.Inner.html#Inner-int-\"><code>Inner(int)</code></a>, " + NL +
-            "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner--\"><code>NestedInner()</code></a>, " + NL +
-            "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\"><code>NestedInner(int)</code></a>, " + NL +
-            "<a href=\"../pkg1/Outer.html#Outer--\"><code>Outer()</code></a>, " + NL +
+        {BUG_ID + "/pkg1/Outer.html",
+            "<dt><span class=\"seeLabel\">See Also:</span></dt>\n" +
+            "<dd><a href=\"../pkg1/Outer.Inner.html#Inner--\"><code>Inner()</code></a>, \n" +
+            "<a href=\"../pkg1/Outer.Inner.html#Inner-int-\"><code>Inner(int)</code></a>, \n" +
+            "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner--\"><code>NestedInner()</code></a>, \n" +
+            "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\"><code>NestedInner(int)</code></a>, \n" +
+            "<a href=\"../pkg1/Outer.html#Outer--\"><code>Outer()</code></a>, \n" +
             "<a href=\"../pkg1/Outer.html#Outer-int-\"><code>Outer(int)</code></a>"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.html",
+        {BUG_ID + "/pkg1/Outer.html",
             "Link: <a href=\"../pkg1/Outer.Inner.html#Inner--\"><code>Inner()</code></a>, " +
             "<a href=\"../pkg1/Outer.html#Outer-int-\"><code>Outer(int)</code></a>, " +
             "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\"><code>" +
             "NestedInner(int)</code></a>"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.html",
+        {BUG_ID + "/pkg1/Outer.html",
             "<a href=\"../pkg1/Outer.html#Outer--\">Outer</a></span>()"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.html",
+        {BUG_ID + "/pkg1/Outer.html",
             "<a name=\"Outer--\">"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.html",
+        {BUG_ID + "/pkg1/Outer.html",
             "<a href=\"../pkg1/Outer.html#Outer-int-\">Outer</a></span>(int&nbsp;i)"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.html",
+        {BUG_ID + "/pkg1/Outer.html",
             "<a name=\"Outer-int-\">"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.html",
+        {BUG_ID + "/pkg1/Outer.Inner.html",
             "<a href=\"../pkg1/Outer.Inner.html#Inner--\">Inner</a></span>()"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.html",
+        {BUG_ID + "/pkg1/Outer.Inner.html",
             "<a name=\"Inner--\">"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.html",
+        {BUG_ID + "/pkg1/Outer.Inner.html",
             "<a href=\"../pkg1/Outer.Inner.html#Inner-int-\">Inner</a></span>(int&nbsp;i)"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.html",
+        {BUG_ID + "/pkg1/Outer.Inner.html",
             "<a name=\"Inner-int-\">"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html",
+        {BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
             "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner--\">NestedInner</a></span>()"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html",
+        {BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
             "<a name=\"NestedInner--\">"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html",
+        {BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
             "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\">NestedInner</a></span>(int&nbsp;i)"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html",
+        {BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
             "<a name=\"NestedInner-int-\">"
         }
     };
 
     private static final String[][] NEGATED_TEST = {
-        {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.html",
+        {BUG_ID + "/pkg1/Outer.Inner.html",
             "Outer.Inner--"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.html",
+        {BUG_ID + "/pkg1/Outer.Inner.html",
             "Outer.Inner-int-"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html",
+        {BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
             "Outer.Inner.NestedInner--"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html",
+        {BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
             "Outer.Inner.NestedInner-int-"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.html",
+        {BUG_ID + "/pkg1/Outer.html",
             "<a href=\"../pkg1/Outer.Inner.html#Outer.Inner--\"><code>Outer.Inner()</code></a>"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.html",
+        {BUG_ID + "/pkg1/Outer.html",
             "<a href=\"../pkg1/Outer.Inner.html#Outer.Inner-int-\"><code>Outer.Inner(int)</code></a>"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.html",
+        {BUG_ID + "/pkg1/Outer.html",
             "<a href=\"../pkg1/Outer.Inner.NestedInner.html#Outer.Inner.NestedInner--\"><code>Outer.Inner.NestedInner()</code></a>"
         },
-        {BUG_ID + FS + "pkg1" + FS + "Outer.html",
+        {BUG_ID + "/pkg1/Outer.html",
             "<a href=\"../pkg1/Outer.Inner.NestedInner.html#Outer.Inner.NestedInner-int-\"><code>Outer.Inner.NestedInner(int)</code></a>"
         }
     };