Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java	Wed Sep 18 14:39:27 2013 +0200
     1.2 +++ b/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java	Wed Sep 18 17:13:26 2013 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -23,20 +23,19 @@
    1.11  
    1.12  /*
    1.13   * @test
    1.14 - * @bug      4973609
    1.15 + * @bug      4973609 8015249
    1.16   * @summary  Make sure that annotation types with 0 members does not have
    1.17   *           extra HR tags.
    1.18   * @author   jamieh
    1.19   * @library  ../lib/
    1.20 - * @build    JavadocTester
    1.21 - * @build    TestAnnotationTypes
    1.22 + * @build    JavadocTester TestAnnotationTypes
    1.23   * @run main TestAnnotationTypes
    1.24   */
    1.25  
    1.26  public class TestAnnotationTypes extends JavadocTester {
    1.27  
    1.28      //Test information.
    1.29 -    private static final String BUG_ID = "4973609";
    1.30 +    private static final String BUG_ID = "4973609-8015249";
    1.31  
    1.32      //Javadoc arguments.
    1.33      private static final String[] ARGS = new String[] {
    1.34 @@ -44,7 +43,31 @@
    1.35      };
    1.36  
    1.37      //Input for string search tests.
    1.38 -    private static final String[][] TEST = NO_TEST;
    1.39 +    private static final String[][] TEST = {
    1.40 +        {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
    1.41 +            "<li>Summary:&nbsp;</li>" + NL + "<li><a href=\"#annotation_type_" +
    1.42 +            "field_summary\">Field</a>&nbsp;|&nbsp;</li>"},
    1.43 +        {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
    1.44 +            "<li>Detail:&nbsp;</li>" + NL + "<li><a href=\"#annotation_type_" +
    1.45 +            "field_detail\">Field</a>&nbsp;|&nbsp;</li>"},
    1.46 +        {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
    1.47 +            "<!-- =========== ANNOTATION TYPE FIELD SUMMARY =========== -->"},
    1.48 +        {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
    1.49 +            "<h3>Field Summary</h3>"},
    1.50 +        {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
    1.51 +            "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../" +
    1.52 +            "pkg/AnnotationTypeField.html#DEFAULT_NAME\">DEFAULT_NAME</a></span>" +
    1.53 +            "</code>&nbsp;</td>"},
    1.54 +        {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
    1.55 +            "<!-- ============ ANNOTATION TYPE FIELD DETAIL =========== -->"},
    1.56 +        {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
    1.57 +            "<h4>DEFAULT_NAME</h4>" + NL + "<pre>public static final&nbsp;java." +
    1.58 +            "lang.String&nbsp;DEFAULT_NAME</pre>"},
    1.59 +        {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
    1.60 +            "<li>Summary:&nbsp;</li>" + NL + "<li>Field&nbsp;|&nbsp;</li>"},
    1.61 +        {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
    1.62 +            "<li>Detail:&nbsp;</li>" + NL + "<li>Field&nbsp;|&nbsp;</li>"},
    1.63 +    };
    1.64      private static final String[][] NEGATED_TEST = {
    1.65          {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
    1.66              "<HR>" + NL + NL + "<P>" + NL + NL + "<P>" +