--- a/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Tue Apr 22 17:57:40 2014 -0700
@@ -35,43 +35,41 @@
public class TestMemberInheritence extends JavadocTester {
- private static final String BUG_ID = "4638588-4635809-6256068-6270645";
-
private static final String[][] TEST = {
//Public field should be inherited
- {BUG_ID + "/pkg/SubClass.html",
+ { "pkg/SubClass.html",
"<a href=\"../pkg/BaseClass.html#pubField\">"},
//Public method should be inherited
- {BUG_ID + "/pkg/SubClass.html",
+ { "pkg/SubClass.html",
"<a href=\"../pkg/BaseClass.html#pubMethod--\">"},
//Public inner class should be inherited.
- {BUG_ID + "/pkg/SubClass.html",
+ { "pkg/SubClass.html",
"<a href=\"../pkg/BaseClass.pubInnerClass.html\" title=\"class in pkg\">"},
//Protected field should be inherited
- {BUG_ID + "/pkg/SubClass.html",
+ { "pkg/SubClass.html",
"<a href=\"../pkg/BaseClass.html#proField\">"},
//Protected method should be inherited
- {BUG_ID + "/pkg/SubClass.html",
+ { "pkg/SubClass.html",
"<a href=\"../pkg/BaseClass.html#proMethod--\">"},
//Protected inner class should be inherited.
- {BUG_ID + "/pkg/SubClass.html",
+ { "pkg/SubClass.html",
"<a href=\"../pkg/BaseClass.proInnerClass.html\" title=\"class in pkg\">"},
// New labels as of 1.5.0
- {BUG_ID + "/pkg/SubClass.html",
+ { "pkg/SubClass.html",
"Nested classes/interfaces inherited from class pkg." +
"<a href=\"../pkg/BaseClass.html\" title=\"class in pkg\">BaseClass</a>"},
- {BUG_ID + "/pkg/SubClass.html",
+ { "pkg/SubClass.html",
"Nested classes/interfaces inherited from interface pkg." +
"<a href=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">BaseInterface</a>"},
// Test overriding/implementing methods with generic parameters.
- {BUG_ID + "/pkg/BaseClass.html",
+ { "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-\">" +
@@ -81,22 +79,22 @@
"</dl>"},
// Test diamond inheritence member summary (6256068)
- {BUG_ID + "/diamond/Z.html",
+ { "diamond/Z.html",
"<code><a href=\"../diamond/A.html#aMethod--\">aMethod</a></code>"},
// Test that doc is inherited from closed parent (6270645)
- {BUG_ID + "/inheritDist/C.html",
+ { "inheritDist/C.html",
"<div class=\"block\">m1-B</div>"},
};
private static final String[][] NEGATED_TEST = {
- {BUG_ID + "/pkg/SubClass.html",
+ { "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",
+ "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg", "diamond",
"inheritDist"};
/**
@@ -108,18 +106,4 @@
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}