8217773: Test langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java fails after JDK-8217034
Reviewed-by: clanger, hannesw
--- a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java Tue Jan 29 14:09:38 2019 -0500
+++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java Tue Jan 29 13:39:40 2019 -0800
@@ -104,8 +104,8 @@
"<i>RFC 2396: Uniform\n" +
" Resource Identifiers (URI): Generic Syntax</i></a>, " +
"<br><a href=\"http://www.ietf.org/rfc/rfc2732.txt\"><i>RFC 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 @@
);
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 @@
+ "<a href=\"#createTempFile-java.lang.String-java.lang.String-java.io.File-\">"
+ "<code>createTempFile(prefix, suffix, 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";
--- a/test/langtools/jdk/javadoc/doclet/testLinkOption/pkg/B.java Tue Jan 29 14:09:38 2019 -0500
+++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/pkg/B.java Tue Jan 29 13:39:40 2019 -0800
@@ -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 @@
* Resource Identifiers (URI): Generic Syntax</i></a>, <br><a
* href="http://www.ietf.org/rfc/rfc2732.txt"><i>RFC 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() {}
}