--- a/langtools/test/com/sun/javadoc/testInterface/TestInterface.java	Tue Apr 15 15:55:24 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testInterface/TestInterface.java	Wed Apr 16 16:17:09 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,43 +47,57 @@
 
     //Input for string search tests.
     private static final String[][] TEST = {
-        {BUG_ID + FS + "pkg" + FS + "Interface.html",
+        {BUG_ID + "/pkg/Interface.html",
             "<pre>int&nbsp;method()</pre>"},
-        {BUG_ID + FS + "pkg" + FS + "Interface.html",
+        {BUG_ID + "/pkg/Interface.html",
             "<pre>static final&nbsp;int field</pre>"},
 
 
         // Make sure known implementing class list is correct and omits type parameters.
-        {BUG_ID + FS + "pkg" + FS + "Interface.html",
-            "<dl>" + NL + "<dt>All Known Implementing Classes:</dt>" + NL +
+        {BUG_ID + "/pkg/Interface.html",
+            "<dl>\n" +
+            "<dt>All Known Implementing Classes:</dt>\n" +
             "<dd><a href=\"../pkg/Child.html\" title=\"class in pkg\">Child" +
             "</a>, <a href=\"../pkg/Parent.html\" title=\"class in pkg\">Parent" +
-            "</a></dd>" + NL + "</dl>"},
+            "</a></dd>\n" +
+            "</dl>"},
 
          // Make sure "All Implemented Interfaces": has substituted type parameters
-         {BUG_ID + FS + "pkg" + FS + "Child.html",
-            "<dl>" + NL + "<dt>All Implemented Interfaces:</dt>" + NL +
+         {BUG_ID + "/pkg/Child.html",
+            "<dl>\n" +
+            "<dt>All Implemented Interfaces:</dt>\n" +
             "<dd><a href=\"../pkg/Interface.html\" title=\"interface in pkg\">" +
-            "Interface</a>&lt;T&gt;</dd>" + NL + "</dl>"
+            "Interface</a>&lt;T&gt;</dd>\n" +
+            "</dl>"
          },
          //Make sure Class Tree has substituted type parameters.
-         {BUG_ID + FS + "pkg" + FS + "Child.html",
-            "<ul class=\"inheritance\">" + NL + "<li>java.lang.Object</li>" + NL +
-            "<li>" + NL + "<ul class=\"inheritance\">" + NL +
+         {BUG_ID + "/pkg/Child.html",
+            "<ul class=\"inheritance\">\n" +
+            "<li>java.lang.Object</li>\n" +
+            "<li>\n" +
+            "<ul class=\"inheritance\">\n" +
             "<li><a href=\"../pkg/Parent.html\" title=\"class in pkg\">" +
-            "pkg.Parent</a>&lt;T&gt;</li>" + NL + "<li>" + NL +
-            "<ul class=\"inheritance\">" + NL + "<li>pkg.Child&lt;T&gt;</li>" + NL +
-            "</ul>" + NL + "</li>" + NL + "</ul>" + NL + "</li>" + NL + "</ul>"
+            "pkg.Parent</a>&lt;T&gt;</li>\n" +
+            "<li>\n" +
+            "<ul class=\"inheritance\">\n" +
+            "<li>pkg.Child&lt;T&gt;</li>\n" +
+            "</ul>\n" +
+            "</li>\n" +
+            "</ul>\n" +
+            "</li>\n" +
+            "</ul>"
          },
          //Make sure "Direct Know Subclasses" omits type parameters
-        {BUG_ID + FS + "pkg" + FS + "Parent.html",
-            "<dl>" + NL + "<dt>Direct Known Subclasses:</dt>" + NL +
+        {BUG_ID + "/pkg/Parent.html",
+            "<dl>\n" +
+            "<dt>Direct Known Subclasses:</dt>\n" +
             "<dd><a href=\"../pkg/Child.html\" title=\"class in pkg\">Child" +
-            "</a></dd>" + NL + "</dl>"
+            "</a></dd>\n" +
+            "</dl>"
         },
         //Make sure "Specified By" has substituted type parameters.
-        {BUG_ID + FS + "pkg" + FS + "Child.html",
-            "<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>" + NL +
+        {BUG_ID + "/pkg/Child.html",
+            "<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n" +
             "<dd><code><a href=\"../pkg/Interface.html#method--\">method</a>" +
             "</code>&nbsp;in interface&nbsp;<code>" +
             "<a href=\"../pkg/Interface.html\" title=\"interface in pkg\">" +
@@ -91,8 +105,8 @@
             "T</a>&gt;</code></dd>"
          },
         //Make sure "Overrides" has substituted type parameters.
-        {BUG_ID + FS + "pkg" + FS + "Child.html",
-            "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
+        {BUG_ID + "/pkg/Child.html",
+            "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
             "<dd><code><a href=\"../pkg/Parent.html#method--\">method</a>" +
             "</code>&nbsp;in class&nbsp;<code><a href=\"../pkg/Parent.html\" " +
             "title=\"class in pkg\">Parent</a>&lt;<a href=\"../pkg/Child.html\" " +
@@ -100,9 +114,9 @@
          },
     };
     private static final String[][] NEGATED_TEST = {
-        {BUG_ID + FS + "pkg" + FS + "Interface.html",
+        {BUG_ID + "/pkg/Interface.html",
             "public int&nbsp;method()"},
-        {BUG_ID + FS + "pkg" + FS + "Interface.html",
+        {BUG_ID + "/pkg/Interface.html",
             "public static final&nbsp;int field"},
     };