@Deprecated" + NL +
- "public class DeprecatedClassByAnnotation" + NL +
+ "public class DeprecatedClassByAnnotation" + NL +
"extends java.lang.Object"},
{TARGET_FILE2, "@Deprecated" + NL +
diff -r 53409a3a93f8 -r 63f3c4d2d992 langtools/test/com/sun/javadoc/testHref/TestHref.java
--- a/langtools/test/com/sun/javadoc/testHref/TestHref.java Sun Apr 03 17:00:50 2011 -0700
+++ b/langtools/test/com/sun/javadoc/testHref/TestHref.java Mon Apr 04 10:14:23 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,7 @@
* @summary Verify that spaces do not appear in hrefs and anchors.
* @author jamieh
* @library ../lib/
- * @build JavadocTester
- * @build TestHref
+ * @build JavadocTester TestHref
* @run main TestHref
*/
@@ -81,7 +80,7 @@
//Signature does not link to the page itself.
{BUG_ID + FS + "pkg" + FS + "C4.html",
- "public abstract class C4<E extends C4<E>>"
+ "public abstract class C4<E extends C4<E>>"
},
};
private static final String[][] NEGATED_TEST =
diff -r 53409a3a93f8 -r 63f3c4d2d992 langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
--- a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Sun Apr 03 17:00:50 2011 -0700
+++ b/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Mon Apr 04 10:14:23 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,7 @@
* @summary This test verifies the nesting of definition list tags.
* @author Bhavesh Patel
* @library ../lib/
- * @build JavadocTester
- * @build TestHtmlDefinitionListTag
+ * @build JavadocTester TestHtmlDefinitionListTag
* @run main TestHtmlDefinitionListTag
*/
@@ -43,7 +42,8 @@
// Optional Element should print properly nested definition list tags
// for default value.
private static final String[][] TEST_ALL = {
- {BUG_ID + FS + "pkg1" + FS + "C1.html", "public class C1" + NL +
+ {BUG_ID + FS + "pkg1" + FS + "C1.html", "public class " +
+ "C1" + NL +
"extends java.lang.Object" + NL + "implements java.io.Serializable"},
{BUG_ID + FS + "pkg1" + FS + "C4.html", "public abstract class StringBuilderChild" + NL + + ""}, //FIELD {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", @@ -299,7 +299,7 @@ {BUG_ID + FS + "pkg1" + FS + "B.html", "public abstract class StringBuilderChild" + NL + "extends Object" }, diff -r 53409a3a93f8 -r 63f3c4d2d992 langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java --- 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"}, //Make sure enum signature is correct. - {BUG_ID + FS + "pkg" + FS + "Coin.html", "public enum Coin" + NL + - "extends java.lang.Enum<Coin>" + {BUG_ID + FS + "pkg" + FS + "Coin.html", "public enum " + + "Coin" + NL + + "extends java.lang.Enum<Coin>" }, //Check for enum constant section {BUG_ID + FS + "pkg" + FS + "Coin.html", "Enum Constants" + @@ -118,8 +118,8 @@ //Signature of subclass that has type parameters. {BUG_ID + FS + "pkg" + FS + "TypeParameterSubClass.html", - " public class TypeParameterSubClass<T extends " + - "java.lang.String>" + NL + "extends " + + ""}, + "required=1994)" + NL + "public class " + + "AnnotationTypeUsage" + NL + "extends java.lang.Objectpublic class TypeParameterSubClass<T extends " + + "java.lang.String>" + NL + "extends " + "" + "TypeParameterSuperClass<T>"}, @@ -168,7 +168,7 @@ "Annotation Type AnnotationType"}, //Make sure the signature is correct. {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", - "public @interface AnnotationType"}, + "public @interface AnnotationType"}, //Make sure member summary headings are correct. {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", "Required Element Summary
"}, @@ -198,8 +198,8 @@ "optional" + "=\"Class Annotation\"," + NL + " " + - "required=1994)" + NL + "public class " + - "AnnotationTypeUsage" + NL + "extends java.lang.Object
@A"}, {BUG_ID + FS + "pkg1" + FS + "B.html", - "public interface B"}, + "public interface B"}, //============================================================== @@ -320,9 +320,11 @@ "Foo " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", - "
ClassUseTest1" +
- "<T extends Foo & Foo2> ClassUseTest1<T extends " +
+ "Foo" +
+ " & " +
+ "Foo2> " +
- "ClassUseTest1<T extends Foo & Foo2>" +
- " ClassUseTest1<T extends " +
+ "Foo" +
+ " & " +
+ "Foo2> ClassUseTest2<T " +
- "extends ParamTest<Foo3>> ClassUseTest2<T extends " +
+ "" +
+ "ParamTest<" +
+ "Foo3>> " +
- "ClassUseTest2<T extends ParamTest<Foo3>>" +
- " ClassUseTest2<T extends " +
+ "" +
+ "ParamTest<" +
+ "Foo3>> " +
- "ClassUseTest3<T extends ParamTest2<java.util.List" +
- "<? extends Foo4>>> ClassUseTest3<T extends " +
+ "" +
+ "ParamTest2<java.util.List<? extends " +
+ "" +
+ "Foo4>>> " +
- "ClassUseTest3<T extends ParamTest2<java.util.List" +
- "<? extends Foo4>>> ClassUseTest3<T extends " +
+ "" +
+ "ParamTest2<java.util.List<? extends " +
+ "" +
+ "Foo4>>> <W extends java.lang.String,V extends " +
- "java.util.List>
java.lang.Object"},
+ "java.util.List> <T> java.lang.Object"},
+ "<T> java.lang.Object"
+ },
{BUG_ID + FS + "pkg" + FS + "package-summary.html",
- "C<E extends Parent>"},
+ "C<E extends Parent>"
+ },
+ {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "Foo4.html",
+ "" +
+ "ClassUseTest3<T extends ParamTest2<java.util.List<? extends " +
+ "Foo4>>>"
+ },
//Nested type parameters
{BUG_ID + FS + "pkg" + FS + "C.html",
"" + NL +
"" + NL +
- ""},
-
+ ""
+ },
+ };
+ private static final String[][] TEST2 = {
+ {BUG_ID + FS + "pkg" + FS + "ClassUseTest3.html",
+ "public class " +
+ "ClassUseTest3<T extends ParamTest2<java.util.List<? extends " +
+ "Foo4>>>"
+ }
};
private static final String[][] NEGATED_TEST = NO_TEST;
-
/**
* The entry point of the test.
* @param args the array of command line arguments.
*/
public static void main(String[] args) {
TestTypeParameters tester = new TestTypeParameters();
- run(tester, ARGS, TEST, NEGATED_TEST);
+ run(tester, ARGS1, TEST1, NEGATED_TEST);
+ run(tester, ARGS2, TEST2, NEGATED_TEST);
tester.printSummary();
}
diff -r 53409a3a93f8 -r 63f3c4d2d992 langtools/test/com/sun/javadoc/testTypeParams/pkg/ClassUseTest3.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testTypeParams/pkg/ClassUseTest3.java Mon Apr 04 10:14:23 2011 -0700
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg;
+
+import java.util.*;
+
+public class ClassUseTest3