From dbc9e5e35c7ef1e7986038d71ad91c22fc24adf9 Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Tue, 29 Jan 2019 13:39:40 -0800
Subject: [PATCH] 8217773: Test
 langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java fails
 after JDK-8217034

Reviewed-by: clanger, hannesw
---
 .../jdk/javadoc/doclet/testLinkOption/TestLinkOption.java  | 7 ++-----
 .../langtools/jdk/javadoc/doclet/testLinkOption/pkg/B.java | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java
index ac8284653fd..fedcb7c85ea 100644
--- a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java
+++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java
@@ -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";
diff --git a/test/langtools/jdk/javadoc/doclet/testLinkOption/pkg/B.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/pkg/B.java
index 141cf936775..2545b0e086b 100644
--- a/test/langtools/jdk/javadoc/doclet/testLinkOption/pkg/B.java
+++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/pkg/B.java
@@ -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() {}
 }