test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java
--- a/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java Tue Jan 29 15:19:43 2019 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java Wed Jan 30 16:39:26 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -105,51 +105,4 @@
+ ",java.time.chrono.ChronoLocalDate)\">between</a></code>"
);
}
-
- @Test
- public void test_html4() {
- javadoc("-d", "out-html4",
- "-html4",
- "-sourcepath", testSrc,
- "pkg", "diamond", "inheritDist", "pkg1");
- checkExit(Exit.OK);
-
- checkOutput("pkg/SubClass.html", true,
- // Public method should be inherited
- "<a href=\"BaseClass.html#pubMethod--\">",
- // Protected method should be inherited
- "<a href=\"BaseClass.html#proMethod--\">");
-
- checkOutput("pkg/BaseClass.html", true,
- // Test overriding/implementing methods with generic parameters.
- "<dl>\n"
- + "<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n"
- + "<dd><code><a href=\"BaseInterface.html#getAnnotation-java.lang.Class-\">"
- + "getAnnotation</a></code> in interface <code>"
- + "<a href=\"BaseInterface.html\" title=\"interface in pkg\">"
- + "BaseInterface</a></code></dd>\n"
- + "</dl>");
-
- checkOutput("diamond/Z.html", true,
- // Test diamond inheritance member summary (6256068)
- "<code><a href=\"A.html#aMethod--\">aMethod</a></code>");
-
- checkOutput("pkg/SubClass.html", false,
- "<a href=\"BaseClass.html#staticMethod--\">staticMethod</a></code>");
-
- checkOutput("pkg1/Implementer.html", true,
- // ensure the method makes it
- "<td class=\"colFirst\"><code>static java.time.Period</code></td>\n"
- + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
- + "<a href=\"#between-java.time.LocalDate-java.time.LocalDate-\">"
- + "between</a></span>​(java.time.LocalDate startDateInclusive,\n"
- + " java.time.LocalDate endDateExclusive)</code></th>");
-
- checkOutput("pkg1/Implementer.html", false,
- "<h3>Methods inherited from interface pkg1.<a href=\"Interface.html\""
- + " title=\"interface in pkg1\">Interface</a></h3>\n"
- + "<code><a href=\"Interface.html#between-java.time.chrono.ChronoLocalDate"
- + "-java.time.chrono.ChronoLocalDate-\">between</a></code>"
- );
- }
}