--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java Tue Apr 22 17:57:40 2014 -0700
@@ -35,29 +35,26 @@
public class TestMultiInheritence extends JavadocTester {
- //Test information.
- private static final String BUG_ID = "4933335";
-
//Javadoc arguments.
private static final String[] ARGS = new String[] {
- "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg3"
+ "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg3"
};
//Method foo() is inherited from BOTH I2 and I3
private static final String[][] TEST = {
- {BUG_ID + "/pkg3/I1.html",
+ { "pkg3/I1.html",
"Methods inherited from interface pkg3." +
"<a href=\"../pkg3/I2.html\" title=\"interface in pkg3\">" +
"I2</a>"},
- {BUG_ID + "/pkg3/I1.html",
+ { "pkg3/I1.html",
"Methods inherited from interface pkg3." +
"<a href=\"../pkg3/I3.html\" title=\"interface in pkg3\">" +
"I3</a>"},
- {BUG_ID + "/pkg3/I0.html",
+ { "pkg3/I0.html",
"Methods inherited from interface pkg3." +
"<a href=\"../pkg3/I2.html\" title=\"interface in pkg3\">" +
"I2</a>"},
- {BUG_ID + "/pkg3/I0.html",
+ { "pkg3/I0.html",
"Methods inherited from interface pkg3." +
"<a href=\"../pkg3/I3.html\" title=\"interface in pkg3\">" +
"I3</a>"},
@@ -66,11 +63,11 @@
//Method foo() is NOT inherited from I4 because it is overriden by
//I3.
private static final String[][] NEGATED_TEST = {
- {BUG_ID + "/pkg3/I1.html",
+ { "pkg3/I1.html",
"Methods inherited from interface pkg3." +
"<a href=\"../pkg3/I4.html\" title=\"interface in pkg3\">" +
"I4</a>"},
- {BUG_ID + "/pkg3/I0.html",
+ { "pkg3/I0.html",
"Methods inherited from interface pkg3." +
"<a href=\"../pkg3/I4.html\" title=\"interface in pkg3\">" +
"I4</a>"},
@@ -85,18 +82,4 @@
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}