1.1 --- a/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Tue Nov 30 09:38:48 2010 -0800
1.2 +++ b/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Wed Dec 01 11:02:38 2010 -0800
1.3 @@ -40,55 +40,57 @@
1.4 private static final String[][] TEST = {
1.5 //Public field should be inherited
1.6 {BUG_ID + FS + "pkg" + FS + "SubClass.html",
1.7 - "<A HREF=\"../pkg/BaseClass.html#pubField\">"},
1.8 + "<a href=\"../pkg/BaseClass.html#pubField\">"},
1.9
1.10 //Public method should be inherited
1.11 {BUG_ID + FS + "pkg" + FS + "SubClass.html",
1.12 - "<A HREF=\"../pkg/BaseClass.html#pubMethod()\">"},
1.13 + "<a href=\"../pkg/BaseClass.html#pubMethod()\">"},
1.14
1.15 //Public inner class should be inherited.
1.16 {BUG_ID + FS + "pkg" + FS + "SubClass.html",
1.17 - "<A HREF=\"../pkg/BaseClass.pubInnerClass.html\" title=\"class in pkg\">"},
1.18 + "<a href=\"../pkg/BaseClass.pubInnerClass.html\" title=\"class in pkg\">"},
1.19
1.20 //Protected field should be inherited
1.21 {BUG_ID + FS + "pkg" + FS + "SubClass.html",
1.22 - "<A HREF=\"../pkg/BaseClass.html#proField\">"},
1.23 + "<a href=\"../pkg/BaseClass.html#proField\">"},
1.24
1.25 //Protected method should be inherited
1.26 {BUG_ID + FS + "pkg" + FS + "SubClass.html",
1.27 - "<A HREF=\"../pkg/BaseClass.html#proMethod()\">"},
1.28 + "<a href=\"../pkg/BaseClass.html#proMethod()\">"},
1.29
1.30 //Protected inner class should be inherited.
1.31 {BUG_ID + FS + "pkg" + FS + "SubClass.html",
1.32 - "<A HREF=\"../pkg/BaseClass.proInnerClass.html\" title=\"class in pkg\">"},
1.33 + "<a href=\"../pkg/BaseClass.proInnerClass.html\" title=\"class in pkg\">"},
1.34
1.35 // New labels as of 1.5.0
1.36 {BUG_ID + FS + "pkg" + FS + "SubClass.html",
1.37 - "<STRONG>Nested classes/interfaces inherited from class pkg." +
1.38 - "<A HREF=\"../pkg/BaseClass.html\" title=\"class in pkg\">" +
1.39 - "BaseClass</A></STRONG>"},
1.40 + "Nested classes/interfaces inherited from class pkg." +
1.41 + "<a href=\"../pkg/BaseClass.html\" title=\"class in pkg\">BaseClass</a>"},
1.42 {BUG_ID + FS + "pkg" + FS + "SubClass.html",
1.43 - "<STRONG>Nested classes/interfaces inherited from interface pkg." +
1.44 - "<A HREF=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">" +
1.45 - "BaseInterface</A></STRONG>"},
1.46 + "Nested classes/interfaces inherited from interface pkg." +
1.47 + "<a href=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">BaseInterface</a>"},
1.48
1.49 // Test overriding/implementing methods with generic parameters.
1.50 {BUG_ID + FS + "pkg" + FS + "BaseClass.html",
1.51 - "<DT><STRONG>Specified by:</STRONG></DT><DD><CODE><A HREF=\"../pkg/BaseInterface.html#getAnnotation(java.lang.Class)\">getAnnotation</A></CODE> in interface <CODE><A HREF=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">BaseInterface</A></CODE></DD>"+NL+"</DL>"},
1.52 + "<dl>" + NL + "<dt><strong>Specified by:</strong></dt>" + NL +
1.53 + "<dd><code><a href=\"../pkg/BaseInterface.html#getAnnotation(java.lang.Class)\">" +
1.54 + "getAnnotation</a></code> in interface <code>" +
1.55 + "<a href=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">" +
1.56 + "BaseInterface</a></code></dd>" + NL + "</dl>"},
1.57
1.58 // Test diamond inheritence member summary (6256068)
1.59 {BUG_ID + FS + "diamond" + FS + "Z.html",
1.60 - "<TD><CODE><A HREF=\"../diamond/A.html#aMethod()\">aMethod</A></CODE></TD>"},
1.61 + "<code><a href=\"../diamond/A.html#aMethod()\">aMethod</a></code>"},
1.62
1.63 // Test that doc is inherited from closed parent (6270645)
1.64 {BUG_ID + FS + "inheritDist" + FS + "C.html",
1.65 - " m1-B</TD>"},
1.66 + "<div class=\"block\">m1-B</div>"},
1.67
1.68 };
1.69
1.70 private static final String[][] NEGATED_TEST = {
1.71 {BUG_ID + FS + "pkg" + FS + "SubClass.html",
1.72 - "<A HREF=\"../pkg/BaseClass.html#staticMethod()\">staticMethod</A></CODE>"},
1.73 + "<a href=\"../pkg/BaseClass.html#staticMethod()\">staticMethod</a></code>"},
1.74 };
1.75 private static final String[] ARGS =
1.76 new String[] {
