--- a/langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java Tue Apr 15 15:55:24 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java Wed Apr 16 16:17:09 2014 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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,210 +39,240 @@
//Javadoc arguments.
private static final String[] ARGS1 = new String[]{
"-d", PROFILE_BUG_ID, "-sourcepath", SRC_DIR, "-Xprofilespath",
- SRC_DIR + FS + "profile-rtjar-includes.txt", "pkg1", "pkg2",
+ SRC_DIR + "/profile-rtjar-includes.txt", "pkg1", "pkg2",
"pkg3", "pkg4", "pkg5", "pkgDeprecated"
};
private static final String[] ARGS2 = new String[]{
- "-d", PACKAGE_BUG_ID, "-sourcepath", SRC_DIR, "pkg1", "pkg2", "pkg3", "pkg4", "pkg5"
+ "-d", PACKAGE_BUG_ID, "-sourcepath", SRC_DIR, "pkg1", "pkg2",
+ "pkg3", "pkg4", "pkg5"
};
//Input for string tests for profiles.
private static final String[][] PROFILES_TEST = {
// Tests for profile-overview-frame.html listing all profiles.
- {PROFILE_BUG_ID + FS + "profile-overview-frame.html",
+ {PROFILE_BUG_ID + "/profile-overview-frame.html",
"<span><a href=\"overview-frame.html\" "
+ "target=\"packageListFrame\">All Packages</a></span>"
},
- {PROFILE_BUG_ID + FS + "profile-overview-frame.html",
+ {PROFILE_BUG_ID + "/profile-overview-frame.html",
"<li><a href=\"compact1-frame.html\" target=\"packageListFrame\">"
+ "compact1</a></li>"
},
// Tests for profileName-frame.html listing all packages in a profile.
- {PROFILE_BUG_ID + FS + "compact2-frame.html",
+ {PROFILE_BUG_ID + "/compact2-frame.html",
"<span><a href=\"overview-frame.html\" target=\"packageListFrame\">"
+ "All Packages</a></span><span><a href=\"profile-overview-frame.html\" "
+ "target=\"packageListFrame\">All Profiles</a></span>"
},
- {PROFILE_BUG_ID + FS + "compact2-frame.html",
+ {PROFILE_BUG_ID + "/compact2-frame.html",
"<li><a href=\"pkg4/compact2-package-frame.html\" "
+ "target=\"packageFrame\">pkg4</a></li>"
},
// Test for profileName-package-frame.html listing all types in a
// package of a profile.
- {PROFILE_BUG_ID + FS + "pkg2" + FS + "compact2-package-frame.html",
+ {PROFILE_BUG_ID + "/pkg2/compact2-package-frame.html",
"<a href=\"../compact2-summary.html\" target=\"classFrame\">"
+ "compact2</a> - <a href=\"../pkg2/compact2-package-summary.html\" "
+ "target=\"classFrame\">pkg2</a>"
},
// Tests for profileName-summary.html listing the summary for a profile.
- {PROFILE_BUG_ID + FS + "compact2-summary.html",
- "<li><a href=\"compact1-summary.html\">Prev Profile</a></li>" + NL
+ {PROFILE_BUG_ID + "/compact2-summary.html",
+ "<li><a href=\"compact1-summary.html\">Prev Profile</a></li>\n"
+ "<li><a href=\"compact3-summary.html\">Next Profile</a></li>"
},
- {PROFILE_BUG_ID + FS + "compact2-summary.html",
+ {PROFILE_BUG_ID + "/compact2-summary.html",
"<h1 title=\"Profile\" class=\"title\">Profile compact2</h1>"
},
- {PROFILE_BUG_ID + FS + "compact2-summary.html",
+ {PROFILE_BUG_ID + "/compact2-summary.html",
"<h3><a href=\"pkg2/compact2-package-summary.html\" "
+ "target=\"classFrame\">pkg2</a></h3>"
},
- {PROFILE_BUG_ID + FS + "compact2-summary.html",
- "<ul class=\"blockList\">" + NL + "<li class=\"blockList\">" + NL
+ {PROFILE_BUG_ID + "/compact2-summary.html",
+ "<ul class=\"blockList\">\n" +
+ "<li class=\"blockList\">\n"
+ "<h3><a href=\"pkg2/compact2-package-summary.html\" target=\"classFrame\">"
- + "pkg2</a></h3>" + NL + "<table class=\"typeSummary\" border=\"0\" "
+ + "pkg2</a></h3>\n" +
+ "<table class=\"typeSummary\" border=\"0\" "
+ "cellpadding=\"3\" cellspacing=\"0\" summary=\"Class Summary table, "
+ "listing classes, and an explanation\">"
},
- {PROFILE_BUG_ID + FS + "compact2-summary.html",
- "<ul class=\"blockList\">" + NL + "<li class=\"blockList\">" + NL
+ {PROFILE_BUG_ID + "/compact2-summary.html",
+ "<ul class=\"blockList\">\n" +
+ "<li class=\"blockList\">\n"
+ "<h3><a href=\"pkg4/compact2-package-summary.html\" target=\"classFrame\">"
- + "pkg4</a></h3>" + NL + "<table class=\"typeSummary\" border=\"0\" "
+ + "pkg4</a></h3>\n" +
+ "<table class=\"typeSummary\" border=\"0\" "
+ "cellpadding=\"3\" cellspacing=\"0\" summary=\"Class Summary table, "
+ "listing classes, and an explanation\">"
},
// Tests for profileName-package-summary.html listing the summary for a
// package in a profile.
- {PROFILE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html",
+ {PROFILE_BUG_ID + "/pkg5/compact3-package-summary.html",
"<li><a href=\"../pkg4/compact3-package-summary.html\">Prev Package"
+ "</a></li>"
},
- {PROFILE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html",
+ {PROFILE_BUG_ID + "/pkg5/compact3-package-summary.html",
"<div class=\"subTitle\">compact3</div>"
},
- {PROFILE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html",
- "<ul class=\"blockList\">" + NL + "<li class=\"blockList\">" + NL
+ {PROFILE_BUG_ID + "/pkg5/compact3-package-summary.html",
+ "<ul class=\"blockList\">\n" +
+ "<li class=\"blockList\">\n"
+ "<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\" "
+ "cellspacing=\"0\" summary=\"Interface Summary table, listing "
+ "interfaces, and an explanation\">"
},
//Test for "overview-frame.html" showing the "All Profiles" link.
- {PROFILE_BUG_ID + FS + "overview-frame.html",
+ {PROFILE_BUG_ID + "/overview-frame.html",
"<span><a href=\"profile-overview-frame.html\" "
+ "target=\"packageListFrame\">All Profiles</a></span>"
},
//Test for "className.html" showing the profile information for the type.
- {PROFILE_BUG_ID + FS + "pkg2" + FS + "Class1Pkg2.html",
+ {PROFILE_BUG_ID + "/pkg2/Class1Pkg2.html",
"<div class=\"subTitle\">compact1, compact2, compact3</div>"
},
- {PROFILE_BUG_ID + FS + "index.html",
+ {PROFILE_BUG_ID + "/index.html",
"<frame src=\"overview-frame.html\" name=\"packageListFrame\" " +
"title=\"All Packages\">"
},
//Test for "overview-summary.html" showing the profile list.
- {PROFILE_BUG_ID + FS + "overview-summary.html",
- "<ul>" + NL +"<li><a href=\"compact1-summary.html\" target=\"classFrame\">" +
- "compact1</a></li>" + NL + "<li><a href=\"compact2-summary.html\" " +
- "target=\"classFrame\">compact2</a></li>" + NL + "<li><a href=\"" +
- "compact3-summary.html\" target=\"classFrame\">compact3</a></li>" + NL +
+ {PROFILE_BUG_ID + "/overview-summary.html",
+ "<ul>\n" +
+ "<li><a href=\"compact1-summary.html\" target=\"classFrame\">" +
+ "compact1</a></li>\n" +
+ "<li><a href=\"compact2-summary.html\" " +
+ "target=\"classFrame\">compact2</a></li>\n" +
+ "<li><a href=\"" +
+ "compact3-summary.html\" target=\"classFrame\">compact3</a></li>\n" +
"</ul>"
},
//Test deprecated class in profiles
- {PROFILE_BUG_ID + FS + "compact1-summary.html","<td class=\"colFirst\">"
- + "<a href=\"pkg2/Class1Pkg2.html\" title=\"class in pkg2\">Class1Pkg2</a></td>"
- + NL + "<td class=\"colLast\">Deprecated"
+ {PROFILE_BUG_ID + "/compact1-summary.html","<td class=\"colFirst\">"
+ + "<a href=\"pkg2/Class1Pkg2.html\" title=\"class in pkg2\">Class1Pkg2</a></td>\n"
+ + "<td class=\"colLast\">Deprecated"
},
- {PROFILE_BUG_ID + FS + "deprecated-list.html","<td class=\"colOne\">"
- + "<a href=\"pkg2/Class1Pkg2.html\" title=\"class in pkg2\">pkg2.Class1Pkg2</a>"
- + NL +"<div class=\"block\"><span class=\"deprecationComment\">Class1Pkg2. This class is deprecated</span></div>"
+ {PROFILE_BUG_ID + "/deprecated-list.html","<td class=\"colOne\">"
+ + "<a href=\"pkg2/Class1Pkg2.html\" title=\"class in pkg2\">pkg2.Class1Pkg2</a>\n"
+ +"<div class=\"block\"><span class=\"deprecationComment\">Class1Pkg2. This class is deprecated</span></div>"
},
//Test deprecated package in profile
- {PROFILE_BUG_ID + FS + "deprecated-list.html","<td class=\"colOne\">"
- + "<a href=\"pkgDeprecated/package-summary.html\">pkgDeprecated</a>"
- + NL +"<div class=\"block\"><span class=\"deprecationComment\">This package is <b>Deprecated</b>."
+ {PROFILE_BUG_ID + "/deprecated-list.html","<td class=\"colOne\">"
+ + "<a href=\"pkgDeprecated/package-summary.html\">pkgDeprecated</a>\n"
+ +"<div class=\"block\"><span class=\"deprecationComment\">This package is <b>Deprecated</b>."
+ " Use pkg1.</span></div>"
},
- {PROFILE_BUG_ID + FS + "pkgDeprecated" + FS + "package-summary.html",
- "<div class=\"deprecatedContent\"><span class=\"deprecatedLabel\">Deprecated.</span>"
- + NL + "<div class=\"block\"><span class=\"deprecationComment\">This package is <b>Deprecated</b>."
+ {PROFILE_BUG_ID + "/pkgDeprecated/package-summary.html",
+ "<div class=\"deprecatedContent\"><span class=\"deprecatedLabel\">Deprecated.</span>\n"
+ + "<div class=\"block\"><span class=\"deprecationComment\">This package is <b>Deprecated</b>."
+ " Use pkg1.</span></div>"
},
// need to add teststring when JDK-8015496 will be fixed
//Test exception in profiles
- {PROFILE_BUG_ID + FS + "compact1-summary.html","<table class=\"typeSummary\" "
+ {PROFILE_BUG_ID + "/compact1-summary.html",
+ "<table class=\"typeSummary\" "
+ "border=\"0\" cellpadding=\"3\" cellspacing=\"0\" "
- + "summary=\"Exception Summary table, listing exceptions, and an explanation\">"
- + NL + "<caption><span>Exception Summary</span><span class=\"tabEnd\">"
- + " </span></caption>" + NL + "<tr>" + NL + "<th class=\"colFirst\" "
- + "scope=\"col\">Exception</th>" + NL + "<th class=\"colLast\" scope=\"col\">"
- + "Description</th>" + NL + "</tr>" + NL + "<tbody>" + NL + "<tr class=\"altColor\">"
- + NL + "<td class=\"colFirst\"><a href=\"pkg2/ClassException.html\""
+ + "summary=\"Exception Summary table, listing exceptions, and an explanation\">\n"
+ + "<caption><span>Exception Summary</span><span class=\"tabEnd\">"
+ + " </span></caption>\n" +
+ "<tr>\n" +
+ "<th class=\"colFirst\" "
+ + "scope=\"col\">Exception</th>\n" +
+ "<th class=\"colLast\" scope=\"col\">"
+ + "Description</th>\n" +
+ "</tr>\n" +
+ "<tbody>\n" +
+ "<tr class=\"altColor\">\n"
+ + "<td class=\"colFirst\"><a href=\"pkg2/ClassException.html\""
+ " title=\"class in pkg2\">ClassException</a></td>"
},
//Test errors in profiles
- {PROFILE_BUG_ID + FS + "compact1-summary.html",
+ {PROFILE_BUG_ID + "/compact1-summary.html",
"<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" "
- + "summary=\"Error Summary table, listing errors, and an explanation\">"
- + NL + "<caption><span>Error Summary</span><span class=\"tabEnd\"> "
- + "</span></caption>" + NL + "<tr>" + NL + "<th class=\"colFirst\""
- + " scope=\"col\">Error</th>" + NL + "<th class=\"colLast\" "
- + "scope=\"col\">Description</th>" + NL + "</tr>" + NL + "<tbody>"
- + NL + "<tr class=\"altColor\">" + NL + "<td class=\"colFirst\">"
+ + "summary=\"Error Summary table, listing errors, and an explanation\">\n"
+ + "<caption><span>Error Summary</span><span class=\"tabEnd\"> "
+ + "</span></caption>\n" +
+ "<tr>\n" +
+ "<th class=\"colFirst\""
+ + " scope=\"col\">Error</th>\n" +
+ "<th class=\"colLast\" "
+ + "scope=\"col\">Description</th>\n" +
+ "</tr>\n" +
+ "<tbody>\n"
+ + "<tr class=\"altColor\">\n" +
+ "<td class=\"colFirst\">"
+ "<a href=\"pkg2/ClassError.html\" title=\"class in pkg2\">ClassError</a></td>"
}
};
private static final String[][] PROFILES_NEGATED_TEST = {
- {PROFILE_BUG_ID + FS + "pkg3" + FS + "Class2Pkg3.html",
+ {PROFILE_BUG_ID + "/pkg3/Class2Pkg3.html",
"<div class=\"subTitle\">compact1"
},
- {PROFILE_BUG_ID + FS + "pkg3" + FS + "Interface1Pkg3.html",
+ {PROFILE_BUG_ID + "/pkg3/Interface1Pkg3.html",
"<div class=\"subTitle\">compact1"
},
- {PROFILE_BUG_ID + FS + "pkg4" + FS + "compact2-package-frame.html",
+ {PROFILE_BUG_ID + "/pkg4/compact2-package-frame.html",
"<li><a href=\"Anno1Pkg4.html\" title=\"annotation in pkg4\" "
+ "target=\"classFrame\">Anno1Pkg4</a></li>"
},
- {PROFILE_BUG_ID + FS + "compact1-summary.html","<li>Use</li>"
+ {PROFILE_BUG_ID + "/compact1-summary.html","<li>Use</li>"
},
- {PROFILE_BUG_ID + FS + "compact2-summary.html",
- "<ul class=\"blockList\">" + NL + "<li class=\"blockList\">" + NL
+ {PROFILE_BUG_ID + "/compact2-summary.html",
+ "<ul class=\"blockList\">\n" +
+ "<li class=\"blockList\">\n"
+ "<h3><a href=\"pkg2/compact2-package-summary.html\" target=\"classFrame\">"
- + "pkg2</a></h3>" + NL + "<li class=\"blockList\">" + NL
+ + "pkg2</a></h3>\n" +
+ "<li class=\"blockList\">\n"
+ "<table class=\"typeSummary\" border=\"0\" "
+ "cellpadding=\"3\" cellspacing=\"0\" summary=\"Class Summary table, "
+ "listing classes, and an explanation\">"
},
- {PROFILE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html",
- "<ul class=\"blockList\">" + NL + "<li class=\"blockList\">" + NL
- + "<li class=\"blockList\">" + NL
+ {PROFILE_BUG_ID + "/pkg5/compact3-package-summary.html",
+ "<ul class=\"blockList\">\n" +
+ "<li class=\"blockList\">\n"
+ + "<li class=\"blockList\">\n"
+ "<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\" "
+ "cellspacing=\"0\" summary=\"Interface Summary table, listing "
+ "interfaces, and an explanation\">"
}
};
private static final String[][] PACKAGES_TEST = {
- {PACKAGE_BUG_ID + FS + "overview-frame.html",
+ {PACKAGE_BUG_ID + "/overview-frame.html",
"<h2 title=\"Packages\">Packages</h2>"
},
- {PACKAGE_BUG_ID + FS + "pkg4" + FS + "package-frame.html",
+ {PACKAGE_BUG_ID + "/pkg4/package-frame.html",
"<h1 class=\"bar\"><a href=\"../pkg4/package-summary.html\" "
+ "target=\"classFrame\">pkg4</a></h1>"
},
- {PACKAGE_BUG_ID + FS + "pkg4" + FS + "package-summary.html",
- "<div class=\"header\">" + NL + "<h1 title=\"Package\" "
- + "class=\"title\">Package pkg4</h1>" + NL + "</div>"
+ {PACKAGE_BUG_ID + "/pkg4/package-summary.html",
+ "<div class=\"header\">\n" +
+ "<h1 title=\"Package\" "
+ + "class=\"title\">Package pkg4</h1>\n" +
+ "</div>"
}
};
private static final String[][] PACKAGES_NEGATED_TEST = {
- {PACKAGE_BUG_ID + FS + "overview-frame.html",
+ {PACKAGE_BUG_ID + "/overview-frame.html",
"<span><a href=\"profile-overview-frame.html\" "
+ "target=\"packageListFrame\">All Profiles</a></span>"
},
- {PACKAGE_BUG_ID + FS + "pkg2" + FS + "Class1Pkg2.html",
+ {PACKAGE_BUG_ID + "/pkg2/Class1Pkg2.html",
"<div class=\"subTitle\">compact1, compact2, compact3</div>"
},
- {PACKAGE_BUG_ID + FS + "overview-summary.html",
- "<ul>" + NL +"<li><a href=\"compact1-summary.html\" target=\"classFrame\">" +
- "compact1</a></li>" + NL + "<li><a href=\"compact2-summary.html\" " +
- "target=\"classFrame\">compact2</a></li>" + NL + "<li><a href=\"" +
- "compact3-summary.html\" target=\"classFrame\">compact3</a></li>" + NL +
+ {PACKAGE_BUG_ID + "/overview-summary.html",
+ "<ul>\n" +
+ "<li><a href=\"compact1-summary.html\" target=\"classFrame\">" +
+ "compact1</a></li>\n" +
+ "<li><a href=\"compact2-summary.html\" " +
+ "target=\"classFrame\">compact2</a></li>\n" +
+ "<li><a href=\"" +
+ "compact3-summary.html\" target=\"classFrame\">compact3</a></li>\n" +
"</ul>"
}
};
private static final String[] PACKAGES_NEGATED_FILE_TEST = {
- PACKAGE_BUG_ID + FS + "profile-overview-frame.html",
- PACKAGE_BUG_ID + FS + "compact2-frame.html",
- PACKAGE_BUG_ID + FS + "pkg2" + FS + "compact2-package-frame.html",
- PACKAGE_BUG_ID + FS + "compact2-summary.html",
- PACKAGE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html"
+ PACKAGE_BUG_ID + "/profile-overview-frame.html",
+ PACKAGE_BUG_ID + "/compact2-frame.html",
+ PACKAGE_BUG_ID + "/pkg2/compact2-package-frame.html",
+ PACKAGE_BUG_ID + "/compact2-summary.html",
+ PACKAGE_BUG_ID + "/pkg5/compact3-package-summary.html"
};
/**