--- a/langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java Tue Apr 22 17:57:40 2014 -0700
@@ -33,60 +33,59 @@
public class TestProfiles extends JavadocTester {
//Test information.
- private static final String BUG_ID = "8006124-8009684-8016921";
- private static final String PROFILE_BUG_ID = BUG_ID + "-1";
- private static final String PACKAGE_BUG_ID = BUG_ID + "-2";
+ private static final String PROFILE_OUTPUT_DIR = OUTPUT_DIR + "-1";
+ private static final String PACKAGE_OUTPUT_DIR = OUTPUT_DIR + "-2";
//Javadoc arguments.
private static final String[] ARGS1 = new String[]{
- "-d", PROFILE_BUG_ID, "-sourcepath", SRC_DIR, "-Xprofilespath",
+ "-d", PROFILE_OUTPUT_DIR, "-sourcepath", SRC_DIR, "-Xprofilespath",
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",
+ "-d", PACKAGE_OUTPUT_DIR, "-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 + "/profile-overview-frame.html",
+ { "profile-overview-frame.html",
"<span><a href=\"overview-frame.html\" "
+ "target=\"packageListFrame\">All Packages</a></span>"
},
- {PROFILE_BUG_ID + "/profile-overview-frame.html",
+ { "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 + "/compact2-frame.html",
+ { "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 + "/compact2-frame.html",
+ { "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 + "/pkg2/compact2-package-frame.html",
+ { "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 + "/compact2-summary.html",
+ { "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 + "/compact2-summary.html",
+ { "compact2-summary.html",
"<h1 title=\"Profile\" class=\"title\">Profile compact2</h1>"
},
- {PROFILE_BUG_ID + "/compact2-summary.html",
+ { "compact2-summary.html",
"<h3><a href=\"pkg2/compact2-package-summary.html\" "
+ "target=\"classFrame\">pkg2</a></h3>"
},
- {PROFILE_BUG_ID + "/compact2-summary.html",
+ { "compact2-summary.html",
"<ul class=\"blockList\">\n" +
"<li class=\"blockList\">\n"
+ "<h3><a href=\"pkg2/compact2-package-summary.html\" target=\"classFrame\">"
@@ -95,7 +94,7 @@
+ "cellpadding=\"3\" cellspacing=\"0\" summary=\"Class Summary table, "
+ "listing classes, and an explanation\">"
},
- {PROFILE_BUG_ID + "/compact2-summary.html",
+ { "compact2-summary.html",
"<ul class=\"blockList\">\n" +
"<li class=\"blockList\">\n"
+ "<h3><a href=\"pkg4/compact2-package-summary.html\" target=\"classFrame\">"
@@ -106,14 +105,14 @@
},
// Tests for profileName-package-summary.html listing the summary for a
// package in a profile.
- {PROFILE_BUG_ID + "/pkg5/compact3-package-summary.html",
+ { "pkg5/compact3-package-summary.html",
"<li><a href=\"../pkg4/compact3-package-summary.html\">Prev Package"
+ "</a></li>"
},
- {PROFILE_BUG_ID + "/pkg5/compact3-package-summary.html",
+ { "pkg5/compact3-package-summary.html",
"<div class=\"subTitle\">compact3</div>"
},
- {PROFILE_BUG_ID + "/pkg5/compact3-package-summary.html",
+ { "pkg5/compact3-package-summary.html",
"<ul class=\"blockList\">\n" +
"<li class=\"blockList\">\n"
+ "<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\" "
@@ -121,20 +120,20 @@
+ "interfaces, and an explanation\">"
},
//Test for "overview-frame.html" showing the "All Profiles" link.
- {PROFILE_BUG_ID + "/overview-frame.html",
+ { "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 + "/pkg2/Class1Pkg2.html",
+ { "pkg2/Class1Pkg2.html",
"<div class=\"subTitle\">compact1, compact2, compact3</div>"
},
- {PROFILE_BUG_ID + "/index.html",
+ { "index.html",
"<frame src=\"overview-frame.html\" name=\"packageListFrame\" " +
"title=\"All Packages\">"
},
//Test for "overview-summary.html" showing the profile list.
- {PROFILE_BUG_ID + "/overview-summary.html",
+ { "overview-summary.html",
"<ul>\n" +
"<li><a href=\"compact1-summary.html\" target=\"classFrame\">" +
"compact1</a></li>\n" +
@@ -145,28 +144,28 @@
"</ul>"
},
//Test deprecated class in profiles
- {PROFILE_BUG_ID + "/compact1-summary.html","<td class=\"colFirst\">"
- + "<a href=\"pkg2/Class1Pkg2.html\" title=\"class in pkg2\">Class1Pkg2</a></td>\n"
+ { "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 + "/deprecated-list.html","<td class=\"colOne\">"
- + "<a href=\"pkg2/Class1Pkg2.html\" title=\"class in pkg2\">pkg2.Class1Pkg2</a>\n"
+ { "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 + "/deprecated-list.html","<td class=\"colOne\">"
- + "<a href=\"pkgDeprecated/package-summary.html\">pkgDeprecated</a>\n"
+ { "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 + "/pkgDeprecated/package-summary.html",
+ { "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 + "/compact1-summary.html",
+ { "compact1-summary.html",
"<table class=\"typeSummary\" "
+ "border=\"0\" cellpadding=\"3\" cellspacing=\"0\" "
+ "summary=\"Exception Summary table, listing exceptions, and an explanation\">\n"
@@ -184,7 +183,7 @@
+ " title=\"class in pkg2\">ClassException</a></td>"
},
//Test errors in profiles
- {PROFILE_BUG_ID + "/compact1-summary.html",
+ { "compact1-summary.html",
"<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" "
+ "summary=\"Error Summary table, listing errors, and an explanation\">\n"
+ "<caption><span>Error Summary</span><span class=\"tabEnd\"> "
@@ -202,19 +201,19 @@
}
};
private static final String[][] PROFILES_NEGATED_TEST = {
- {PROFILE_BUG_ID + "/pkg3/Class2Pkg3.html",
+ { "pkg3/Class2Pkg3.html",
"<div class=\"subTitle\">compact1"
},
- {PROFILE_BUG_ID + "/pkg3/Interface1Pkg3.html",
+ { "pkg3/Interface1Pkg3.html",
"<div class=\"subTitle\">compact1"
},
- {PROFILE_BUG_ID + "/pkg4/compact2-package-frame.html",
+ { "pkg4/compact2-package-frame.html",
"<li><a href=\"Anno1Pkg4.html\" title=\"annotation in pkg4\" "
+ "target=\"classFrame\">Anno1Pkg4</a></li>"
},
- {PROFILE_BUG_ID + "/compact1-summary.html","<li>Use</li>"
+ { "compact1-summary.html","<li>Use</li>"
},
- {PROFILE_BUG_ID + "/compact2-summary.html",
+ { "compact2-summary.html",
"<ul class=\"blockList\">\n" +
"<li class=\"blockList\">\n"
+ "<h3><a href=\"pkg2/compact2-package-summary.html\" target=\"classFrame\">"
@@ -224,7 +223,7 @@
+ "cellpadding=\"3\" cellspacing=\"0\" summary=\"Class Summary table, "
+ "listing classes, and an explanation\">"
},
- {PROFILE_BUG_ID + "/pkg5/compact3-package-summary.html",
+ { "pkg5/compact3-package-summary.html",
"<ul class=\"blockList\">\n" +
"<li class=\"blockList\">\n"
+ "<li class=\"blockList\">\n"
@@ -234,14 +233,14 @@
}
};
private static final String[][] PACKAGES_TEST = {
- {PACKAGE_BUG_ID + "/overview-frame.html",
+ { "overview-frame.html",
"<h2 title=\"Packages\">Packages</h2>"
},
- {PACKAGE_BUG_ID + "/pkg4/package-frame.html",
+ { "pkg4/package-frame.html",
"<h1 class=\"bar\"><a href=\"../pkg4/package-summary.html\" "
+ "target=\"classFrame\">pkg4</a></h1>"
},
- {PACKAGE_BUG_ID + "/pkg4/package-summary.html",
+ { "pkg4/package-summary.html",
"<div class=\"header\">\n" +
"<h1 title=\"Package\" "
+ "class=\"title\">Package pkg4</h1>\n" +
@@ -249,14 +248,14 @@
}
};
private static final String[][] PACKAGES_NEGATED_TEST = {
- {PACKAGE_BUG_ID + "/overview-frame.html",
+ { "overview-frame.html",
"<span><a href=\"profile-overview-frame.html\" "
+ "target=\"packageListFrame\">All Profiles</a></span>"
},
- {PACKAGE_BUG_ID + "/pkg2/Class1Pkg2.html",
+ { "pkg2/Class1Pkg2.html",
"<div class=\"subTitle\">compact1, compact2, compact3</div>"
},
- {PACKAGE_BUG_ID + "/overview-summary.html",
+ { "overview-summary.html",
"<ul>\n" +
"<li><a href=\"compact1-summary.html\" target=\"classFrame\">" +
"compact1</a></li>\n" +
@@ -268,11 +267,11 @@
}
};
private static final String[] PACKAGES_NEGATED_FILE_TEST = {
- 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"
+ "profile-overview-frame.html",
+ "compact2-frame.html",
+ "pkg2/compact2-package-frame.html",
+ "compact2-summary.html",
+ "pkg5/compact3-package-summary.html"
};
/**
@@ -286,18 +285,4 @@
tester.run(ARGS2, PACKAGES_TEST, PACKAGES_NEGATED_TEST, NO_FILE_TEST, PACKAGES_NEGATED_FILE_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}