--- a/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java	Tue Apr 15 15:55:24 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java	Wed Apr 16 16:17:09 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -39,62 +39,65 @@
 
     private static final String[][] TEST = {
         //Public field should be inherited
-        {BUG_ID + FS + "pkg" + FS + "SubClass.html",
+        {BUG_ID + "/pkg/SubClass.html",
          "<a href=\"../pkg/BaseClass.html#pubField\">"},
 
         //Public method should be inherited
-        {BUG_ID + FS + "pkg" + FS + "SubClass.html",
+        {BUG_ID + "/pkg/SubClass.html",
          "<a href=\"../pkg/BaseClass.html#pubMethod--\">"},
 
         //Public inner class should be inherited.
-        {BUG_ID + FS + "pkg" + FS + "SubClass.html",
+        {BUG_ID + "/pkg/SubClass.html",
          "<a href=\"../pkg/BaseClass.pubInnerClass.html\" title=\"class in pkg\">"},
 
         //Protected field should be inherited
-        {BUG_ID + FS + "pkg" + FS + "SubClass.html",
+        {BUG_ID + "/pkg/SubClass.html",
          "<a href=\"../pkg/BaseClass.html#proField\">"},
 
         //Protected method should be inherited
-        {BUG_ID + FS + "pkg" + FS + "SubClass.html",
+        {BUG_ID + "/pkg/SubClass.html",
          "<a href=\"../pkg/BaseClass.html#proMethod--\">"},
 
         //Protected inner class should be inherited.
-        {BUG_ID + FS + "pkg" + FS + "SubClass.html",
+        {BUG_ID + "/pkg/SubClass.html",
          "<a href=\"../pkg/BaseClass.proInnerClass.html\" title=\"class in pkg\">"},
 
         // New labels as of 1.5.0
-        {BUG_ID + FS + "pkg" + FS + "SubClass.html",
+        {BUG_ID + "/pkg/SubClass.html",
          "Nested classes/interfaces inherited from class&nbsp;pkg." +
                  "<a href=\"../pkg/BaseClass.html\" title=\"class in pkg\">BaseClass</a>"},
-        {BUG_ID + FS + "pkg" + FS + "SubClass.html",
+        {BUG_ID + "/pkg/SubClass.html",
          "Nested classes/interfaces inherited from interface&nbsp;pkg." +
                  "<a href=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">BaseInterface</a>"},
 
          // Test overriding/implementing methods with generic parameters.
-                 {BUG_ID + FS + "pkg" + FS + "BaseClass.html",
-         "<dl>" + NL + "<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>" + NL +
+                 {BUG_ID + "/pkg/BaseClass.html",
+         "<dl>\n" +
+         "<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n" +
                           "<dd><code><a href=\"../pkg/BaseInterface.html#getAnnotation-java.lang.Class-\">" +
                           "getAnnotation</a></code>&nbsp;in interface&nbsp;<code>" +
                           "<a href=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">" +
-                          "BaseInterface</a></code></dd>" + NL + "</dl>"},
+                          "BaseInterface</a></code></dd>\n" +
+                          "</dl>"},
 
          // Test diamond inheritence member summary (6256068)
-                 {BUG_ID + FS + "diamond" + FS + "Z.html",
+                 {BUG_ID + "/diamond/Z.html",
                  "<code><a href=\"../diamond/A.html#aMethod--\">aMethod</a></code>"},
 
          // Test that doc is inherited from closed parent (6270645)
-                 {BUG_ID + FS + "inheritDist" + FS + "C.html",
+                 {BUG_ID + "/inheritDist/C.html",
                  "<div class=\"block\">m1-B</div>"},
 
     };
 
     private static final String[][] NEGATED_TEST = {
-        {BUG_ID + FS + "pkg" + FS + "SubClass.html",
+        {BUG_ID + "/pkg/SubClass.html",
         "<a href=\"../pkg/BaseClass.html#staticMethod--\">staticMethod</a></code>"},
     };
     private static final String[] ARGS =
         new String[] {
-            "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", "diamond", "inheritDist"};
+            "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", "diamond",
+            "inheritDist"};
 
     /**
      * The entry point of the test.