1.1 --- a/test/com/sun/javadoc/testProfiles/TestProfiles.java Wed Mar 13 22:03:09 2013 +0100
1.2 +++ b/test/com/sun/javadoc/testProfiles/TestProfiles.java Wed Mar 13 14:47:15 2013 -0700
1.3 @@ -23,7 +23,7 @@
1.4
1.5 /*
1.6 * @test
1.7 - * @bug 8006124
1.8 + * @bug 8006124 8009684
1.9 * @summary Test javadoc support for profiles.
1.10 * @author Bhavesh Patel
1.11 * @library ../lib/
1.12 @@ -33,7 +33,7 @@
1.13 public class TestProfiles extends JavadocTester {
1.14
1.15 //Test information.
1.16 - private static final String BUG_ID = "8006124";
1.17 + private static final String BUG_ID = "8006124-8009684";
1.18 private static final String PROFILE_BUG_ID = BUG_ID + "-1";
1.19 private static final String PACKAGE_BUG_ID = BUG_ID + "-2";
1.20 //Javadoc arguments.
1.21 @@ -49,17 +49,17 @@
1.22 // Tests for profile-overview-frame.html listing all profiles.
1.23 {PROFILE_BUG_ID + FS + "profile-overview-frame.html",
1.24 "<span><a href=\"overview-frame.html\" "
1.25 - + "target=\"profileListFrame\">All Packages</a></span>"
1.26 + + "target=\"packageListFrame\">All Packages</a></span>"
1.27 },
1.28 {PROFILE_BUG_ID + FS + "profile-overview-frame.html",
1.29 - "<li><a href=\"compact1-frame.html\" target=\"profileListFrame\">"
1.30 + "<li><a href=\"compact1-frame.html\" target=\"packageListFrame\">"
1.31 + "compact1</a></li>"
1.32 },
1.33 // Tests for profileName-frame.html listing all packages in a profile.
1.34 {PROFILE_BUG_ID + FS + "compact2-frame.html",
1.35 - "<span><a href=\"overview-frame.html\" target=\"profileListFrame\">"
1.36 + "<span><a href=\"overview-frame.html\" target=\"packageListFrame\">"
1.37 + "All Packages</a></span><span><a href=\"profile-overview-frame.html\" "
1.38 - + "target=\"profileListFrame\">All Profiles</a></span>"
1.39 + + "target=\"packageListFrame\">All Profiles</a></span>"
1.40 },
1.41 {PROFILE_BUG_ID + FS + "compact2-frame.html",
1.42 "<li><a href=\"pkg4/compact2-package-frame.html\" "
1.43 @@ -96,11 +96,15 @@
1.44 //Test for "overview-frame.html" showing the "All Profiles" link.
1.45 {PROFILE_BUG_ID + FS + "overview-frame.html",
1.46 "<span><a href=\"profile-overview-frame.html\" "
1.47 - + "target=\"profileListFrame\">All Profiles</a></span>"
1.48 + + "target=\"packageListFrame\">All Profiles</a></span>"
1.49 },
1.50 //Test for "className.html" showing the profile information for the type.
1.51 {PROFILE_BUG_ID + FS + "pkg2" + FS + "Class1Pkg2.html",
1.52 "<div class=\"subTitle\">compact1, compact2, compact3</div>"
1.53 + },
1.54 + {PROFILE_BUG_ID + FS + "index.html",
1.55 + "<frame src=\"overview-frame.html\" name=\"packageListFrame\" " +
1.56 + "title=\"All Packages\">"
1.57 }
1.58 };
1.59 private static final String[][] PROFILES_NEGATED_TEST = {
1.60 @@ -131,12 +135,12 @@
1.61 private static final String[][] PACKAGES_NEGATED_TEST = {
1.62 {PACKAGE_BUG_ID + FS + "profile-overview-frame.html",
1.63 "<span><a href=\"overview-frame.html\" "
1.64 - + "target=\"profileListFrame\">All Packages</a></span>"
1.65 + + "target=\"packageListFrame\">All Packages</a></span>"
1.66 },
1.67 {PACKAGE_BUG_ID + FS + "compact2-frame.html",
1.68 - "<span><a href=\"overview-frame.html\" target=\"profileListFrame\">"
1.69 + "<span><a href=\"overview-frame.html\" target=\"packageListFrame\">"
1.70 + "All Packages</a></span><span><a href=\"profile-overview-frame.html\" "
1.71 - + "target=\"profileListFrame\">All Profiles</a></span>"
1.72 + + "target=\"packageListFrame\">All Profiles</a></span>"
1.73 },
1.74 {PACKAGE_BUG_ID + FS + "pkg2" + FS + "compact2-package-frame.html",
1.75 "<a href=\"../compact2-summary.html\" target=\"classFrame\">"
1.76 @@ -151,7 +155,7 @@
1.77 },
1.78 {PACKAGE_BUG_ID + FS + "overview-frame.html",
1.79 "<span><a href=\"profile-overview-frame.html\" "
1.80 - + "target=\"profileListFrame\">All Profiles</a></span>"
1.81 + + "target=\"packageListFrame\">All Profiles</a></span>"
1.82 },
1.83 {PACKAGE_BUG_ID + FS + "pkg2" + FS + "Class1Pkg2.html",
1.84 "<div class=\"subTitle\">compact1, compact2, compact3</div>"
