changeset 3154:888891807c48

Sync with jdk9/dev: javadoc test cases.
author wmdietl
date Wed, 15 Jan 2014 13:38:15 -0500
parents f51d2e966e3c
children 68a319236079
files test/com/sun/javadoc/AccessH1/AccessH1.java test/com/sun/javadoc/testStylesheet/TestStylesheet.java
diffstat 2 files changed, 16 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/test/com/sun/javadoc/AccessH1/AccessH1.java	Wed Jan 15 13:37:29 2014 -0500
+++ b/test/com/sun/javadoc/AccessH1/AccessH1.java	Wed Jan 15 13:38:15 2014 -0500
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4636667 7052425 8016549
+ * @bug 4636667 7052425
  * @summary  Use <H1, <H2>, and <H3> in proper sequence for accessibility
  * @author dkramer
  * @run main AccessH1
@@ -85,7 +85,7 @@
     private static final String[][] testArray = {
         // Test the style sheet
         {
-            "h1 {" + LS + "    font-size:20px;" + LS +
+            "h1 {" + LS + "    font-size:1.8em;" + LS +
             "}",
             TMPDEST_DIR1 + "stylesheet.css"
         },
--- a/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Wed Jan 15 13:37:29 2014 -0500
+++ b/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Wed Jan 15 13:38:15 2014 -0500
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4494033 7028815 7052425 8007338 8023608 8008164 8016549
+ * @bug      4494033 7028815 7052425 8007338 8023608 8008164
  * @summary  Run tests on doclet stylesheet.
  * @author   jamieh
  * @library  ../lib/
@@ -54,8 +54,8 @@
         {BUG_ID + FS + "stylesheet.css",
             "body {" + NL + "    background-color:#ffffff;" + NL +
             "    color:#353833;" + NL +
-            "    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;" + NL +
-            "    font-size:14px;" + NL + "    margin:0;" + 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 + "}"},
         {BUG_ID + FS + "stylesheet.css",
@@ -64,65 +64,49 @@
             "    position:relative;" + NL +
             "    text-align:left;" + NL +
             "    background-repeat:no-repeat;" + NL +
-            "    color:#253441;" + NL +
+            "    color:#FFFFFF;" + NL +
             "    font-weight:bold;" + NL +
             "    clear:none;" + NL +
             "    overflow:hidden;" + NL +
             "    padding:0px;" + NL +
-            "    padding-top:10px;" + NL +
-            "    padding-left:1px;" + NL +
             "    margin:0px;" + NL +
-            "    white-space:pre;" + NL +
             "}"},
         {BUG_ID + FS + "stylesheet.css",
             ".overviewSummary caption span, .memberSummary caption span, .typeSummary caption span," + NL +
             ".useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {" + NL +
             "    white-space:nowrap;" + NL +
-            "    padding-top:5px;" + NL +
-            "    padding-left:12px;" + NL +
-            "    padding-right:12px;" + NL +
-            "    padding-bottom:7px;" + NL +
+            "    padding-top:8px;" + NL +
+            "    padding-left:8px;" + NL +
             "    display:inline-block;" + NL +
             "    float:left;" + NL +
-            "    background-color:#F8981D;" + NL +
-            "    border: none;" + NL +
-            "    height:16px;" + NL +
+            "    background-image:url(resources/titlebar.gif);" + NL +
             "}"},
         {BUG_ID + FS + "stylesheet.css",
             ".memberSummary caption span.activeTableTab span {" + NL +
             "    white-space:nowrap;" + NL +
-            "    padding-top:5px;" + NL +
-            "    padding-left:12px;" + NL +
-            "    padding-right:12px;" + NL +
-            "    margin-right:3px;" + NL +
+            "    padding-top:8px;" + NL +
+            "    padding-left:8px;" + NL +
             "    display:inline-block;" + NL +
             "    float:left;" + NL +
-            "    background-color:#F8981D;" + NL +
-            "    height:16px;" + NL +
+            "    background-image:url(resources/activetitlebar.gif);" + NL +
             "}"},
         {BUG_ID + FS + "stylesheet.css",
             ".memberSummary caption span.tableTab span {" + NL +
             "    white-space:nowrap;" + NL +
-            "    padding-top:5px;" + NL +
-            "    padding-left:12px;" + NL +
-            "    padding-right:12px;" + NL +
-            "    margin-right:3px;" + NL +
+            "    padding-top:8px;" + NL +
+            "    padding-left:8px;" + NL +
             "    display:inline-block;" + NL +
             "    float:left;" + NL +
-            "    background-color:#4D7A97;" + NL +
-            "    height:16px;" + NL +
+            "    background-image:url(resources/titlebar.gif);" + NL +
             "}"},
         {BUG_ID + FS + "stylesheet.css",
             ".memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {" + NL +
             "    padding-top:0px;" + NL +
             "    padding-left:0px;" + NL +
-            "    padding-right:0px;" + NL +
             "    background-image:none;" + NL +
             "    float:none;" + NL +
-            "    display:inline;" + NL +
+            "    display:inline-block;" + NL +
             "}"},
-        {BUG_ID + FS + "stylesheet.css",
-            "@import url('resources/fonts/dejavu.css');"},
         // Test whether a link to the stylesheet file is inserted properly
         // in the class documentation.
         {BUG_ID + FS + "pkg" + FS + "A.html",