diff -r 3b2e10524627 -r 4fe5aab73bb2 test/com/sun/javadoc/testStylesheet/TestStylesheet.java --- a/test/com/sun/javadoc/testStylesheet/TestStylesheet.java Wed Jun 26 18:03:58 2013 -0700 +++ b/test/com/sun/javadoc/testStylesheet/TestStylesheet.java Wed Jun 26 20:38:21 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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,7 +23,7 @@ /* * @test - * @bug 4494033 7028815 7052425 + * @bug 4494033 7028815 7052425 8007338 * @summary Run tests on doclet stylesheet. * @author jamieh * @library ../lib/ @@ -34,7 +34,7 @@ public class TestStylesheet extends JavadocTester { //Test information. - private static final String BUG_ID = "4494033-7028815-7052425"; + private static final String BUG_ID = "4494033-7028815-7052425-8007338"; //Javadoc arguments. private static final String[] ARGS = new String[] { @@ -44,29 +44,45 @@ //Input for string search tests. private static final String[][] TEST = { {BUG_ID + FS + "stylesheet.css", - "/* Javadoc style sheet */"}, + "/* Javadoc style sheet */"}, {BUG_ID + FS + "stylesheet.css", - "/*" + NL + "Overall document style" + NL + "*/"}, + "/*" + NL + "Overall document style" + NL + "*/"}, {BUG_ID + FS + "stylesheet.css", - "/*" + NL + "Heading styles" + NL + "*/"}, + "/*" + NL + "Heading styles" + NL + "*/"}, {BUG_ID + FS + "stylesheet.css", - "/*" + NL + "Navigation bar styles" + NL + "*/"}, + "/*" + NL + "Navigation bar styles" + NL + "*/"}, {BUG_ID + FS + "stylesheet.css", - "body {" + NL + " background-color:#ffffff;" + NL + - " color:#353833;" + NL + - " font-family:Arial, Helvetica, sans-serif;" + NL + - " font-size:76%;" + NL + " margin:0;" + NL + "}"}, + "body {" + NL + " background-color:#ffffff;" + NL + + " color:#353833;" + NL + + " font-family:Arial, Helvetica, sans-serif;" + NL + + " font-size:76%;" + NL + " margin:0;" + NL + "}"}, {BUG_ID + FS + "stylesheet.css", - "ul {" + NL + " list-style-type:disc;" + NL + "}"}, + "ul {" + NL + " list-style-type:disc;" + NL + "}"}, + {BUG_ID + FS + "stylesheet.css", + ".overviewSummary caption, .packageSummary caption, " + + ".contentContainer ul.blockList li.blockList caption, " + + ".summary caption, .classUseContainer caption, " + + ".constantValuesContainer caption {" + NL + + " position:relative;" + NL + + " text-align:left;" + NL + + " background-repeat:no-repeat;" + NL + + " color:#FFFFFF;" + NL + + " font-weight:bold;" + NL + + " clear:none;" + NL + + " overflow:hidden;" + NL + + " padding:0px;" + NL + + " margin:0px;" + NL + + " white-space:pre;" + NL + + "}"}, // Test whether a link to the stylesheet file is inserted properly // in the class documentation. {BUG_ID + FS + "pkg" + FS + "A.html", - ""} + ""} }; private static final String[][] NEGATED_TEST = { {BUG_ID + FS + "stylesheet.css", - "* {" + NL + " margin:0;" + NL + " padding:0;" + NL + "}"} + "* {" + NL + " margin:0;" + NL + " padding:0;" + NL + "}"} }; /**