--- a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java Mon Jan 22 20:31:19 2018 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java Mon Jan 22 11:15:51 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -67,20 +67,20 @@
// Make sure enum signature is correct.
"<pre>public enum "
+ "<span class=\"typeNameLabel\">Coin</span>\n"
- + "extends java.lang.Enum<<a href=\"../pkg/Coin.html\" "
+ + "extends java.lang.Enum<<a href=\"Coin.html\" "
+ "title=\"enum in pkg\">Coin</a>></pre>",
// Check for enum constant section
"<caption><span>Enum Constants"
+ "</span><span class=\"tabEnd\"> </span></caption>",
// Detail for enum constant
- "<span class=\"memberNameLink\"><a href=\"../pkg/Coin.html#Dime\">Dime</a></span>",
+ "<span class=\"memberNameLink\"><a href=\"#Dime\">Dime</a></span>",
// Automatically insert documentation for values() and valueOf().
"Returns an array containing the constants of this enum type,",
"Returns the enum constant of this type with the specified name",
"for (Coin c : Coin.values())",
"Overloaded valueOf() method has correct documentation.",
"Overloaded values method has correct documentation.",
- "<pre>public static <a href=\"../pkg/Coin.html\" title=\"enum in pkg\">Coin</a>" +
+ "<pre>public static <a href=\"Coin.html\" title=\"enum in pkg\">Coin</a>" +
" valueOf​(java.lang.String name)</pre>\n" +
"<div class=\"block\">Returns the enum constant of this type with the specified name.\n" +
"The string must match <i>exactly</i> an identifier used to declare an\n" +
@@ -117,11 +117,11 @@
"<dl>\n"
+ "<dt><span class=\"seeLabel\">See Also:</span></dt>\n"
+ "<dd>"
- + "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">"
+ + "<a href=\"TypeParameters.html\" title=\"class in pkg\">"
+ "<code>TypeParameters</code></a></dd>\n"
+ "</dl>",
// Method that uses class type parameter.
- "(<a href=\"../pkg/TypeParameters.html\" title=\"type "
+ "(<a href=\"TypeParameters.html\" title=\"type "
+ "parameter in TypeParameters\">E</a> param)",
// Method type parameter section.
"<span class=\"paramLabel\">Type Parameters:</span></dt>\n"
@@ -133,38 +133,38 @@
"public <T extends java.util.List,V> "
+ "java.lang.String[] methodThatHasTypeParameters",
// Method that returns TypeParameters
- "<td class=\"colFirst\"><code><a href=\"../pkg/TypeParameters.html\" "
+ "<td class=\"colFirst\"><code><a href=\"TypeParameters.html\" "
+ "title=\"type parameter in TypeParameters\">E</a>[]</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
- + "<a href=\"../pkg/TypeParameters.html#methodThatReturnsTypeParameterA-E:A-\">"
- + "methodThatReturnsTypeParameterA</a></span>​(<a href=\"../pkg/TypeParameters.html\" "
+ + "<a href=\"#methodThatReturnsTypeParameterA-E:A-\">"
+ + "methodThatReturnsTypeParameterA</a></span>​(<a href=\"TypeParameters.html\" "
+ "title=\"type parameter in TypeParameters\">E</a>[] e)</code>",
- "<pre>public <a href=\"../pkg/TypeParameters.html\" "
+ "<pre>public <a href=\"TypeParameters.html\" "
+ "title=\"type parameter in TypeParameters\">E</a>[] "
- + "methodThatReturnsTypeParameterA​(<a href=\"../pkg/TypeParameters.html\" "
+ + "methodThatReturnsTypeParameterA​(<a href=\"TypeParameters.html\" "
+ "title=\"type parameter in TypeParameters\">E</a>[] e)</pre>\n",
"<td class=\"colFirst\"><code><T extends java.lang.Object & java.lang.Comparable<? super T>>"
+ "<br>T</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
- + "<a href=\"../pkg/TypeParameters.html#methodtThatReturnsTypeParametersB-java.util.Collection-\">"
+ + "<a href=\"#methodtThatReturnsTypeParametersB-java.util.Collection-\">"
+ "methodtThatReturnsTypeParametersB</a></span>​(java.util.Collection<? extends T> coll)</code>",
"<div class=\"block\">Returns TypeParameters</div>\n",
// Method takes a TypeVariable
"<td class=\"colFirst\"><code><X extends java.lang.Throwable><br>"
- + "<a href=\"../pkg/TypeParameters.html\" title=\"type parameter in TypeParameters\">E</a>"
+ + "<a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">E</a>"
+ "</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
- + "<a href=\"../pkg/TypeParameters.html#orElseThrow-java.util.function.Supplier-\">"
+ + "<a href=\"#orElseThrow-java.util.function.Supplier-\">"
+ "orElseThrow</a></span>​(java.util.function.Supplier<? extends X> exceptionSupplier)</code>"
);
checkOutput("pkg/Wildcards.html", true,
// Wildcard testing.
- "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">"
+ "<a href=\"TypeParameters.html\" title=\"class in pkg\">"
+ "TypeParameters</a><? super java.lang.String> a",
- "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">"
+ "<a href=\"TypeParameters.html\" title=\"class in pkg\">"
+ "TypeParameters</a><? extends java.lang.StringBuffer> b",
- "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">"
+ "<a href=\"TypeParameters.html\" title=\"class in pkg\">"
+ "TypeParameters</a> c");
checkOutput(Output.OUT, true,
@@ -179,7 +179,7 @@
"<pre>public class <span class=\"typeNameLabel\">TypeParameterSubClass<T extends "
+ "java.lang.String></span>\n"
+ "extends "
- + "<a href=\"../pkg/TypeParameterSuperClass.html\" title=\"class in pkg\">"
+ + "<a href=\"TypeParameterSuperClass.html\" title=\"class in pkg\">"
+ "TypeParameterSuperClass</a><T></pre>");
// Interface generic parameter substitution
@@ -187,21 +187,21 @@
checkOutput("pkg/TypeParameters.html", true,
"<dl>\n"
+ "<dt>All Implemented Interfaces:</dt>\n"
- + "<dd><code><a href=\"../pkg/SubInterface.html\" title=\"interface in pkg\">"
- + "SubInterface</a><E></code>, <code><a href=\"../pkg/SuperInterface.html\" "
+ + "<dd><code><a href=\"SubInterface.html\" title=\"interface in pkg\">"
+ + "SubInterface</a><E></code>, <code><a href=\"SuperInterface.html\" "
+ "title=\"interface in pkg\">SuperInterface</a><E></code></dd>\n"
+ "</dl>");
checkOutput("pkg/SuperInterface.html", true,
"<dl>\n"
+ "<dt>All Known Subinterfaces:</dt>\n"
- + "<dd><code><a href=\"../pkg/SubInterface.html\" title=\"interface in pkg\">"
+ + "<dd><code><a href=\"SubInterface.html\" title=\"interface in pkg\">"
+ "SubInterface</a><V></code></dd>\n"
+ "</dl>");
checkOutput("pkg/SubInterface.html", true,
"<dl>\n"
+ "<dt>All Superinterfaces:</dt>\n"
- + "<dd><code><a href=\"../pkg/SuperInterface.html\" title=\"interface in pkg\">"
+ + "<dd><code><a href=\"SuperInterface.html\" title=\"interface in pkg\">"
+ "SuperInterface</a><V></code></dd>\n"
+ "</dl>");
@@ -216,212 +216,212 @@
//==============================================================
// ClassUseTest1: <T extends Foo & Foo2>
checkOutput("pkg2/class-use/Foo.html", true,
- "<caption><span>Classes in <a href=\"../../pkg2/"
+ "<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
- + "type <a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">"
+ + "type <a href=\"../Foo.html\" title=\"class in pkg2\">"
+ "Foo</a></span><span class=\"tabEnd\"> </span></caption>",
- "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest1.html\" "
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest1.html\" "
+ "title=\"class in pkg2\">ClassUseTest1</a><T extends "
- + "<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo"
- + "</a> & <a href=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">"
+ + "<a href=\"../Foo.html\" title=\"class in pkg2\">Foo"
+ + "</a> & <a href=\"../Foo2.html\" title=\"interface in pkg2\">"
+ "Foo2</a>></span></code></th>",
- "<caption><span>Methods in <a href=\"../../pkg2/"
+ "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
- + "type <a href=\"../../pkg2/Foo.html\" title=\"class in "
+ + "type <a href=\"../Foo.html\" title=\"class in "
+ "pkg2\">Foo</a></span><span class=\"tabEnd\"> </span></caption>",
"<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">ClassUseTest1."
- + "</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/"
+ + "</span><code><span class=\"memberNameLink\"><a href=\"../"
+ "ClassUseTest1.html#method-T-\">method</a></span>"
+ "​(T t)</code></th>",
- "<caption><span>Fields in <a href=\"../../pkg2/"
+ "<caption><span>Fields in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
- + "type <a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">"
+ + "type <a href=\"../Foo.html\" title=\"class in pkg2\">"
+ "Foo</a></span><span class=\"tabEnd\"> </span></caption>",
- "td class=\"colFirst\"><code><a href=\"../../pkg2/"
+ "td class=\"colFirst\"><code><a href=\"../"
+ "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>"
- + "<<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\""
+ + "<<a href=\"../Foo.html\" title=\"class in pkg2\""
+ ">Foo</a>></code></td>"
);
checkOutput("pkg2/class-use/ParamTest.html", true,
- "<caption><span>Fields in <a href=\"../../pkg2/"
+ "<caption><span>Fields in <a href=\"../"
+ "package-summary.html\">pkg2</a> declared as <a href=\"../"
- + "../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest"
+ + "ParamTest.html\" title=\"class in pkg2\">ParamTest"
+ "</a></span><span class=\"tabEnd\"> </span></caption>",
- "<td class=\"colFirst\"><code><a href=\"../../pkg2/"
+ "<td class=\"colFirst\"><code><a href=\"../"
+ "ParamTest.html\" title=\"class in pkg2\">ParamTest</a><<a "
- + "href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo</a"
+ + "href=\"../Foo.html\" title=\"class in pkg2\">Foo</a"
+ ">></code></td>"
);
checkOutput("pkg2/class-use/Foo2.html", true,
- "<caption><span>Classes in <a href=\"../../pkg2/"
+ "<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
- + "type <a href=\"../../pkg2/Foo2.html\" title=\"interface "
+ + "type <a href=\"../Foo2.html\" title=\"interface "
+ "in pkg2\">Foo2</a></span><span class=\"tabEnd\"> "
+ "</span></caption>",
- "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest1.html\" "
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest1.html\" "
+ "title=\"class in pkg2\">ClassUseTest1</a><T extends "
- + "<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo"
- + "</a> & <a href=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">"
+ + "<a href=\"../Foo.html\" title=\"class in pkg2\">Foo"
+ + "</a> & <a href=\"../Foo2.html\" title=\"interface in pkg2\">"
+ "Foo2</a>></span></code></th>",
- "<caption><span>Methods in <a href=\"../../pkg2/"
+ "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
- + "type <a href=\"../../pkg2/Foo2.html\" title=\"interface "
+ + "type <a href=\"../Foo2.html\" title=\"interface "
+ "in pkg2\">Foo2</a></span><span class=\"tabEnd\"> "
+ "</span></caption>",
"<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">"
- + "ClassUseTest1.</span><code><span class=\"memberNameLink\"><a href=\"../../"
- + "pkg2/ClassUseTest1.html#method-T-\">method</a></span>"
+ + "ClassUseTest1.</span><code><span class=\"memberNameLink\"><a href=\"../"
+ + "ClassUseTest1.html#method-T-\">method</a></span>"
+ "​(T t)</code></th>"
);
// ClassUseTest2: <T extends ParamTest<Foo3>>
checkOutput("pkg2/class-use/ParamTest.html", true,
- "<caption><span>Classes in <a href=\"../../pkg2/"
+ "<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
- + "type <a href=\"../../pkg2/ParamTest.html\" title=\"class "
+ + "type <a href=\"../ParamTest.html\" title=\"class "
+ "in pkg2\">ParamTest</a></span><span class=\"tabEnd\">"
+ " </span></caption>",
- "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest2.html\" "
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest2.html\" "
+ "title=\"class in pkg2\">ClassUseTest2</a><T extends "
- + "<a href=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">"
- + "ParamTest</a><<a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">"
+ + "<a href=\"../ParamTest.html\" title=\"class in pkg2\">"
+ + "ParamTest</a><<a href=\"../Foo3.html\" title=\"class in pkg2\">"
+ "Foo3</a>>></span></code></th>",
- "<caption><span>Methods in <a href=\"../../pkg2/"
+ "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
- + "type <a href=\"../../pkg2/ParamTest.html\" title=\"class "
+ + "type <a href=\"../ParamTest.html\" title=\"class "
+ "in pkg2\">ParamTest</a></span><span class=\"tabEnd\">"
+ " </span></caption>",
"<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">ClassUseTest2."
- + "</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/"
+ + "</span><code><span class=\"memberNameLink\"><a href=\"../"
+ "ClassUseTest2.html#method-T-\">method</a></span>"
+ "​(T t)</code></th>",
- "<caption><span>Fields in <a href=\"../../pkg2/"
+ "<caption><span>Fields in <a href=\"../"
+ "package-summary.html\">pkg2</a> declared as <a href=\"../"
- + "../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest"
+ + "ParamTest.html\" title=\"class in pkg2\">ParamTest"
+ "</a></span><span class=\"tabEnd\"> </span></caption>",
- "<td class=\"colFirst\"><code><a href=\"../../pkg2/"
+ "<td class=\"colFirst\"><code><a href=\"../"
+ "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>"
- + "<<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">"
+ + "<<a href=\"../Foo.html\" title=\"class in pkg2\">"
+ "Foo</a>></code></td>",
- "<caption><span>Methods in <a href=\"../../pkg2/"
+ "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
- + "type <a href=\"../../pkg2/ParamTest.html\" title=\"class "
+ + "type <a href=\"../ParamTest.html\" title=\"class "
+ "in pkg2\">ParamTest</a></span><span class=\"tabEnd\">"
+ " </span></caption>",
"<td class=\"colFirst\"><code><T extends <a href=\"../"
- + "../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest"
- + "</a><<a href=\"../../pkg2/Foo3.html\" title=\"class in "
- + "pkg2\">Foo3</a>>><br><a href=\"../../pkg2/"
+ + "ParamTest.html\" title=\"class in pkg2\">ParamTest"
+ + "</a><<a href=\"../Foo3.html\" title=\"class in "
+ + "pkg2\">Foo3</a>>><br><a href=\"../"
+ "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>"
- + "<<a href=\"../../pkg2/Foo3.html\" title=\"class in "
+ + "<<a href=\"../Foo3.html\" title=\"class in "
+ "pkg2\">Foo3</a>></code></td>"
);
checkOutput("pkg2/class-use/Foo3.html", true,
- "<caption><span>Classes in <a href=\"../../pkg2/"
+ "<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
- + "type <a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">"
+ + "type <a href=\"../Foo3.html\" title=\"class in pkg2\">"
+ "Foo3</a></span><span class=\"tabEnd\"> </span></caption>",
- "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest2.html\" "
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest2.html\" "
+ "title=\"class in pkg2\">ClassUseTest2</a><T extends "
- + "<a href=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">"
- + "ParamTest</a><<a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">"
+ + "<a href=\"../ParamTest.html\" title=\"class in pkg2\">"
+ + "ParamTest</a><<a href=\"../Foo3.html\" title=\"class in pkg2\">"
+ "Foo3</a>>></span></code></th>",
- "<caption><span>Methods in <a href=\"../../pkg2/"
+ "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
- + "type <a href=\"../../pkg2/Foo3.html\" title=\"class in "
+ + "type <a href=\"../Foo3.html\" title=\"class in "
+ "pkg2\">Foo3</a></span><span class=\"tabEnd\"> "
+ "</span></caption>",
"<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">ClassUseTest2."
- + "</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/"
+ + "</span><code><span class=\"memberNameLink\"><a href=\"../"
+ "ClassUseTest2.html#method-T-\">method</a></span>"
+ "​(T t)</code></th>",
- "<caption><span>Methods in <a href=\"../../pkg2/"
+ "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> that return types with "
- + "arguments of type <a href=\"../../pkg2/Foo3.html\" title"
+ + "arguments of type <a href=\"../Foo3.html\" title"
+ "=\"class in pkg2\">Foo3</a></span><span class=\"tabEnd\">"
+ " </span></caption>",
- "<td class=\"colFirst\"><code><T extends <a href=\"../../"
- + "pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</a><"
- + "<a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3"
- + "</a>>><br><a href=\"../../pkg2/ParamTest.html\" "
- + "title=\"class in pkg2\">ParamTest</a><<a href=\"../../pkg2/"
+ "<td class=\"colFirst\"><code><T extends <a href=\"../"
+ + "ParamTest.html\" title=\"class in pkg2\">ParamTest</a><"
+ + "<a href=\"../Foo3.html\" title=\"class in pkg2\">Foo3"
+ + "</a>>><br><a href=\"../ParamTest.html\" "
+ + "title=\"class in pkg2\">ParamTest</a><<a href=\"../"
+ "Foo3.html\" title=\"class in pkg2\">Foo3</a>></code></td>"
);
// ClassUseTest3: <T extends ParamTest2<List<? extends Foo4>>>
checkOutput("pkg2/class-use/ParamTest2.html", true,
- "<caption><span>Classes in <a href=\"../../pkg2/"
+ "<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
- + "type <a href=\"../../pkg2/ParamTest2.html\" title=\"class "
+ + "type <a href=\"../ParamTest2.html\" title=\"class "
+ "in pkg2\">ParamTest2</a></span><span class=\"tabEnd\">"
+ " </span></caption>",
- "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3.html\" "
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest3.html\" "
+ "title=\"class in pkg2\">ClassUseTest3</a><T extends "
- + "<a href=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">"
+ + "<a href=\"../ParamTest2.html\" title=\"class in pkg2\">"
+ "ParamTest2</a><java.util.List<? extends "
- + "<a href=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">"
+ + "<a href=\"../Foo4.html\" title=\"class in pkg2\">"
+ "Foo4</a>>>></span></code></th>",
- "<caption><span>Methods in <a href=\"../../pkg2/"
+ "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
- + "type <a href=\"../../pkg2/ParamTest2.html\" title=\"class "
+ + "type <a href=\"../ParamTest2.html\" title=\"class "
+ "in pkg2\">ParamTest2</a></span><span class=\"tabEnd\">"
+ " </span></caption>",
"<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">ClassUseTest3"
- + ".</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3."
+ + ".</span><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest3."
+ "html#method-T-\">method</a></span>​(T t)</code></th>",
"<td class=\"colFirst\"><code><T extends <a href=\"../"
- + "../pkg2/ParamTest2.html\" title=\"class in pkg2\">"
+ + "ParamTest2.html\" title=\"class in pkg2\">"
+ "ParamTest2</a><java.util.List<? extends <a href=\".."
- + "/../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</a>>"
- + ">><br><a href=\"../../pkg2/ParamTest2.html\" "
+ + "/Foo4.html\" title=\"class in pkg2\">Foo4</a>>"
+ + ">><br><a href=\"../ParamTest2.html\" "
+ "title=\"class in pkg2\">ParamTest2</a><java.util.List"
- + "<? extends <a href=\"../../pkg2/Foo4.html\" title=\""
+ + "<? extends <a href=\"../Foo4.html\" title=\""
+ "class in pkg2\">Foo4</a>>></code></td>"
);
checkOutput("pkg2/class-use/Foo4.html", true,
- "<caption><span>Classes in <a href=\"../../pkg2/"
+ "<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
- + "type <a href=\"../../pkg2/Foo4.html\" title=\"class in "
+ + "type <a href=\"../Foo4.html\" title=\"class in "
+ "pkg2\">Foo4</a></span><span class=\"tabEnd\"> "
+ "</span></caption>",
- "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3.html\" "
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest3.html\" "
+ "title=\"class in pkg2\">ClassUseTest3</a><T extends "
- + "<a href=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">"
+ + "<a href=\"../ParamTest2.html\" title=\"class in pkg2\">"
+ "ParamTest2</a><java.util.List<? extends "
- + "<a href=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">"
+ + "<a href=\"../Foo4.html\" title=\"class in pkg2\">"
+ "Foo4</a>>>></span></code></th>",
- "<caption><span>Methods in <a href=\"../../pkg2/"
+ "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
- + "type <a href=\"../../pkg2/Foo4.html\" title=\"class in "
+ + "type <a href=\"../Foo4.html\" title=\"class in "
+ "pkg2\">Foo4</a></span><span class=\"tabEnd\"> </span></caption>",
"<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">ClassUseTest3."
- + "</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3."
+ + "</span><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest3."
+ "html#method-T-\">method</a></span>​(T t)</code>"
+ "</th>",
- "<caption><span>Methods in <a href=\"../../pkg2/"
+ "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> that return types with "
- + "arguments of type <a href=\"../../pkg2/Foo4.html\" "
+ + "arguments of type <a href=\"../Foo4.html\" "
+ "title=\"class in pkg2\">Foo4</a></span><span class=\""
+ "tabEnd\"> </span></caption>",
"<td class=\"colFirst\"><code><T extends <a href=\"../"
- + "../pkg2/ParamTest2.html\" title=\"class in pkg2\">"
+ + "ParamTest2.html\" title=\"class in pkg2\">"
+ "ParamTest2</a><java.util.List<? extends <a href=\".."
- + "/../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</a>>"
- + ">><br><a href=\"../../pkg2/ParamTest2.html\" "
+ + "/Foo4.html\" title=\"class in pkg2\">Foo4</a>>"
+ + ">><br><a href=\"../ParamTest2.html\" "
+ "title=\"class in pkg2\">ParamTest2</a><java.util.List"
- + "<? extends <a href=\"../../pkg2/Foo4.html\" title=\""
+ + "<? extends <a href=\"../Foo4.html\" title=\""
+ "class in pkg2\">Foo4</a>>></code></td>"
);
// Type parameters in constructor and method args
checkOutput("pkg2/class-use/Foo4.html", true,
- "<caption><span>Method parameters in <a href=\"../../pkg2/"
+ "<caption><span>Method parameters in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type arguments of "
- + "type <a href=\"../../pkg2/Foo4.html\" title=\"class in "
+ + "type <a href=\"../Foo4.html\" title=\"class in "
+ "pkg2\">Foo4</a></span><span class=\"tabEnd\"> "
+ "</span></caption>\n"
+ "<tr>\n"
@@ -433,13 +433,13 @@
+ "<tr class=\"altColor\">\n"
+ "<td class=\"colFirst\"><code>void</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">ClassUseTest3."
- + "</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3."
+ + "</span><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest3."
+ "html#method-java.util.Set-\">method</a></span>​(java."
- + "util.Set<<a href=\"../../pkg2/Foo4.html\" title=\""
+ + "util.Set<<a href=\"../Foo4.html\" title=\""
+ "class in pkg2\">Foo4</a>> p)</code></th>",
- "<caption><span>Constructor parameters in <a href=\"../../"
- + "pkg2/package-summary.html\">pkg2</a> with type arguments "
- + "of type <a href=\"../../pkg2/Foo4.html\" title=\"class in "
+ "<caption><span>Constructor parameters in <a href=\"../"
+ + "package-summary.html\">pkg2</a> with type arguments "
+ + "of type <a href=\"../Foo4.html\" title=\"class in "
+ "pkg2\">Foo4</a></span><span class=\"tabEnd\"> "
+ "</span></caption>"
);
@@ -478,7 +478,7 @@
"(int... i)",
"(int[][]... i)",
"-int:A...-",
- "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">"
+ "<a href=\"TypeParameters.html\" title=\"class in pkg\">"
+ "TypeParameters</a>... t");
}
@@ -520,58 +520,58 @@
void checkAnnotationTypeUsage() {
checkOutput("pkg/package-summary.html", true,
// PACKAGE
- "<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>=\"Package Annotation\",\n"
- + " <a href=\"../pkg/AnnotationType.html#required--\">required</a>=1994)");
+ "<a href=\"AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"AnnotationType.html#optional--\">optional</a>=\"Package Annotation\",\n"
+ + " <a href=\"AnnotationType.html#required--\">required</a>=1994)");
checkOutput("pkg/AnnotationTypeUsage.html", true,
// CLASS
- "<pre><a href=\"../pkg/AnnotationType.html\" "
+ "<pre><a href=\"AnnotationType.html\" "
+ "title=\"annotation in pkg\">@AnnotationType</a>("
- + "<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>"
+ + "<a href=\"AnnotationType.html#optional--\">optional</a>"
+ "=\"Class Annotation\",\n"
- + " <a href=\"../pkg/AnnotationType.html#required--\">"
+ + " <a href=\"AnnotationType.html#required--\">"
+ "required</a>=1994)\n"
+ "public class <span class=\"typeNameLabel\">"
+ "AnnotationTypeUsage</span>\n"
+ "extends java.lang.Object</pre>",
// FIELD
- "<pre><a href=\"../pkg/AnnotationType.html\" "
+ "<pre><a href=\"AnnotationType.html\" "
+ "title=\"annotation in pkg\">@AnnotationType</a>("
- + "<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>"
+ + "<a href=\"AnnotationType.html#optional--\">optional</a>"
+ "=\"Field Annotation\",\n"
- + " <a href=\"../pkg/AnnotationType.html#required--\">"
+ + " <a href=\"AnnotationType.html#required--\">"
+ "required</a>=1994)\n"
+ "public int field</pre>",
// CONSTRUCTOR
- "<pre><a href=\"../pkg/AnnotationType.html\" "
+ "<pre><a href=\"AnnotationType.html\" "
+ "title=\"annotation in pkg\">@AnnotationType</a>("
- + "<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>"
+ + "<a href=\"AnnotationType.html#optional--\">optional</a>"
+ "=\"Constructor Annotation\",\n"
- + " <a href=\"../pkg/AnnotationType.html#required--\">"
+ + " <a href=\"AnnotationType.html#required--\">"
+ "required</a>=1994)\n"
+ "public AnnotationTypeUsage()</pre>",
// METHOD
- "<pre><a href=\"../pkg/AnnotationType.html\" "
+ "<pre><a href=\"AnnotationType.html\" "
+ "title=\"annotation in pkg\">@AnnotationType</a>("
- + "<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>"
+ + "<a href=\"AnnotationType.html#optional--\">optional</a>"
+ "=\"Method Annotation\",\n"
- + " <a href=\"../pkg/AnnotationType.html#required--\">"
+ + " <a href=\"AnnotationType.html#required--\">"
+ "required</a>=1994)\n"
+ "public void method()</pre>",
// METHOD PARAMS
"<pre>public void methodWithParams​("
- + "<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">"
- + "@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional--\">"
+ + "<a href=\"AnnotationType.html\" title=\"annotation in pkg\">"
+ + "@AnnotationType</a>(<a href=\"AnnotationType.html#optional--\">"
+ "optional</a>=\"Parameter Annotation\",<a "
- + "href=\"../pkg/AnnotationType.html#required--\">required</a>=1994)\n"
+ + "href=\"AnnotationType.html#required--\">required</a>=1994)\n"
+ " int documented,\n"
+ " int undocmented)</pre>",
// CONSTRUCTOR PARAMS
"<pre>public AnnotationTypeUsage​(<a "
- + "href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">"
- + "@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional--\">"
+ + "href=\"AnnotationType.html\" title=\"annotation in pkg\">"
+ + "@AnnotationType</a>(<a href=\"AnnotationType.html#optional--\">"
+ "optional</a>=\"Constructor Param Annotation\",<a "
- + "href=\"../pkg/AnnotationType.html#required--\">required</a>=1994)\n"
+ + "href=\"AnnotationType.html#required--\">required</a>=1994)\n"
+ " int documented,\n"
+ " int undocmented)</pre>");
@@ -580,37 +580,37 @@
//=================================
checkOutput("pkg/class-use/AnnotationType.html", true,
"<caption><span>Packages with annotations of type <a href=\""
- + "../../pkg/AnnotationType.html\" title=\"annotation in pkg\">"
+ + "../AnnotationType.html\" title=\"annotation in pkg\">"
+ "AnnotationType</a></span><span class=\"tabEnd\"> "
+ "</span></caption>",
- "<caption><span>Classes in <a href=\"../../pkg/"
+ "<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg</a> with annotations of type "
- + "<a href=\"../../pkg/AnnotationType.html\" title=\""
+ + "<a href=\"../AnnotationType.html\" title=\""
+ "annotation in pkg\">AnnotationType</a></span><span class"
+ "=\"tabEnd\"> </span></caption>",
- "<caption><span>Fields in <a href=\"../../pkg/"
+ "<caption><span>Fields in <a href=\"../"
+ "package-summary.html\">pkg</a> with annotations of type "
- + "<a href=\"../../pkg/AnnotationType.html\" title=\"annotation "
+ + "<a href=\"../AnnotationType.html\" title=\"annotation "
+ "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">"
+ " </span></caption>",
- "<caption><span>Methods in <a href=\"../../pkg/"
+ "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg</a> with annotations of type "
- + "<a href=\"../../pkg/AnnotationType.html\" title=\"annotation "
+ + "<a href=\"../AnnotationType.html\" title=\"annotation "
+ "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">"
+ " </span></caption>",
- "<caption><span>Method parameters in <a href=\"../../pkg/"
+ "<caption><span>Method parameters in <a href=\"../"
+ "package-summary.html\">pkg</a> with annotations of type "
- + "<a href=\"../../pkg/AnnotationType.html\" title=\"annotation "
+ + "<a href=\"../AnnotationType.html\" title=\"annotation "
+ "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">"
+ " </span></caption>",
- "<caption><span>Constructors in <a href=\"../../pkg/"
+ "<caption><span>Constructors in <a href=\"../"
+ "package-summary.html\">pkg</a> with annotations of type "
- + "<a href=\"../../pkg/AnnotationType.html\" title=\"annotation "
+ + "<a href=\"../AnnotationType.html\" title=\"annotation "
+ "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">"
+ " </span></caption>",
- "<caption><span>Constructor parameters in <a href=\"../../"
- + "pkg/package-summary.html\">pkg</a> with annotations of "
- + "type <a href=\"../../pkg/AnnotationType.html\" title=\""
+ "<caption><span>Constructor parameters in <a href=\"../"
+ + "package-summary.html\">pkg</a> with annotations of "
+ + "type <a href=\"../AnnotationType.html\" title=\""
+ "annotation in pkg\">AnnotationType</a></span><span class=\""
+ "tabEnd\"> </span></caption>"
);
@@ -620,20 +620,20 @@
//===============================================================
checkOutput("pkg/AnnotationTypeUsage.html", false,
// CLASS
- "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Class Annotation\",\n"
- + " <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)\n"
+ "<a href=\"AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"AnnotationType.html#optional\">optional</a>=\"Class Annotation\",\n"
+ + " <a href=\"AnnotationType.html#required\">required</a>=1994)\n"
+ "public class <span class=\"typeNameLabel\">AnnotationTypeUsage</span></dt><dt>extends java.lang.Object</dt>",
// FIELD
- "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Field Annotation\",\n"
- + " <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)\n"
+ "<a href=\"AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"AnnotationType.html#optional\">optional</a>=\"Field Annotation\",\n"
+ + " <a href=\"AnnotationType.html#required\">required</a>=1994)\n"
+ "public int <span class=\"memberNameLabel\">field</span>",
// CONSTRUCTOR
- "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Constructor Annotation\",\n"
- + " <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)\n"
+ "<a href=\"AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"AnnotationType.html#optional\">optional</a>=\"Constructor Annotation\",\n"
+ + " <a href=\"AnnotationType.html#required\">required</a>=1994)\n"
+ "public <span class=\"typeNameLabel\">AnnotationTypeUsage</span>()",
// METHOD
- "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Method Annotation\",\n"
- + " <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)\n"
+ "<a href=\"AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"AnnotationType.html#optional\">optional</a>=\"Method Annotation\",\n"
+ + " <a href=\"AnnotationType.html#required\">required</a>=1994)\n"
+ "public void <span class=\"memberNameLabel\">method</span>()");
//=================================
@@ -648,31 +648,31 @@
//=================================
checkOutput("pkg1/B.html", true,
// Integer
- "<a href=\"../pkg1/A.html#d--\">d</a>=3.14,",
+ "<a href=\"A.html#d--\">d</a>=3.14,",
// Double
- "<a href=\"../pkg1/A.html#d--\">d</a>=3.14,",
+ "<a href=\"A.html#d--\">d</a>=3.14,",
// Boolean
- "<a href=\"../pkg1/A.html#b--\">b</a>=true,",
+ "<a href=\"A.html#b--\">b</a>=true,",
// String
- "<a href=\"../pkg1/A.html#s--\">s</a>=\"sigh\",",
+ "<a href=\"A.html#s--\">s</a>=\"sigh\",",
// Class
- "<a href=\"../pkg1/A.html#c--\">c</a>=<a href=\"../pkg2/Foo.html\" title=\"class in pkg2\">Foo.class</a>,",
+ "<a href=\"A.html#c--\">c</a>=<a href=\"../pkg2/Foo.html\" title=\"class in pkg2\">Foo.class</a>,",
// Bounded Class
- "<a href=\"../pkg1/A.html#w--\">w</a>=<a href=\"../pkg/TypeParameterSubClass.html\" title=\"class in pkg\">TypeParameterSubClass.class</a>,",
+ "<a href=\"A.html#w--\">w</a>=<a href=\"../pkg/TypeParameterSubClass.html\" title=\"class in pkg\">TypeParameterSubClass.class</a>,",
// Enum
- "<a href=\"../pkg1/A.html#e--\">e</a>=<a href=\"../pkg/Coin.html#Penny\">Penny</a>,",
+ "<a href=\"A.html#e--\">e</a>=<a href=\"../pkg/Coin.html#Penny\">Penny</a>,",
// Annotation Type
- "<a href=\"../pkg1/A.html#a--\">a</a>=<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>=\"foo\",<a href=\"../pkg/AnnotationType.html#required--\">required</a>=1994),",
+ "<a href=\"A.html#a--\">a</a>=<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>=\"foo\",<a href=\"../pkg/AnnotationType.html#required--\">required</a>=1994),",
// String Array
- "<a href=\"../pkg1/A.html#sa--\">sa</a>={\"up\",\"down\"},",
+ "<a href=\"A.html#sa--\">sa</a>={\"up\",\"down\"},",
// Primitive
- "<a href=\"../pkg1/A.html#primitiveClassTest--\">primitiveClassTest</a>=boolean.class,");
+ "<a href=\"A.html#primitiveClassTest--\">primitiveClassTest</a>=boolean.class,");
// XXX: Add array test case after this if fixed:
//5020899: Incorrect internal representation of class-valued annotation elements
// Make sure that annotations are surrounded by <pre> and </pre>
checkOutput("pkg1/B.html", true,
- "<pre><a href=\"../pkg1/A.html\" title=\"annotation in pkg1\">@A</a>",
+ "<pre><a href=\"A.html\" title=\"annotation in pkg1\">@A</a>",
"public interface <span class=\"typeNameLabel\">B</span></pre>");
}