diff -r bcbc86cc5b31 -r 90af8d87741f test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java --- a/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Tue Nov 30 09:38:48 2010 -0800 +++ b/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Wed Dec 01 11:02:38 2010 -0800 @@ -40,55 +40,57 @@ private static final String[][] TEST = { //Public field should be inherited {BUG_ID + FS + "pkg" + FS + "SubClass.html", - ""}, + ""}, //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", - ""}, + ""}, //Protected field should be inherited {BUG_ID + FS + "pkg" + FS + "SubClass.html", - ""}, + ""}, //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", - ""}, + ""}, // New labels as of 1.5.0 {BUG_ID + FS + "pkg" + FS + "SubClass.html", - "Nested classes/interfaces inherited from class pkg." + - "" + - "BaseClass"}, + "Nested classes/interfaces inherited from class pkg." + + "BaseClass"}, {BUG_ID + FS + "pkg" + FS + "SubClass.html", - "Nested classes/interfaces inherited from interface pkg." + - "" + - "BaseInterface"}, + "Nested classes/interfaces inherited from interface pkg." + + "BaseInterface"}, // Test overriding/implementing methods with generic parameters. {BUG_ID + FS + "pkg" + FS + "BaseClass.html", - "
Specified by:
getAnnotation in interface BaseInterface
"+NL+""}, + "
" + 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", - "          m1-B"}, + "
m1-B
"}, }; private static final String[][] NEGATED_TEST = { {BUG_ID + FS + "pkg" + FS + "SubClass.html", - "staticMethod"}, + "staticMethod"}, }; private static final String[] ARGS = new String[] {