infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-16 21:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

8217773: Test langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java fails after JDK-8217034

Browse Source 
Reviewed-by: clanger, hannesw
This commit is contained in:
Jonathan Gibbons 2019-01-29 13:39:40 -08:00
parent 2d9925782f
commit dbc9e5e35c
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java
View File

@ -104,8 +104,8 @@ public class TestLinkOption extends JavadocTester {
"<i>RFC&nbsp;2396: Uniform\n" +
" Resource Identifiers (URI): Generic Syntax</i></a>, " +
"<br><a href=\"http://www.ietf.org/rfc/rfc2732.txt\"><i>RFC&nbsp;2732: Format for\n" +
" Literal IPv6 Addresses in URLs</i></a>, <br><a href=\"URISyntaxException.html\">" +
"URISyntaxException</a></dd>\n" +
" Literal IPv6 Addresses in URLs</i></a>, <br><a href=\"C.html\">" +
"A nearby file</a></dd>\n" +
"</dl>");
checkOutput("mylib/lang/StringBuilderChild.html", true,
@ -115,7 +115,6 @@ public class TestLinkOption extends JavadocTester {
);
String out1_html4 = "out1-html4";
setAutomaticCheckLinks(false); // The example code has toy/bad links
javadoc("-d", out1_html4,
"-source", "8",
"-html4",
@ -135,8 +134,6 @@ public class TestLinkOption extends JavadocTester {
+ "<a href=\"#createTempFile-java.lang.String-java.lang.String-java.io.File-\">"
+ "<code>createTempFile(prefix,&nbsp;suffix,&nbsp;null)</code></a></code>.</div>");
setAutomaticCheckLinks(true); // re-enable checks
// Generate the documentation using -linkoffline and a relative path as the first parameter.
// We will try linking to the docs generated in test 1 with a relative path.
String out2 = "out2";

4
test/langtools/jdk/javadoc/doclet/testLinkOption/pkg/B.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2019, 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
@ -60,7 +60,7 @@ public class B {
* Resource Identifiers (URI): Generic Syntax</i></a>, <br><a
* href="http://www.ietf.org/rfc/rfc2732.txt"><i>RFC&nbsp;2732: Format for
* Literal IPv6 Addresses in URLs</i></a>, <br><a
* href="URISyntaxException.html">URISyntaxException</a>
* href="C.html">A nearby file</a>
*/
public void externalLink() {}
}