diff -r 1e7ad879f15e -r 933ba3f81a87 test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java
--- a/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Thu Oct 10 08:51:55 2013 +0200
+++ b/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Thu Oct 10 10:51:15 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4638588 4635809 6256068 6270645
+ * @bug 4638588 4635809 6256068 6270645 8025633
* @summary Test to make sure that members are inherited properly in the Javadoc.
* Verify that inheritence labels are correct.
* @author jamieh
@@ -44,7 +44,7 @@
//Public method should be inherited
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
- ""},
+ ""},
//Public inner class should be inherited.
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
@@ -56,7 +56,7 @@
//Protected method should be inherited
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
- ""},
+ ""},
//Protected inner class should be inherited.
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
@@ -73,14 +73,14 @@
// Test overriding/implementing methods with generic parameters.
{BUG_ID + FS + "pkg" + FS + "BaseClass.html",
"" + NL + "- Specified by:
" + NL +
- "" +
+ "" +
"getAnnotation
in interface " +
"" +
"BaseInterface
" + NL + "
"},
// Test diamond inheritence member summary (6256068)
{BUG_ID + FS + "diamond" + FS + "Z.html",
- "aMethod
"},
+ "aMethod
"},
// Test that doc is inherited from closed parent (6270645)
{BUG_ID + FS + "inheritDist" + FS + "C.html",
@@ -90,7 +90,7 @@
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
- "staticMethod"},
+ "staticMethod"},
};
private static final String[] ARGS =
new String[] {