changeset 60030:c9b250b081f5

8248417: some jdk/javadoc/doclet tests fail (JDK 16) Reviewed-by: prappo
author jjg
date Thu, 02 Jul 2020 11:06:16 -0700
parents b67eff87a04e
children 4d1c4400c75d
files src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java test/langtools/ProblemList.txt test/langtools/jdk/javadoc/doclet/testGeneratedBy/TestGeneratedBy.java test/langtools/jdk/javadoc/doclet/testHeadTag/TestHeadTag.java
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java	Thu Jul 02 20:33:06 2020 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java	Thu Jul 02 11:06:16 2020 -0700
@@ -294,8 +294,9 @@
 
     private Comment getGeneratedBy(boolean timestamp, Date now) {
         String text = "Generated by javadoc"; // marker string, deliberately not localized
+        text += " (" + docletVersion.feature() + ")";
         if (timestamp) {
-            text += " ("+ docletVersion.feature() + ") on " + now;
+            text += " on " + now;
         }
         return new Comment(text);
     }
--- a/test/langtools/ProblemList.txt	Thu Jul 02 20:33:06 2020 +0300
+++ b/test/langtools/ProblemList.txt	Thu Jul 02 11:06:16 2020 -0700
@@ -26,7 +26,6 @@
 ###########################################################################
 #
 # javadoc
-jdk/javadoc/doclet/testHeadTag/TestHeadTag.java	                                8248417    generic-all  
 
 ###########################################################################
 #
--- a/test/langtools/jdk/javadoc/doclet/testGeneratedBy/TestGeneratedBy.java	Thu Jul 02 20:33:06 2020 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testGeneratedBy/TestGeneratedBy.java	Thu Jul 02 11:06:16 2020 -0700
@@ -80,8 +80,8 @@
 
     void checkTimestamps(boolean timestamp, String... files) {
         String version = System.getProperty("java.specification.version");
-        String genBy = "Generated by javadoc";
-        if (timestamp) genBy += " (" + version + ") on ";
+        String genBy = "Generated by javadoc (" + version + ")";
+        if (timestamp) genBy += " on ";
 
         for (String file: files) {
             // genBy is the current standard "Generated by" text
--- a/test/langtools/jdk/javadoc/doclet/testHeadTag/TestHeadTag.java	Thu Jul 02 20:33:06 2020 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testHeadTag/TestHeadTag.java	Thu Jul 02 11:06:16 2020 -0700
@@ -44,7 +44,7 @@
 public class TestHeadTag extends JavadocTester {
 
     final ToolBox tb;
-    final String version = System.getProperty("java.version");
+    final String version = System.getProperty("java.specification.version");
 
     public static void main(String... args) throws Exception {
         TestHeadTag tester = new TestHeadTag();