stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8248417: some jdk/javadoc/doclet tests fail (JDK 16)

Browse Source 
Reviewed-by: prappo
This commit is contained in:
Jonathan Gibbons 2020-07-02 11:06:16 -07:00
parent 78b9de8e40
commit 579ed70629
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
View File

@ -294,8 +294,9 @@ public class Head extends Content {
private Comment getGeneratedBy(boolean timestamp, Date now) { private Comment getGeneratedBy(boolean timestamp, Date now) {
String text = "Generated by javadoc"; // marker string, deliberately not localized String text = "Generated by javadoc"; // marker string, deliberately not localized
text += " (" + docletVersion.feature() + ")";
if (timestamp) { if (timestamp) {
text += " ("+ docletVersion.feature() + ") on " + now; text += " on " + now;
} }
return new Comment(text); return new Comment(text);
} }

1
test/langtools/ProblemList.txt
View File

@ -26,7 +26,6 @@
########################################################################### ###########################################################################
# #
# javadoc # javadoc
jdk/javadoc/doclet/testHeadTag/TestHeadTag.java 8248417 generic-all
########################################################################### ###########################################################################
# #

4
test/langtools/jdk/javadoc/doclet/testGeneratedBy/TestGeneratedBy.java
View File

@ -80,8 +80,8 @@ public class TestGeneratedBy extends JavadocTester {
void checkTimestamps(boolean timestamp, String... files) { void checkTimestamps(boolean timestamp, String... files) {
String version = System.getProperty("java.specification.version"); String version = System.getProperty("java.specification.version");
String genBy = "Generated by javadoc"; String genBy = "Generated by javadoc (" + version + ")";
if (timestamp) genBy += " (" + version + ") on "; if (timestamp) genBy += " on ";
for (String file: files) { for (String file: files) {
// genBy is the current standard "Generated by" text // genBy is the current standard "Generated by" text

2
test/langtools/jdk/javadoc/doclet/testHeadTag/TestHeadTag.java
View File

@ -44,7 +44,7 @@ import javadoc.tester.JavadocTester;
public class TestHeadTag extends JavadocTester { public class TestHeadTag extends JavadocTester {
final ToolBox tb; 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 { public static void main(String... args) throws Exception {
TestHeadTag tester = new TestHeadTag(); TestHeadTag tester = new TestHeadTag();