diff -r bcbc86cc5b31 -r 90af8d87741f test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java --- a/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Tue Nov 30 09:38:48 2010 -0800 +++ b/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Wed Dec 01 11:02:38 2010 -0800 @@ -51,18 +51,18 @@ // ENUM TESTING //================================= //Make sure enum header is correct. - {BUG_ID + FS + "pkg" + FS + "Coin.html", "Enum Coin"}, + {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", "" + NL + - "Enum Constant Summary"}, + {BUG_ID + FS + "pkg" + FS + "Coin.html", "Enum Constants" + + " "}, //Detail for enum constant {BUG_ID + FS + "pkg" + FS + "Coin.html", - "Dime"}, + "Dime"}, //Automatically insert documentation for values() and valueOf(). {BUG_ID + FS + "pkg" + FS + "Coin.html", "Returns an array containing the constants of this enum type,"}, @@ -77,38 +77,39 @@ //================================= //Make sure the header is correct. {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", - "Class TypeParameters<E>"}, + "Class TypeParameters<E>"}, //Check class type parameters section. {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", - "
Type Parameters:
E - " + + "
Type Parameters:
E - " + "the type parameter for this class."}, //Type parameters in @see/@link {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", - "
See Also:
TypeParameters
"}, + "
See Also:
" + + "" + + "TypeParameters
"}, //Method that uses class type parameter. {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", - "(E param)"}, + "(E param)"}, //Method type parameter section. {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", - "Type Parameters:
T - This is the first " + - "type parameter.
V - This is the second type " + + "Type Parameters:
T - This is the first " + + "type parameter.
V - This is the second type " + "parameter."}, //Signature of method with type parameters {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", - "public <T extends java.util.List,V> " + - "java.lang.String[] methodThatHasTypeParameters"}, + "public <T extends java.util.List,V> " + + "java.lang.String[] methodThatHasTypeParameters"}, //Wildcard testing. {BUG_ID + FS + "pkg" + FS + "Wildcards.html", - "" + - "TypeParameters<? super java.lang.String> a"}, + "" + + "TypeParameters<? super java.lang.String> a"}, {BUG_ID + FS + "pkg" + FS + "Wildcards.html", - "" + - "TypeParameters<? extends java.lang.StringBuffer> b"}, + "" + + "TypeParameters<? extends java.lang.StringBuffer> b"}, {BUG_ID + FS + "pkg" + FS + "Wildcards.html", - "" + - "TypeParameters c"}, + "" + + "TypeParameters c"}, //Bad type parameter warnings. {WARNING_OUTPUT, "warning - @param argument " + "\"\" is not a type parameter name."}, @@ -117,18 +118,27 @@ //Signature of subclass that has type parameters. {BUG_ID + FS + "pkg" + FS + "TypeParameterSubClass.html", - "public class TypeParameterSubClass<T extends java.lang.String>" + - "" + NL + "extends TypeParameterSuperClass<T>"}, + "
public class TypeParameterSubClass<T extends " +
+                "java.lang.String>" + NL + "extends " +
+                "" +
+                "TypeParameterSuperClass<T>
"}, //Interface generic parameter substitution //Signature of subclass that has type parameters. {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", - "All Implemented Interfaces:
SubInterface<E>, SuperInterface<E>
"}, + "
" + NL + "
All Implemented Interfaces:
" + NL + + "
" + + "SubInterface<E>, SuperInterface<E>
" + NL + + "
"}, {BUG_ID + FS + "pkg" + FS + "SuperInterface.html", - "All Known Subinterfaces:
SubInterface<V>
"}, + "
" + NL + "
All Known Subinterfaces:
" + NL + + "
" + + "SubInterface<V>
" + NL + "
"}, {BUG_ID + FS + "pkg" + FS + "SubInterface.html", - "All Superinterfaces:
SuperInterface<V>
"}, + "
" + NL + "
All Superinterfaces:
" + NL + + "
" + + "SuperInterface<V>
" + NL + "
"}, //================================= // VAR ARG TESTING @@ -137,39 +147,40 @@ {BUG_ID + FS + "pkg" + FS + "VarArgs.html", "(int[][]... i)"}, {BUG_ID + FS + "pkg" + FS + "VarArgs.html", "(int[]...)"}, {BUG_ID + FS + "pkg" + FS + "VarArgs.html", - "" + - "TypeParameters... t"}, + "" + + "TypeParameters... t"}, //================================= // ANNOTATION TYPE TESTING //================================= //Make sure the summary links are correct. {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", - "SUMMARY: " + - "REQUIRED | " + - "OPTIONAL"}, + "
  • SUMMARY: 
    • " + NL + + "
  • " + + "REQUIRED | 
    • " + NL + "
  • " + + "OPTIONAL
    • "}, //Make sure the detail links are correct. {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", - "DETAIL: ELEMENT"}, + "
  • DETAIL: 
    • " + NL + + "
  • ELEMENT
    • "}, //Make sure the heading is correct. {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", - "Annotation Type AnnotationType"}, + "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", - "" + NL + - "Required Element Summary"}, + "

    Required Element Summary

    "}, {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", - "" + NL + - "Optional Element Summary"}, + "

    Optional Element Summary

    "}, //Make sure element detail heading is correct {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", "Element Detail"}, //Make sure default annotation type value is printed when necessary. {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", - "Default:
    \"unknown\"
    "}, + "
    " + NL + "
    Default:
    " + NL + "
    \"unknown\"
    " + NL + + "
    "}, //================================= // ANNOTATION TYPE USAGE TESTING @@ -177,51 +188,65 @@ //PACKAGE {BUG_ID + FS + "pkg" + FS + "package-summary.html", - "@AnnotationType(optional=\"Package Annotation\"," + NL + - " required=1994)"}, + "@AnnotationType(optional=\"Package Annotation\"," + NL + + " required=1994)"}, //CLASS {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", - "" + - "@AnnotationType(optional=\"Class Annotation\","+NL + - " required=1994)"+NL + - "public class AnnotationTypeUsage" + NL + - "extends java.lang.Object"}, + "
    @AnnotationType(" +
+                "optional" +
+                "=\"Class Annotation\"," + NL +
+                "                " +
+                "required=1994)" + NL + "public class " +
+                "AnnotationTypeUsage" + NL + "extends java.lang.Object
    "}, //FIELD {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", - "" + - "@AnnotationType(optional=\"Field Annotation\","+NL + - " required=1994)"+NL + - "public int field"}, + "
    @AnnotationType(" +
+                "optional" +
+                "=\"Field Annotation\"," + NL +
+                "                " +
+                "required=1994)" + NL + "public int field
    "}, //CONSTRUCTOR {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", - "" + - "@AnnotationType(optional=\"Constructor Annotation\","+NL + - " required=1994)"+NL + - "public AnnotationTypeUsage()"}, + "
    @AnnotationType(" +
+                "optional" +
+                "=\"Constructor Annotation\"," + NL +
+                "                " +
+                "required=1994)" + NL + "public AnnotationTypeUsage()
    "}, //METHOD {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", - "" + - "@AnnotationType(optional=\"Method Annotation\","+NL + - " required=1994)"+NL + - "public void method()"}, + "
    @AnnotationType(" +
+                "optional" +
+                "=\"Method Annotation\"," + NL +
+                "                " +
+                "required=1994)" + NL + "public void method()
    "}, //METHOD PARAMS {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", - "
    " + NL +
-                "public void methodWithParams(@AnnotationType(optional=\"Parameter Annotation\",required=1994)" + NL +
-                "                             int documented," + NL +
-                "                             int undocmented)
    "}, + "
    public void methodWithParams(" +
+                "" +
+                "@AnnotationType(" +
+                "optional=\"Parameter Annotation\",required=1994)" + NL +
+                "                    int documented," + NL +
+                "                    int undocmented)
    "}, //CONSTRUCTOR PARAMS {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", - "
    " + NL +
-                                "public AnnotationTypeUsage(@AnnotationType(optional=\"Constructor Param Annotation\",required=1994)" + NL +
-                                "                           int documented," + NL +
-                "                           int undocmented)
    "}, + "
    public AnnotationTypeUsage(" +
+                "@AnnotationType(" +
+                "optional=\"Constructor Param Annotation\",required=1994)" + NL +
+                "                   int documented," + NL +
+                "                   int undocmented)
    "}, //================================= // ANNOTATION TYPE USAGE TESTING (All Different Types). @@ -229,59 +254,59 @@ //Integer {BUG_ID + FS + "pkg1" + FS + "B.html", - "d=3.14,"}, + "d=3.14,"}, //Double {BUG_ID + FS + "pkg1" + FS + "B.html", - "d=3.14,"}, + "d=3.14,"}, //Boolean {BUG_ID + FS + "pkg1" + FS + "B.html", - "b=true,"}, + "b=true,"}, //String {BUG_ID + FS + "pkg1" + FS + "B.html", - "s=\"sigh\","}, + "s=\"sigh\","}, //Class {BUG_ID + FS + "pkg1" + FS + "B.html", - "c=Foo.class,"}, + "c=Foo.class,"}, //Bounded Class {BUG_ID + FS + "pkg1" + FS + "B.html", - "w=TypeParameterSubClass.class,"}, + "w=TypeParameterSubClass.class,"}, //Enum {BUG_ID + FS + "pkg1" + FS + "B.html", - "e=Penny,"}, + "e=Penny,"}, //Annotation Type {BUG_ID + FS + "pkg1" + FS + "B.html", - "a=@AnnotationType(optional=\"foo\",required=1994),"}, + "a=@AnnotationType(optional=\"foo\",required=1994),"}, //String Array {BUG_ID + FS + "pkg1" + FS + "B.html", - "sa={\"up\",\"down\"},"}, + "sa={\"up\",\"down\"},"}, //Primitive {BUG_ID + FS + "pkg1" + FS + "B.html", - "primitiveClassTest=boolean.class,"}, + "primitiveClassTest=boolean.class,"}, //XXX: Add array test case after this if fixed: //5020899: Incorrect internal representation of class-valued annotation elements //Make sure that annotations are surrounded by 
     and
    {BUG_ID + FS + "pkg1" + FS + "B.html", - "
    @A"},
+                "
    @A"},
             {BUG_ID + FS + "pkg1" + FS + "B.html",
-                "public interface B
    "},
+                "public interface B
    "}, //============================================================== // Handle multiple bounds. //============================================================== {BUG_ID + FS + "pkg" + FS + "MultiTypeParameters.html", - "public <T extends java.lang.Number & java.lang.Runnable> T foo(T t)"}, + "public <T extends java.lang.Number & java.lang.Runnable> T foo(T t)"}, //============================================================== // Test Class-Use Documenation for Type Parameters. @@ -289,347 +314,356 @@ //ClassUseTest1: {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", - "" + NL + - "Classes in pkg2" + - " with type parameters of type Foo" + "Classes in pkg2 with type parameters of " + + "type " + + "Foo " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", - "ClassUseTest1<T extends Foo & Foo2>" + "ClassUseTest1" + + "<T extends Foo & Foo2> " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", - "" + NL + - "Methods in pkg2" + - " with type parameters of type Foo" + "Methods in pkg2 with type parameters of " + + "type Foo " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", - "ClassUseTest1.method(T t)" + "ClassUseTest1." + + "method" + + "(T t) " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", - "" + NL + - "Fields in pkg2" + - " with type parameters of type Foo" + "Fields in pkg2 with type parameters of " + + "type " + + "Foo " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", - "ParamTest<Foo>" + "td class=\"colFirst\">ParamTest" + + "<Foo>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "" + NL + - "Fields in pkg2" + - " declared as ParamTest" + "Fields in pkg2 declared as ParamTest" + + " " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "ParamTest<Foo>" + "ParamTest<Foo>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", - "" + NL + - "Classes in pkg2" + - " with type parameters of type Foo2" + "Classes in pkg2 with type parameters of " + + "type Foo2 " + + "" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", - "ClassUseTest1<T extends Foo & Foo2>" + "" + + "ClassUseTest1<T extends Foo & Foo2>" + + " " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", - "" + NL + - "Methods in pkg2" + - " with type parameters of type Foo2" + "Methods in pkg2 with type parameters of " + + "type Foo2 " + + "" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", - "ClassUseTest1.method(T t)" + "" + + "ClassUseTest1.method" + + "(T t) " }, //ClassUseTest2: > {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "" + NL + - "Classes in pkg2" + - " with type parameters of type ParamTest" + "Classes in pkg2 with type parameters of " + + "type ParamTest" + + " " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "ClassUseTest2<T extends ParamTest<Foo3>>" + "ClassUseTest2<T " + + "extends ParamTest<Foo3>> " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "" + NL + - "Methods in pkg2" + - " with type parameters of type ParamTest" + "Methods in pkg2 with type parameters of " + + "type ParamTest" + + " " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "ClassUseTest2.method(T t)" + "ClassUseTest2." + + "method" + + "(T t) " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "" + NL + - "Fields in pkg2" + - " declared as ParamTest" + "Fields in pkg2 declared as ParamTest" + + " " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "ParamTest<Foo>" + "ParamTest" + + "<" + + "Foo>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "" + NL + - "Methods in pkg2" + - " with type parameters of type ParamTest" + "Methods in pkg2 with type parameters of " + + "type ParamTest" + + " " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "<T extends ParamTest<Foo3>>" + "<T extends ParamTest" + + "<Foo3>> 
    ParamTest" + + "<Foo3>    " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", - "" + NL + - "Classes in pkg2" + - " with type parameters of type Foo3" + "Classes in pkg2 with type parameters of " + + "type " + + "Foo3 " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", - "ClassUseTest2<T extends ParamTest<Foo3>>" + "" + + "ClassUseTest2<T extends ParamTest<Foo3>>" + + " " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", - "" + NL + - "Methods in pkg2" + - " with type parameters of type Foo3" + "Methods in pkg2 with type parameters of " + + "type Foo3 " + + "" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", - "ClassUseTest2.method(T t)" + "ClassUseTest2." + + "method" + + "(T t) " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", - "" + NL + - "Methods in pkg2" + - " that return types with arguments of type " + - "" + - "Foo3" + "Methods in pkg2 that return types with " + + "arguments of type Foo3" + + " " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", - "<T extends ParamTest<Foo3>>" + "<T extends ParamTest<" + + "Foo3" + + ">> 
    ParamTest<Foo3>    " }, //ClassUseTest3: >> {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", - "" + NL + - "Classes in pkg2" + - " with type parameters of type " + - "" + - "ParamTest2" + "Classes in pkg2 with type parameters of " + + "type ParamTest2" + + " " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", - "ClassUseTest3<T extends ParamTest2<java.util.List<? extends Foo4>>>" + "" + + "ClassUseTest3<T extends ParamTest2<java.util.List" + + "<? extends Foo4>>> " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", - "" + NL + - "Methods in pkg2" + - " with type parameters of type " + - "" + - "ParamTest2" + "Methods in pkg2 with type parameters of " + + "type ParamTest2" + + " " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", - "ClassUseTest3.method(T t)" + "ClassUseTest3" + + ".method(T t) " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", - "" + NL + - "Methods in pkg2" + - " with type parameters of type " + - "" + - "ParamTest2" - }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", - "<T extends ParamTest2<java.util.List<? extends Foo4>>>" + "<T extends " + + "ParamTest2<java.util.List<? extends Foo4>" + + ">> 
    ParamTest2<java.util.List" + + "<? extends Foo4>>    " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", - "" + NL + - "Classes in pkg2" + - " with type parameters of type " + - "" + - "Foo4" + "Classes in pkg2 with type parameters of " + + "type Foo4 " + + "" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", - "ClassUseTest3<T extends ParamTest2<java.util.List<? extends Foo4>>>" + "" + + "ClassUseTest3<T extends ParamTest2<java.util.List" + + "<? extends Foo4>>> " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", - "" + NL + - "Methods in pkg2" + - " with type parameters of type Foo4" + "Methods in pkg2 with type parameters of " + + "type Foo4 " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", - "ClassUseTest3.method(T t)" + "ClassUseTest3." + + "method(T t)" + + " " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", - "" + NL + - "Methods in pkg2" + - " that return types with arguments of type " + - "" + - "Foo4" + "Methods in pkg2 that return types with " + + "arguments of type Foo4 " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", - "<T extends ParamTest2<java.util.List<? extends Foo4>>>" + "<T extends " + + "ParamTest2<java.util.List<? extends Foo4>" + + ">> 
    ParamTest2<java.util.List" + + "<? extends Foo4>>    " }, //Type parameters in constructor and method args {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", - "" + NL + - "Method parameters in pkg2" + - " with type arguments of type Foo4" + NL + - "" + NL + "Modifier and Type" + - "" + NL + "Method and Description" + NL + - "" + NL + - "" + NL + - "" + NL + - " void" + NL + - "ClassUseTest3." + - "" + - "method(java.util.Set<Foo4> p)" + "Method parameters in pkg2 with type arguments of " + + "type Foo4 " + + "" + NL + "" + NL + + "Modifier and Type" + NL + + "Method and Description" + NL + + "" + NL + "" + NL + "" + NL + + "void" + NL + + "ClassUseTest3." + + "method(java." + + "util.Set<Foo4> p) " + NL + + "" + NL + "" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", - "" + NL + - "Constructor parameters in " + - "pkg2 with type arguments of type Foo4" + NL + - "" + NL + "Constructor and Description" + - "" + NL + "" + NL + - "" + NL + - "ClassUseTest3(java.util.Set<" + - "" + - "Foo4> p)" + "Constructor parameters in pkg2 with type arguments " + + "of type Foo4 " + + "" }, //================================= // Annotatation Type Usage //================================= {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", - "Packages with annotations of type " + - "AnnotationType" + NL + - "" + NL + "Package" + - "" + NL + "Description" + NL + "" + NL + - "" + NL + - "pkg" + - "" + "Packages with annotations of type " + + "AnnotationType " + + "" }, {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", - "Classes in pkg" + - " with annotations of type AnnotationType" + NL + - "" + NL + "Modifier and Type" + - "" + NL + "Class and Description" + NL + - "" + NL + - "" + NL + - "" + NL + - " class" + NL + - "AnnotationTypeUsage" + "Classes in pkg with annotations of type " + + "AnnotationType " }, {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", - "Fields in pkg" + - " with annotations of type AnnotationType" + NL + - "" + NL + "Modifier and Type" + - "" + NL + "Field and Description" + NL + - "" + NL + - "" + NL + - "" + NL + - " int" + NL + - "AnnotationTypeUsage." + - "field" + - "" + "Fields in pkg with annotations of type " + + "AnnotationType" + + " " }, {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", - "Methods in pkg" + - " with annotations of type AnnotationType" + NL + - "" + NL + "Modifier and Type" + - "" + NL + "Method and Description" + NL + - "" + NL + - "" + NL + - "" + NL + - " void" + NL + - "AnnotationTypeUsage." + - "" + - "method()" + "Methods in pkg with annotations of type " + + "AnnotationType" + + " " }, {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", - "Method parameters in pkg" + - " with annotations of type AnnotationType" + NL + - "" + NL + "Modifier and Type" + - "" + NL + "Method and Description" + NL + - "" + NL + - "" + NL + - "" + NL + - " void" + NL + - "AnnotationTypeUsage." + - "methodWithParams(int documented," + NL + - " int undocmented)" + "Method parameters in pkg with annotations of type " + + "AnnotationType" + + " " }, {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", - "Constructors in pkg" + - " with annotations of type AnnotationType" + NL + - "" + NL + "Constructor and Description" + - "" + NL + "" + NL + - "" + NL + - "" + - "AnnotationTypeUsage()" + "Constructors in pkg with annotations of type " + + "AnnotationType" + + " " }, {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", - "Constructor parameters in pkg" + - " with annotations of type AnnotationType" + NL + - "" + NL + "Constructor and Description" + - "" + NL + "" + NL + - "" + NL + - "" + - "AnnotationTypeUsage(int documented," + NL + - " int undocmented)" + "Constructor parameters in pkg with annotations of " + + "type AnnotationType " }, //================================= // TYPE PARAMETER IN INDEX //================================= {BUG_ID + FS + "index-all.html", - "method(Vector<Object>)" + "" + + "method(Vector<Object>)" }, //================================= // TYPE PARAMETER IN INDEX //================================= {BUG_ID + FS + "index-all.html", - "method(Vector<Object>)" + "" + + "method(Vector<Object>)" }, }; private static final String[][] NEGATED_TEST = { @@ -637,15 +671,15 @@ // ENUM TESTING //================================= //NO constructor section - {BUG_ID + FS + "pkg" + FS + "Coin.html", "Constructor Summary"}, + {BUG_ID + FS + "pkg" + FS + "Coin.html", "Constructor Summary"}, //================================= // TYPE PARAMETER TESTING //================================= //No type parameters in class frame. {BUG_ID + FS + "allclasses-frame.html", - "" + - "TypeParameters<E>" + "" + + "TypeParameters<E>" }, //============================================================== @@ -654,31 +688,27 @@ //CLASS {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", - "" + NL + - "@AnnotationTypeUndocumented(optional=\"Class Annotation\"," + NL + - " required=1994)" + NL + - "public class AnnotationTypeUsage
    extends java.lang.Object
    "}, + "@AnnotationTypeUndocumented(optional=\"Class Annotation\"," + NL + + " required=1994)" + NL + + "public class AnnotationTypeUsage
    extends java.lang.Object
    "}, //FIELD {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", - "" + NL + - "@AnnotationTypeUndocumented(optional=\"Field Annotation\"," + NL + - " required=1994)" + NL + - "public int field"}, + "@AnnotationTypeUndocumented(optional=\"Field Annotation\"," + NL + + " required=1994)" + NL + + "public int field"}, //CONSTRUCTOR {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", - "" + NL + - "@AnnotationTypeUndocumented(optional=\"Constructor Annotation\"," + NL + - " required=1994)" + NL + - "public AnnotationTypeUsage()"}, + "@AnnotationTypeUndocumented(optional=\"Constructor Annotation\"," + NL + + " required=1994)" + NL + + "public AnnotationTypeUsage()"}, //METHOD {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", - "" + NL + - "@AnnotationTypeUndocumented(optional=\"Method Annotation\"," + NL + - " required=1994)" + NL + - "public void method()"}, + "@AnnotationTypeUndocumented(optional=\"Method Annotation\"," + NL + + " required=1994)" + NL + + "public void method()"}, //================================= // Make sure annotation types do not