--- a/langtools/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java	Tue Apr 15 15:55:24 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java	Wed Apr 16 16:17:09 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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
@@ -44,33 +44,40 @@
 
     //Input for string search tests.
     private static final String[][] TEST = {
-        {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
-            "<li>Summary:&nbsp;</li>" + NL + "<li><a href=\"#annotation.type." +
+        {BUG_ID + "/pkg/AnnotationTypeField.html",
+            "<li>Summary:&nbsp;</li>\n" +
+            "<li><a href=\"#annotation.type." +
             "field.summary\">Field</a>&nbsp;|&nbsp;</li>"},
-        {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
-            "<li>Detail:&nbsp;</li>" + NL + "<li><a href=\"#annotation.type." +
+        {BUG_ID + "/pkg/AnnotationTypeField.html",
+            "<li>Detail:&nbsp;</li>\n" +
+            "<li><a href=\"#annotation.type." +
             "field.detail\">Field</a>&nbsp;|&nbsp;</li>"},
-        {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
+        {BUG_ID + "/pkg/AnnotationTypeField.html",
             "<!-- =========== ANNOTATION TYPE FIELD SUMMARY =========== -->"},
-        {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
+        {BUG_ID + "/pkg/AnnotationTypeField.html",
             "<h3>Field Summary</h3>"},
-        {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
+        {BUG_ID + "/pkg/AnnotationTypeField.html",
             "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../" +
             "pkg/AnnotationTypeField.html#DEFAULT_NAME\">DEFAULT_NAME</a></span>" +
             "</code>&nbsp;</td>"},
-        {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
+        {BUG_ID + "/pkg/AnnotationTypeField.html",
             "<!-- ============ ANNOTATION TYPE FIELD DETAIL =========== -->"},
-        {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
-            "<h4>DEFAULT_NAME</h4>" + NL + "<pre>public static final&nbsp;java." +
+        {BUG_ID + "/pkg/AnnotationTypeField.html",
+            "<h4>DEFAULT_NAME</h4>\n" +
+            "<pre>public static final&nbsp;java." +
             "lang.String&nbsp;DEFAULT_NAME</pre>"},
-        {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
-            "<li>Summary:&nbsp;</li>" + NL + "<li>Field&nbsp;|&nbsp;</li>"},
-        {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
-            "<li>Detail:&nbsp;</li>" + NL + "<li>Field&nbsp;|&nbsp;</li>"},
+        {BUG_ID + "/pkg/AnnotationType.html",
+            "<li>Summary:&nbsp;</li>\n" +
+            "<li>Field&nbsp;|&nbsp;</li>"},
+        {BUG_ID + "/pkg/AnnotationType.html",
+            "<li>Detail:&nbsp;</li>\n" +
+            "<li>Field&nbsp;|&nbsp;</li>"},
     };
     private static final String[][] NEGATED_TEST = {
-        {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
-            "<HR>" + NL + NL + "<P>" + NL + NL + "<P>" +
+        {BUG_ID + "/pkg/AnnotationType.html",
+            "<HR>\n\n" +
+            "<P>\n\n" +
+            "<P>" +
             "<!-- ========= END OF CLASS DATA ========= -->" + "<HR>"}
     };