diff -r ac6ec071c2b2 -r a2a5ad0853ed test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java --- a/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java Wed Sep 18 14:39:27 2013 +0200 +++ b/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java Wed Sep 18 17:13:26 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, 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 @@ -23,20 +23,19 @@ /* * @test - * @bug 4973609 + * @bug 4973609 8015249 * @summary Make sure that annotation types with 0 members does not have * extra HR tags. * @author jamieh * @library ../lib/ - * @build JavadocTester - * @build TestAnnotationTypes + * @build JavadocTester TestAnnotationTypes * @run main TestAnnotationTypes */ public class TestAnnotationTypes extends JavadocTester { //Test information. - private static final String BUG_ID = "4973609"; + private static final String BUG_ID = "4973609-8015249"; //Javadoc arguments. private static final String[] ARGS = new String[] { @@ -44,7 +43,31 @@ }; //Input for string search tests. - private static final String[][] TEST = NO_TEST; + private static final String[][] TEST = { + {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html", + "
DEFAULT_NAME" +
+ "
public static final java." + + "lang.String DEFAULT_NAME"}, + {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", + "
" + NL + NL + "
" +