--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Sun Apr 03 17:00:50 2011 -0700
+++ b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Mon Apr 04 10:14:23 2011 -0700
@@ -23,14 +23,13 @@
/*
* @test
- * @bug 4789689 4905985 4927164 4827184 4993906 5004549 7025314
+ * @bug 4789689 4905985 4927164 4827184 4993906 5004549 7025314 7010344
* @summary Run Javadoc on a set of source files that demonstrate new
* language features. Check the output to ensure that the new
* language features are properly documented.
* @author jamieh
* @library ../lib/
- * @build JavadocTester
- * @build TestNewLanguageFeatures
+ * @build JavadocTester TestNewLanguageFeatures
* @run main TestNewLanguageFeatures
*/
@@ -53,9 +52,10 @@
//Make sure enum header is correct.
{BUG_ID + FS + "pkg" + FS + "Coin.html", "Enum Coin</h2>"},
//Make sure enum signature is correct.
- {BUG_ID + FS + "pkg" + FS + "Coin.html", "<pre>public enum <strong>Coin</strong>" + NL +
- "extends java.lang.Enum<<a href=\"../pkg/Coin.html\" " +
- "title=\"enum in pkg\">Coin</a>></pre>"
+ {BUG_ID + FS + "pkg" + FS + "Coin.html", "<pre>public enum " +
+ "<span class=\"strong\">Coin</span>" + NL +
+ "extends java.lang.Enum<<a href=\"../pkg/Coin.html\" " +
+ "title=\"enum in pkg\">Coin</a>></pre>"
},
//Check for enum constant section
{BUG_ID + FS + "pkg" + FS + "Coin.html", "<caption><span>Enum Constants" +
@@ -118,8 +118,8 @@
//Signature of subclass that has type parameters.
{BUG_ID + FS + "pkg" + FS + "TypeParameterSubClass.html",
- "<pre>public class <strong>TypeParameterSubClass<T extends " +
- "java.lang.String></strong>" + NL + "extends " +
+ "<pre>public class <span class=\"strong\">TypeParameterSubClass<T extends " +
+ "java.lang.String></span>" + NL + "extends " +
"<a href=\"../pkg/TypeParameterSuperClass.html\" title=\"class in pkg\">" +
"TypeParameterSuperClass</a><T></pre>"},
@@ -168,7 +168,7 @@
"Annotation Type AnnotationType</h2>"},
//Make sure the signature is correct.
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
- "public @interface <strong>AnnotationType</strong>"},
+ "public @interface <span class=\"strong\">AnnotationType</span>"},
//Make sure member summary headings are correct.
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
"<h3>Required Element Summary</h3>"},
@@ -198,8 +198,8 @@
"<a href=\"../pkg/AnnotationType.html#optional()\">optional</a>" +
"=\"Class Annotation\"," + NL +
" <a href=\"../pkg/AnnotationType.html#required()\">" +
- "required</a>=1994)" + NL + "public class <strong>" +
- "AnnotationTypeUsage</strong>" + NL + "extends java.lang.Object</pre>"},
+ "required</a>=1994)" + NL + "public class <span class=\"strong\">" +
+ "AnnotationTypeUsage</span>" + NL + "extends java.lang.Object</pre>"},
//FIELD
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
@@ -299,7 +299,7 @@
{BUG_ID + FS + "pkg1" + FS + "B.html",
"<pre><a href=\"../pkg1/A.html\" title=\"annotation in pkg1\">@A</a>"},
{BUG_ID + FS + "pkg1" + FS + "B.html",
- "public interface <strong>B</strong></pre>"},
+ "public interface <span class=\"strong\">B</span></pre>"},
//==============================================================
@@ -320,9 +320,11 @@
"Foo</a></span><span class=\"tabEnd\"> </span></caption>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
- "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/" +
- "ClassUseTest1.html\" title=\"class in pkg2\">ClassUseTest1" +
- "<T extends Foo & Foo2></a></strong></code> </td>"
+ "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/ClassUseTest1.html\" " +
+ "title=\"class in pkg2\">ClassUseTest1</a><T extends " +
+ "<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo" +
+ "</a> & <a href=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">" +
+ "Foo2</a>></strong></code> </td>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
"<caption><span>Methods in <a href=\"../../pkg2/" +
@@ -370,10 +372,11 @@
"</span></caption>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
- "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/" +
- "ClassUseTest1.html\" title=\"class in pkg2\">" +
- "ClassUseTest1<T extends Foo & Foo2></a></strong>" +
- "</code> </td>"
+ "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/ClassUseTest1.html\" " +
+ "title=\"class in pkg2\">ClassUseTest1</a><T extends " +
+ "<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo" +
+ "</a> & <a href=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">" +
+ "Foo2</a>></strong></code> </td>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
"<caption><span>Methods in <a href=\"../../pkg2/" +
@@ -398,10 +401,11 @@
" </span></caption>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
- "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/" +
- "ClassUseTest2.html\" title=\"class in pkg2\">ClassUseTest2<T " +
- "extends ParamTest<<a href=\"../../pkg2/Foo3.html\" title=\"class " +
- "in pkg2\">Foo3</a>>></a></strong></code> </td>"
+ "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/ClassUseTest2.html\" " +
+ "title=\"class in pkg2\">ClassUseTest2</a><T extends " +
+ "<a href=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">" +
+ "ParamTest</a><<a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">" +
+ "Foo3</a>>></strong></code> </td>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
"<caption><span>Methods in <a href=\"../../pkg2/" +
@@ -452,11 +456,11 @@
"Foo3</a></span><span class=\"tabEnd\"> </span></caption>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
- "<td class=\"colLast\"><code><strong><a href=\"../../" +
- "pkg2/ClassUseTest2.html\" title=\"class in pkg2\">" +
- "ClassUseTest2<T extends ParamTest<<a href=\"../../" +
- "pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</a>>>" +
- "</a></strong></code> </td>"
+ "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/ClassUseTest2.html\" " +
+ "title=\"class in pkg2\">ClassUseTest2</a><T extends " +
+ "<a href=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">" +
+ "ParamTest</a><<a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">" +
+ "Foo3</a>>></strong></code> </td>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
"<caption><span>Methods in <a href=\"../../pkg2/" +
@@ -496,10 +500,12 @@
" </span></caption>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
- "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/" +
- "ClassUseTest3.html\" title=\"class in pkg2\">" +
- "ClassUseTest3<T extends ParamTest2<java.util.List" +
- "<? extends Foo4>>></a></strong></code> </td>"
+ "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/ClassUseTest3.html\" " +
+ "title=\"class in pkg2\">ClassUseTest3</a><T extends " +
+ "<a href=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">" +
+ "ParamTest2</a><java.util.List<? extends " +
+ "<a href=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">" +
+ "Foo4</a>>>></strong></code> </td>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
"<caption><span>Methods in <a href=\"../../pkg2/" +
@@ -532,10 +538,12 @@
"</span></caption>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
- "<td class=\"colLast\"><code><strong><a href=\"../../" +
- "pkg2/ClassUseTest3.html\" title=\"class in pkg2\">" +
- "ClassUseTest3<T extends ParamTest2<java.util.List" +
- "<? extends Foo4>>></a></strong></code> </td>"
+ "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/ClassUseTest3.html\" " +
+ "title=\"class in pkg2\">ClassUseTest3</a><T extends " +
+ "<a href=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">" +
+ "ParamTest2</a><java.util.List<? extends " +
+ "<a href=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">" +
+ "Foo4</a>>>></strong></code> </td>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
"<caption><span>Methods in <a href=\"../../pkg2/" +