8259726: Use of HashSet leads to undefined order in test output
Reviewed-by: hannesw
This commit is contained in:
Jonathan Gibbons
parent
d6fb9d7256
commit
982e42b896
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html
test/langtools/jdk/javadoc/doclet
testAbstractMethod
testDeprecatedDocs
testHtmlTableTags
testInterface
testJavaFX
testLambdaFeature
testMemberInheritance
testMemberSummary
testMethodTypes
testModules
testNewLanguageFeatures
testOverriddenMethods
testProperty
testTypeAnnotations
testTypeParams
testUnnamedPackage
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2003, 2021, 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
|
||||
@ -304,13 +304,12 @@ public class Table extends Content {
|
||||
int rowIndex = bodyRows.size();
|
||||
rowStyle = stripedStyles.get(rowIndex % 2);
|
||||
}
|
||||
Set<String> tabClasses = new HashSet<>(); // !! would be better as a List
|
||||
List<String> tabClasses = new ArrayList<>();
|
||||
if (tabMap != null) {
|
||||
// Construct a series of CSS classes to add to the cells of this row,
|
||||
// such that there is a default value and a value corresponding to each
|
||||
// tab whose predicate matches the element. The classes correspond to
|
||||
// the equivalent ids. The classes are used to determine the cells to
|
||||
// make visible when a tab is selected.
|
||||
// Construct a series of values to add to the HTML 'class' attribute for the cells of
|
||||
// this row, such that there is a default value and a value corresponding to each tab
|
||||
// whose predicate matches the element. The values correspond to the equivalent ids.
|
||||
// The values are used to determine the cells to make visible when a tab is selected.
|
||||
tabClasses.add(id.name());
|
||||
int tabIndex = 1;
|
||||
for (Map.Entry<String, Predicate<Element>> e : tabMap.entrySet()) {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2012, 2021, 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
|
||||
@ -50,8 +50,8 @@ public class TestAbstractMethod extends JavadocTester {
|
||||
|
||||
checkOutput("pkg/A.html", true,
|
||||
"""
|
||||
<div class="col-first even-row-color method-summary-table-tab2 method-summary-table-t\
|
||||
ab5 method-summary-table"><code>default void</code></div>""",
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab5"><code>default void</code></div>""",
|
||||
"""
|
||||
<div class="table-tabs" role="tablist" aria-orientation="horizontal">\
|
||||
<button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-cont\
|
||||
@ -93,8 +93,8 @@ public class TestAbstractMethod extends JavadocTester {
|
||||
able-tab">Concrete Methods</button>\
|
||||
</div>""",
|
||||
"""
|
||||
<div class="col-first even-row-color method-summary-table-tab2 method-summary-ta\
|
||||
ble method-summary-table-tab3"><code>abstract void</code></div>""");
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab3"><code>abstract void</code></div>""");
|
||||
|
||||
checkOutput("pkg/C.html", true,
|
||||
"""
|
||||
|
||||
@ -172,22 +172,22 @@ public class TestDeprecatedDocs extends JavadocTester {
|
||||
</div>
|
||||
</div>""",
|
||||
"""
|
||||
<div class="col-last even-row-color method-summary-table-tab2 method-summary-table-ta\
|
||||
b6 method-summary-table-tab4 method-summary-table">
|
||||
<div class="col-last even-row-color method-summary-table method-summary-table-ta\
|
||||
b2 method-summary-table-tab4 method-summary-table-tab6">
|
||||
<div class="block"><span class="deprecated-label">Deprecated.</span>
|
||||
<div class="deprecation-comment">class_test5 passes.</div>
|
||||
</div>
|
||||
</div>""",
|
||||
"""
|
||||
<div class="col-last even-row-color method-summary-table-tab2 method-summary-table-ta\
|
||||
b6 method-summary-table-tab4 method-summary-table">
|
||||
<div class="col-last even-row-color method-summary-table method-summary-table-ta\
|
||||
b2 method-summary-table-tab4 method-summary-table-tab6">
|
||||
<div class="block"><span class="deprecated-label">Deprecated.</span>
|
||||
<div class="deprecation-comment">class_test6 passes.</div>
|
||||
</div>
|
||||
</div>""",
|
||||
"""
|
||||
<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-ta\
|
||||
b6 method-summary-table-tab4 method-summary-table">
|
||||
<div class="col-last odd-row-color method-summary-table method-summary-table-tab\
|
||||
2 method-summary-table-tab4 method-summary-table-tab6">
|
||||
<div class="block"><span class="deprecated-label">Deprecated.</span>
|
||||
<div class="deprecation-comment">class_test7 passes.</div>
|
||||
</div>
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 6786688 8008164 8162363 8169819 8183037 8182765 8184205 8242649
|
||||
* @bug 6786688 8008164 8162363 8169819 8183037 8182765 8184205 8242649 8259726
|
||||
* @summary HTML tables should have table summary, caption and table headers.
|
||||
* @library ../../lib
|
||||
* @modules jdk.javadoc/jdk.javadoc.internal.tool
|
||||
@ -577,13 +577,14 @@ public class TestHtmlTableTags extends JavadocTester {
|
||||
<div class="block">Test field for class.</div>
|
||||
</div>""",
|
||||
"""
|
||||
<div class="col-first even-row-color method-summary-table-tab2 method-summary-ta\
|
||||
ble-tab4 method-summary-table"><code>void</code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-t\
|
||||
able-tab4 method-summary-table"><code><span class="member-name-link"><a href="#m\
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code>void</code></div>
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#m\
|
||||
ethod1(int,int)">method1</a></span>​(int a,
|
||||
int b)</code></div>
|
||||
<div class="col-last even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
|
||||
<div class="col-last even-row-color method-summary-table method-summary-table-ta\
|
||||
b2 method-summary-table-tab4">
|
||||
<div class="block">Method that is implemented.</div>
|
||||
</div>""");
|
||||
|
||||
@ -595,15 +596,15 @@ public class TestHtmlTableTags extends JavadocTester {
|
||||
<div class="block">A test field.</div>
|
||||
</div>""",
|
||||
"""
|
||||
<div class="col-first even-row-color method-summary-table-tab2 method-summary-ta\
|
||||
ble-tab4 method-summary-table"><code><a href="../pkg1/C1.html" title="class in p\
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code><a href="../pkg1/C1.html" title="class in p\
|
||||
kg1">C1</a></code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-t\
|
||||
able-tab4 method-summary-table"><code><span class="member-name-link"><a href="#m\
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#m\
|
||||
ethod(pkg1.C1)">method</a></span>​(<a href="../pkg1/C1.html" title="class \
|
||||
in pkg1">C1</a> param)</code></div>
|
||||
<div class="col-last even-row-color method-summary-table-tab2 method-summary-tab\
|
||||
le-tab4 method-summary-table">
|
||||
<div class="col-last even-row-color method-summary-table method-summary-table-ta\
|
||||
b2 method-summary-table-tab4">
|
||||
<div class="block">A sample method.</div>
|
||||
</div>""");
|
||||
|
||||
@ -693,9 +694,9 @@ public class TestHtmlTableTags extends JavadocTester {
|
||||
// Overview Summary
|
||||
checkOutput("index.html", true,
|
||||
"""
|
||||
<div class="col-first even-row-color all-packages-table-tab1 all-packages-table"\
|
||||
<div class="col-first even-row-color all-packages-table all-packages-table-tab1"\
|
||||
><a href="pkg1/package-summary.html">pkg1</a></div>
|
||||
<div class="col-last even-row-color all-packages-table-tab1 all-packages-table">
|
||||
<div class="col-last even-row-color all-packages-table all-packages-table-tab1">
|
||||
<div class="block">Test package 1 used to test table tags.</div>
|
||||
</div>""");
|
||||
}
|
||||
@ -728,13 +729,14 @@ public class TestHtmlTableTags extends JavadocTester {
|
||||
<div class="col-second odd-row-color"><code><span class="member-name-link"><a href="#field">field</a></span></code></div>
|
||||
<div class="col-last odd-row-color"></div>""",
|
||||
"""
|
||||
<div class="col-first even-row-color method-summary-table-tab2 method-summary-ta\
|
||||
ble-tab4 method-summary-table"><code>void</code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-t\
|
||||
able-tab4 method-summary-table"><code><span class="member-name-link"><a href="#m\
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code>void</code></div>
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#m\
|
||||
ethod1(int,int)">method1</a></span>​(int a,
|
||||
int b)</code></div>
|
||||
<div class="col-last even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"></div>""");
|
||||
<div class="col-last even-row-color method-summary-table method-summary-table-ta\
|
||||
b2 method-summary-table-tab4"></div>""");
|
||||
|
||||
checkOutput("pkg2/C2.html", true,
|
||||
"""
|
||||
@ -742,15 +744,15 @@ public class TestHtmlTableTags extends JavadocTester {
|
||||
<div class="col-second even-row-color"><code><span class="member-name-link"><a href="#field">field</a></span></code></div>
|
||||
<div class="col-last even-row-color"></div>""",
|
||||
"""
|
||||
<div class="col-first even-row-color method-summary-table-tab2 method-summary-ta\
|
||||
ble-tab4 method-summary-table"><code><a href="../pkg1/C1.html" title="class in p\
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code><a href="../pkg1/C1.html" title="class in p\
|
||||
kg1">C1</a></code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-t\
|
||||
able-tab4 method-summary-table"><code><span class="member-name-link"><a href="#m\
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#m\
|
||||
ethod(pkg1.C1)">method</a></span>​(<a href="../pkg1/C1.html" title="class \
|
||||
in pkg1">C1</a> param)</code></div>
|
||||
<div class="col-last even-row-color method-summary-table-tab2 method-summary-tab\
|
||||
le-tab4 method-summary-table"></div>""");
|
||||
<div class="col-last even-row-color method-summary-table method-summary-table-ta\
|
||||
b2 method-summary-table-tab4"></div>""");
|
||||
|
||||
checkOutput("pkg2/C2.ModalExclusionType.html", true,
|
||||
"""
|
||||
@ -820,8 +822,8 @@ public class TestHtmlTableTags extends JavadocTester {
|
||||
// Overview Summary
|
||||
checkOutput("index.html", true,
|
||||
"""
|
||||
<div class="col-first even-row-color all-packages-table-tab1 all-packages-table"\
|
||||
<div class="col-first even-row-color all-packages-table all-packages-table-tab1"\
|
||||
><a href="pkg1/package-summary.html">pkg1</a></div>
|
||||
<div class="col-last even-row-color all-packages-table-tab1 all-packages-table"></div>""");
|
||||
<div class="col-last even-row-color all-packages-table all-packages-table-tab1"></div>""");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2003, 2021, 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
|
||||
@ -133,13 +133,13 @@ public class TestInterface extends JavadocTester {
|
||||
<div class="block">A hider field</div>""",
|
||||
|
||||
"""
|
||||
<div class="col-first even-row-color method-summary-table-tab1 method-summary-table-t\
|
||||
ab4 method-summary-table"><code>static void</code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab1 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#m()">m\
|
||||
</a></span>()</code></div>
|
||||
<div class="col-last even-row-color method-summary-table-tab1 method-summary-table-ta\
|
||||
b4 method-summary-table">
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab1 method-summary-table-tab4"><code>static void</code></div>
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab1 method-summary-table-tab4"><code><span class="member-name-link"><a href="#m\
|
||||
()">m</a></span>()</code></div>
|
||||
<div class="col-last even-row-color method-summary-table method-summary-table-ta\
|
||||
b1 method-summary-table-tab4">
|
||||
<div class="block">A hider method</div>
|
||||
</div>
|
||||
""",
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2012, 2021, 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
|
||||
@ -89,8 +89,8 @@ public class TestJavaFX extends JavadocTester {
|
||||
<dd>JavaFX 8.0</dd>""",
|
||||
"<dt>Property description:</dt>",
|
||||
"""
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#setTes\
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#setTes\
|
||||
tMethodProperty()">setTestMethodProperty</a></span>()</code></div>""",
|
||||
"""
|
||||
<div class="col-second even-row-color"><code><span class="member-name-link"><a href="\
|
||||
@ -317,37 +317,37 @@ public class TestJavaFX extends JavadocTester {
|
||||
<div class="table-header col-first">Modifier and Type</div>
|
||||
<div class="table-header col-second">Method</div>
|
||||
<div class="table-header col-last">Description</div>
|
||||
<div class="col-first even-row-color method-summary-table-tab2 method-summary-table-t\
|
||||
ab4 method-summary-table"><code><T> java.lang.Object</code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#alphaP\
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code><T> java.lang.Object</code></div>
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#alphaP\
|
||||
roperty(java.util.List)">alphaProperty</a></span>​(java.util.List<T>\
|
||||
foo)</code></div>
|
||||
<div class="col-last even-row-color method-summary-table-tab2 method-summary-table-ta\
|
||||
b4 method-summary-table"> </div>
|
||||
<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-t\
|
||||
ab4 method-summary-table"><code>java.lang.Object</code></div>
|
||||
<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#betaPr\
|
||||
<div class="col-last even-row-color method-summary-table method-summary-table-ta\
|
||||
b2 method-summary-table-tab4"> </div>
|
||||
<div class="col-first odd-row-color method-summary-table method-summary-table-ta\
|
||||
b2 method-summary-table-tab4"><code>java.lang.Object</code></div>
|
||||
<div class="col-second odd-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#betaPr\
|
||||
operty()">betaProperty</a></span>()</code></div>
|
||||
<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-ta\
|
||||
b4 method-summary-table"> </div>
|
||||
<div class="col-first even-row-color method-summary-table-tab2 method-summary-table-t\
|
||||
ab4 method-summary-table"><code>java.util.List<java.util.Set<? super java.\
|
||||
<div class="col-last odd-row-color method-summary-table method-summary-table-tab\
|
||||
2 method-summary-table-tab4"> </div>
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code>java.util.List<java.util.Set<? super java.\
|
||||
lang.Object>></code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#deltaP\
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#deltaP\
|
||||
roperty()">deltaProperty</a></span>()</code></div>
|
||||
<div class="col-last even-row-color method-summary-table-tab2 method-summary-table-ta\
|
||||
b4 method-summary-table"> </div>
|
||||
<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-t\
|
||||
ab4 method-summary-table"><code>java.util.List<java.lang.String></code></d\
|
||||
<div class="col-last even-row-color method-summary-table method-summary-table-ta\
|
||||
b2 method-summary-table-tab4"> </div>
|
||||
<div class="col-first odd-row-color method-summary-table method-summary-table-ta\
|
||||
b2 method-summary-table-tab4"><code>java.util.List<java.lang.String></code></d\
|
||||
iv>
|
||||
<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#gammaP\
|
||||
<div class="col-second odd-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#gammaP\
|
||||
roperty()">gammaProperty</a></span>()</code></div>
|
||||
<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-ta\
|
||||
b4 method-summary-table"> </div>"""
|
||||
<div class="col-last odd-row-color method-summary-table method-summary-table-tab\
|
||||
2 method-summary-table-tab4"> </div>"""
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2012, 2021, 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
|
||||
@ -56,8 +56,8 @@ public class TestLambdaFeature extends JavadocTester {
|
||||
|
||||
checkOutput("pkg/A.html", true,
|
||||
"""
|
||||
<div class="col-first even-row-color method-summary-table-tab2 method-summary-ta\
|
||||
ble-tab5 method-summary-table"><code>default void</code></div>""",
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab5"><code>default void</code></div>""",
|
||||
"""
|
||||
<div class="member-signature"><span class="modifiers">default</span> <span \
|
||||
class="return-type">void</span> <span class="element-name">defaultMethod</span>()</\
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2002, 2021, 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
|
||||
@ -102,10 +102,10 @@ public class TestMemberInheritance extends JavadocTester {
|
||||
checkOutput("pkg1/Implementer.html", true,
|
||||
// ensure the method makes it
|
||||
"""
|
||||
<div class="col-first even-row-color method-summary-table-tab1 method-summary-table-t\
|
||||
ab4 method-summary-table"><code>static java.time.Period</code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab1 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#betwee\
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab1 method-summary-table-tab4"><code>static java.time.Period</code></div>
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab1 method-summary-table-tab4"><code><span class="member-name-link"><a href="#betwee\
|
||||
n(java.time.LocalDate,java.time.LocalDate)">between</a></span>​(java.time.\
|
||||
LocalDate startDateInclusive,
|
||||
java.time.LocalDate endDateExclusive)</code></div>""");
|
||||
@ -128,12 +128,12 @@ public class TestMemberInheritance extends JavadocTester {
|
||||
|
||||
checkOutput("pkg2/DocumentedNonGenericChild.html", true,
|
||||
"""
|
||||
<div class="col-first even-row-color method-summary-table-tab2 method-summary-table m\
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-tab2 m\
|
||||
ethod-summary-table-tab3"><code>protected abstract java.lang.String</code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-table \
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-tab2 \
|
||||
method-summary-table-tab3"><code><span class="member-name-link"><a href="#parent\
|
||||
Method(T)">parentMethod</a></span>​(java.lang.String t)</code></div>
|
||||
<div class="col-last even-row-color method-summary-table-tab2 method-summary-table me\
|
||||
<div class="col-last even-row-color method-summary-table method-summary-table-tab2 me\
|
||||
thod-summary-table-tab3">
|
||||
<div class="block">Returns some value with an inherited search tag.</div>
|
||||
""");
|
||||
@ -177,10 +177,10 @@ public class TestMemberInheritance extends JavadocTester {
|
||||
|
||||
checkOutput("pkg3/PrivateGenericParent.PublicChild.html", true,
|
||||
"""
|
||||
<div class="col-first even-row-color method-summary-table-tab2 method-summary-table-t\
|
||||
ab4 method-summary-table"><code>java.lang.String</code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#method\
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code>java.lang.String</code></div>
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#method\
|
||||
(T)">method</a></span>​(java.lang.String t)</code></div>""",
|
||||
"""
|
||||
<section class="detail" id="method(T)">
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2003, 2021, 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
|
||||
@ -54,8 +54,8 @@ public class TestMemberSummary extends JavadocTester {
|
||||
// Check return type in member summary.
|
||||
"""
|
||||
<code><a href="PublicChild.html" title="class in pkg">PublicChild</a></code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#return\
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#return\
|
||||
TypeTest()">returnTypeTest</a></span>()</code></div>""",
|
||||
// Check return type in member detail.
|
||||
"""
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2012, 2021, 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
|
||||
@ -71,7 +71,9 @@ public class TestMethodTypes extends JavadocTester {
|
||||
onclick="show('method-summary-table', 'method-summary-table-tab6', 3)" class="t\
|
||||
able-tab">Deprecated Methods</button>\
|
||||
</div>""",
|
||||
"<div class=\"col-first even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table\">");
|
||||
"""
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4">""");
|
||||
|
||||
checkOutput("pkg1/B.html", true,
|
||||
"""
|
||||
@ -122,7 +124,9 @@ public class TestMethodTypes extends JavadocTester {
|
||||
onclick="show('method-summary-table', 'method-summary-table-tab6', 3)" class="t\
|
||||
able-tab">Deprecated Methods</button>\
|
||||
</div>""",
|
||||
"<div class=\"col-first even-row-color method-summary-table-tab2 method-summary-table-tab6 method-summary-table-tab4 method-summary-table\">");
|
||||
"""
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4 method-summary-table-tab6">""");
|
||||
|
||||
checkOutput("pkg1/A.html", false,
|
||||
"<div class=\"caption\"><span>Methods</span></div>");
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2016, 2021, 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
|
||||
@ -95,7 +95,7 @@ public class TestModulePackages extends JavadocTester {
|
||||
checkExit(Exit.OK);
|
||||
checkCaption("m", 3, TabKind.EXPORTS);
|
||||
checkTableHead("m");
|
||||
checkPackageRow("m", "p", 0, "package-summary-table-tab1 package-summary-table", null, null, " ");
|
||||
checkPackageRow("m", "p", 0, "package-summary-table package-summary-table-tab1", null, null, " ");
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -118,8 +118,8 @@ public class TestModulePackages extends JavadocTester {
|
||||
checkExit(Exit.OK);
|
||||
checkCaption("m", 3, TabKind.EXPORTS);
|
||||
checkTableHead("m");
|
||||
checkPackageRow("m", "p", 0, "package-summary-table-tab1 package-summary-table", null, null, " ");
|
||||
checkPackageRow("m", "q", 1, "package-summary-table-tab1 package-summary-table", null, null, " ");
|
||||
checkPackageRow("m", "p", 0, "package-summary-table package-summary-table-tab1", null, null, " ");
|
||||
checkPackageRow("m", "q", 1, "package-summary-table package-summary-table-tab1", null, null, " ");
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -147,8 +147,8 @@ public class TestModulePackages extends JavadocTester {
|
||||
checkCaption("o", 3, TabKind.EXPORTS);
|
||||
checkTableHead("m");
|
||||
checkTableHead("o");
|
||||
checkPackageRow("m", "p", 0, "package-summary-table-tab1 package-summary-table", null, null, " ");
|
||||
checkPackageRow("o", "p", 0, "package-summary-table-tab1 package-summary-table", null, null, " ");
|
||||
checkPackageRow("m", "p", 0, "package-summary-table package-summary-table-tab1", null, null, " ");
|
||||
checkPackageRow("o", "p", 0, "package-summary-table package-summary-table-tab1", null, null, " ");
|
||||
checkOutput("m/p/package-summary.html", true,
|
||||
"""
|
||||
<div class="sub-title"><span class="module-label-in-package">Module</span> <a href="../module-summary.html">m</a></div>
|
||||
@ -201,7 +201,7 @@ public class TestModulePackages extends JavadocTester {
|
||||
checkExit(Exit.OK);
|
||||
checkCaption("m", 3, TabKind.EXPORTS);
|
||||
checkTableHead("m");
|
||||
checkPackageRow("m", "p", 0, "package-summary-table-tab1 package-summary-table", null, null, " ");
|
||||
checkPackageRow("m", "p", 0, "package-summary-table package-summary-table-tab1", null, null, " ");
|
||||
|
||||
javadoc("-d", base.resolve("out-all").toString(),
|
||||
"-quiet",
|
||||
@ -213,8 +213,8 @@ public class TestModulePackages extends JavadocTester {
|
||||
checkExit(Exit.OK);
|
||||
checkCaption("m", 3, TabKind.EXPORTS);
|
||||
checkTableHead("m", ColKind.EXPORTED_TO);
|
||||
checkPackageRow("m", "p", 0, "package-summary-table-tab1 package-summary-table", "All Modules", null, " ");
|
||||
checkPackageRow("m", "q", 1, "package-summary-table-tab1 package-summary-table",
|
||||
checkPackageRow("m", "p", 0, "package-summary-table package-summary-table-tab1", "All Modules", null, " ");
|
||||
checkPackageRow("m", "q", 1, "package-summary-table package-summary-table-tab1",
|
||||
"""
|
||||
<a href="../other/module-summary.html">other</a>""", null, " ");
|
||||
}
|
||||
@ -238,7 +238,7 @@ public class TestModulePackages extends JavadocTester {
|
||||
checkExit(Exit.OK);
|
||||
checkCaption("m", 4, TabKind.EXPORTS);
|
||||
checkTableHead("m");
|
||||
checkPackageRow("m", "p", 0, "package-summary-table-tab1 package-summary-table", null, null, " ");
|
||||
checkPackageRow("m", "p", 0, "package-summary-table package-summary-table-tab1", null, null, " ");
|
||||
|
||||
javadoc("-d", base.resolve("out-all").toString(),
|
||||
"-quiet",
|
||||
@ -251,8 +251,8 @@ public class TestModulePackages extends JavadocTester {
|
||||
checkExit(Exit.OK);
|
||||
checkCaption("m", 3, TabKind.EXPORTS, TabKind.CONCEALED);
|
||||
checkTableHead("m", ColKind.EXPORTED_TO);
|
||||
checkPackageRow("m", "p", 0, "package-summary-table-tab1 package-summary-table", "All Modules", null, " ");
|
||||
checkPackageRow("m", "q", 1, "package-summary-table-tab3 package-summary-table", "None", null, " ");
|
||||
checkPackageRow("m", "p", 0, "package-summary-table package-summary-table-tab1", "All Modules", null, " ");
|
||||
checkPackageRow("m", "q", 1, "package-summary-table package-summary-table-tab3", "None", null, " ");
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -287,8 +287,8 @@ public class TestModulePackages extends JavadocTester {
|
||||
checkExit(Exit.OK);
|
||||
checkCaption("m", 4, TabKind.EXPORTS, TabKind.OPENS);
|
||||
checkTableHead("m", ColKind.EXPORTED_TO, ColKind.OPENED_TO);
|
||||
checkPackageRow("m", "e.all", 0, "package-summary-table-tab1 package-summary-table", "All Modules", "None", " ");
|
||||
checkPackageRow("m", "eo", 1, "package-summary-table-tab1 package-summary-table package-summary-table-tab2", "All Modules", "All Modules", " ");
|
||||
checkPackageRow("m", "e.all", 0, "package-summary-table package-summary-table-tab1", "All Modules", "None", " ");
|
||||
checkPackageRow("m", "eo", 1, "package-summary-table package-summary-table-tab1 package-summary-table-tab2", "All Modules", "All Modules", " ");
|
||||
|
||||
javadoc("-d", base.resolve("out-all").toString(),
|
||||
"-quiet",
|
||||
@ -301,12 +301,12 @@ public class TestModulePackages extends JavadocTester {
|
||||
checkExit(Exit.OK);
|
||||
checkCaption("m", 4, TabKind.EXPORTS, TabKind.OPENS, TabKind.CONCEALED);
|
||||
checkTableHead("m", ColKind.EXPORTED_TO, ColKind.OPENED_TO);
|
||||
checkPackageRow("m", "c", 0, "package-summary-table-tab3 package-summary-table", "None", "None", " ");
|
||||
checkPackageRow("m", "e.all", 1, "package-summary-table-tab1 package-summary-table", "All Modules", "None", " ");
|
||||
checkPackageRow("m", "e.other", 2, "package-summary-table-tab1 package-summary-table",
|
||||
checkPackageRow("m", "c", 0, "package-summary-table package-summary-table-tab3", "None", "None", " ");
|
||||
checkPackageRow("m", "e.all", 1, "package-summary-table package-summary-table-tab1", "All Modules", "None", " ");
|
||||
checkPackageRow("m", "e.other", 2, "package-summary-table package-summary-table-tab1",
|
||||
"""
|
||||
<a href="../other/module-summary.html">other</a>""", "None", " ");
|
||||
checkPackageRow("m", "eo", 3, "package-summary-table-tab1 package-summary-table package-summary-table-tab2", "All Modules", "All Modules", " ");
|
||||
checkPackageRow("m", "eo", 3, "package-summary-table package-summary-table-tab1 package-summary-table-tab2", "All Modules", "All Modules", " ");
|
||||
checkPackageRow("m", "o.all", 4, "package-summary-table package-summary-table-tab2", "None", "All Modules", " ");
|
||||
checkPackageRow("m", "o.other", 5, "package-summary-table package-summary-table-tab2", "None",
|
||||
"""
|
||||
@ -470,7 +470,7 @@ public class TestModulePackages extends JavadocTester {
|
||||
checkCaption("m", 3, TabKind.OPENS, TabKind.CONCEALED);
|
||||
checkTableHead("m", ColKind.OPENED_TO);
|
||||
checkPackageRow("m", "p", 0, "package-summary-table package-summary-table-tab2", null, "All Modules", " ");
|
||||
checkPackageRow("m", "q", 1, "package-summary-table-tab3 package-summary-table", null, "None", " ");
|
||||
checkPackageRow("m", "q", 1, "package-summary-table package-summary-table-tab3", null, "None", " ");
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -725,8 +725,8 @@ public class TestModules extends JavadocTester {
|
||||
<!-- ============ MODULES SUMMARY =========== -->
|
||||
<h2>Modules</h2>""",
|
||||
"""
|
||||
<div class="col-first even-row-color package-summary-table-tab1 package-summary-table"><a href="testpkgmdlA/package-summary.html">testpkgmdlA</a></div>
|
||||
<div class="col-last even-row-color package-summary-table-tab1 package-summary-table"> </div>""",
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table-tab1"><a href="testpkgmdlA/package-summary.html">testpkgmdlA</a></div>
|
||||
<div class="col-last even-row-color package-summary-table package-summary-table-tab1"> </div>""",
|
||||
"""
|
||||
<section class="packages-summary" id="packages.summary">
|
||||
<!-- ============ PACKAGES SUMMARY =========== -->
|
||||
@ -868,16 +868,16 @@ public class TestModules extends JavadocTester {
|
||||
void checkModuleModeCommon() {
|
||||
checkOutput("index.html", true,
|
||||
"""
|
||||
<div class="col-first even-row-color all-modules-table-tab1 all-modules-table"><a href="moduleA/module-summary.html">moduleA</a></div>
|
||||
<div class="col-last even-row-color all-modules-table-tab1 all-modules-table">
|
||||
<div class="col-first even-row-color all-modules-table all-modules-table-tab1"><a href="moduleA/module-summary.html">moduleA</a></div>
|
||||
<div class="col-last even-row-color all-modules-table all-modules-table-tab1">
|
||||
<div class="block">This is a test description for the moduleA module with a Search phrase search phrase.</div>""",
|
||||
"""
|
||||
<div class="col-first odd-row-color all-modules-table-tab1 all-modules-table"><a href="moduleB/module-summary.html">moduleB</a></div>
|
||||
<div class="col-last odd-row-color all-modules-table-tab1 all-modules-table">
|
||||
<div class="col-first odd-row-color all-modules-table all-modules-table-tab1"><a href="moduleB/module-summary.html">moduleB</a></div>
|
||||
<div class="col-last odd-row-color all-modules-table all-modules-table-tab1">
|
||||
<div class="block">This is a test description for the moduleB module.</div>""",
|
||||
"""
|
||||
<div class="col-first odd-row-color all-modules-table-tab1 all-modules-table"><a href="moduletags/module-summary.html">moduletags</a></div>
|
||||
<div class="col-last odd-row-color all-modules-table-tab1 all-modules-table">
|
||||
<div class="col-first odd-row-color all-modules-table all-modules-table-tab1"><a href="moduletags/module-summary.html">moduletags</a></div>
|
||||
<div class="col-last odd-row-color all-modules-table all-modules-table-tab1">
|
||||
<div class="block">This is a test description for the moduletags module.<br>
|
||||
Type Link: <a href="moduletags/testpkgmdltags/TestClassInModuleTags.html" title="class in testpkgmdltags"><code>TestClassInModuleTags</code></a>.<br>
|
||||
Member Link: <a href="moduletags/testpkgmdltags/TestClassInModuleTags.html#testMethod(java.lang.String)"><code>testMethod(String)</code></a>.<br>
|
||||
@ -895,8 +895,8 @@ public class TestModules extends JavadocTester {
|
||||
""");
|
||||
checkOutput("moduletags/module-summary.html", true,
|
||||
"""
|
||||
<div class="col-first even-row-color package-summary-table-tab1 package-summary-table"><a href="testpkgmdltags/package-summary.html">testpkgmdltags</a></div>
|
||||
<div class="col-last even-row-color package-summary-table-tab1 package-summary-table"> </div>""",
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table-tab1"><a href="testpkgmdltags/package-summary.html">testpkgmdltags</a></div>
|
||||
<div class="col-last even-row-color package-summary-table package-summary-table-tab1"> </div>""",
|
||||
"""
|
||||
<li><a href="#module.description">Description</a> | </li>
|
||||
<li><a href="#modules.summary">Modules</a> | </li>
|
||||
@ -940,8 +940,8 @@ public class TestModules extends JavadocTester {
|
||||
void checkModuleModeApi(boolean found) {
|
||||
checkOutput("moduleA/module-summary.html", found,
|
||||
"""
|
||||
<div class="col-first even-row-color package-summary-table-tab1 package-summary-table"><a href="testpkgmdlA/package-summary.html">testpkgmdlA</a></div>
|
||||
<div class="col-last even-row-color package-summary-table-tab1 package-summary-table"> </div>""");
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table-tab1"><a href="testpkgmdlA/package-summary.html">testpkgmdlA</a></div>
|
||||
<div class="col-last even-row-color package-summary-table package-summary-table-tab1"> </div>""");
|
||||
checkOutput("moduleB/module-summary.html", found,
|
||||
"""
|
||||
<li><a href="#module.description">Description</a> | </li>
|
||||
@ -990,9 +990,9 @@ public class TestModules extends JavadocTester {
|
||||
<div class="col-first even-row-color"><a href="../moduleC/module-summary.html">moduleC</a></div>
|
||||
<div class="col-last even-row-color"><a href="../moduleC/testpkgmdlC/package-summary.html">testpkgmdlC</a></div>""",
|
||||
"""
|
||||
<div class="col-first odd-row-color package-summary-table-tab1 package-summary-table"><a href="testpkgmdlA/package-summary.html">testpkgmdlA</a></div>
|
||||
<div class="col-second odd-row-color package-summary-table-tab1 package-summary-table">All Modules</div>
|
||||
<div class="col-last odd-row-color package-summary-table-tab1 package-summary-table"> </div>""",
|
||||
<div class="col-first odd-row-color package-summary-table package-summary-table-tab1"><a href="testpkgmdlA/package-summary.html">testpkgmdlA</a></div>
|
||||
<div class="col-second odd-row-color package-summary-table package-summary-table-tab1">All Modules</div>
|
||||
<div class="col-last odd-row-color package-summary-table package-summary-table-tab1"> </div>""",
|
||||
"""
|
||||
<div class="table-tabs" role="tablist" aria-orientation="horizontal">\
|
||||
<button id="package-summary-table-tab0" role="tab" aria-selected="true" aria-con\
|
||||
@ -1009,9 +1009,9 @@ public class TestModules extends JavadocTester {
|
||||
s="table-tab">Concealed</button>\
|
||||
</div>""",
|
||||
"""
|
||||
<div class="col-first even-row-color package-summary-table-tab3 package-summary-table"><a href="concealedpkgmdlA/package-summary.html">concealedpkgmdlA</a></div>
|
||||
<div class="col-second even-row-color package-summary-table-tab3 package-summary-table">None</div>
|
||||
<div class="col-last even-row-color package-summary-table-tab3 package-summary-table"> </div>""");
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table-tab3"><a href="concealedpkgmdlA/package-summary.html">concealedpkgmdlA</a></div>
|
||||
<div class="col-second even-row-color package-summary-table package-summary-table-tab3">None</div>
|
||||
<div class="col-last even-row-color package-summary-table package-summary-table-tab3"> </div>""");
|
||||
checkOutput("moduleB/module-summary.html", found,
|
||||
"""
|
||||
<li><a href="#module.description">Description</a> | </li>
|
||||
@ -1331,9 +1331,9 @@ public class TestModules extends JavadocTester {
|
||||
<div class="summary-table two-column-summary">
|
||||
<div class="table-header col-first">Package</div>
|
||||
<div class="table-header col-last">Description</div>
|
||||
<div class="col-first even-row-color package-summary-table-tab1 package-summary-table">\
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table-tab1">\
|
||||
<a href="testpkgmdlA/package-summary.html">testpkgmdlA</a></div>
|
||||
<div class="col-last even-row-color package-summary-table-tab1 package-summary-table"> </div>
|
||||
<div class="col-last even-row-color package-summary-table package-summary-table-tab1"> </div>
|
||||
</div>
|
||||
</div>
|
||||
""");
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2003, 2021, 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
|
||||
@ -141,11 +141,11 @@ public class TestNewLanguageFeatures extends JavadocTester {
|
||||
V param2)</span></div>""",
|
||||
// Method that returns TypeParameters
|
||||
"""
|
||||
<div class="col-first even-row-color method-summary-table-tab2 method-summary-table-t\
|
||||
ab4 method-summary-table"><code><a href="TypeParameters.html" title="type parame\
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code><a href="TypeParameters.html" title="type parame\
|
||||
ter in TypeParameters">E</a>[]</code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#method\
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#method\
|
||||
ThatReturnsTypeParameterA(E%5B%5D)">methodThatReturnsTypeParameterA</a></span>&#\
|
||||
8203;(<a href="TypeParameters.html" title="type parameter in TypeParameters">E</\
|
||||
a>[] e)</code>""",
|
||||
@ -157,11 +157,11 @@ public class TestNewLanguageFeatures extends JavadocTester {
|
||||
le="type parameter in TypeParameters">E</a>[] e)</span></div>
|
||||
""",
|
||||
"""
|
||||
<div class="col-first even-row-color method-summary-table-tab2 method-summary-table-t\
|
||||
ab4 method-summary-table"><code><T extends java.lang.Object & java.lang.C\
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code><T extends java.lang.Object & java.lang.C\
|
||||
omparable<? super T>><br>T</code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#method\
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#method\
|
||||
tThatReturnsTypeParametersB(java.util.Collection)">methodtThatReturnsTypeParamet\
|
||||
ersB</a></span>​(java.util.Collection<? extends T> coll)</code>""",
|
||||
"""
|
||||
@ -169,12 +169,11 @@ public class TestNewLanguageFeatures extends JavadocTester {
|
||||
""",
|
||||
// Method takes a TypeVariable
|
||||
"""
|
||||
<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-t\
|
||||
ab4 method-summary-table"><code><X extends java.lang.Throwable><br><a href\
|
||||
="TypeParameters.html" title="type parameter in TypeParameters">E</a></code></di\
|
||||
v>
|
||||
<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#orElse\
|
||||
<div class="col-first odd-row-color method-summary-table method-summary-table-ta\
|
||||
b2 method-summary-table-tab4"><code><X extends java.lang.Throwable><br><a href\
|
||||
="TypeParameters.html" title="type parameter in TypeParameters">E</a></code></div>
|
||||
<div class="col-second odd-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#orElse\
|
||||
Throw(java.util.function.Supplier)">orElseThrow</a></span>​(java.util.func\
|
||||
tion.Supplier<? extends X> exceptionSupplier)</code>"""
|
||||
);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2017, 2021, 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
|
||||
@ -318,37 +318,58 @@ public class TestOverrideMethods extends JavadocTester {
|
||||
<div class="table-header col-first">Modifier and Type</div>
|
||||
<div class="table-header col-second">Method</div>
|
||||
<div class="table-header col-last">Description</div>
|
||||
<div class="col-first even-row-color method-summary-table-tab2 method-summary-table-t\
|
||||
ab4 method-summary-table"><code>java.lang.String</code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#m2()">\
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code>java.lang.String</code></div>
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#m2()">\
|
||||
m2</a></span>()</code></div>
|
||||
<div class="col-last even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
|
||||
<div class="col-last even-row-color method-summary-table method-summary-table-ta\
|
||||
b2 method-summary-table-tab4">
|
||||
<div class="block">This is Base::m2.</div>
|
||||
</div>
|
||||
<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>void</code></div>
|
||||
<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#m4()">m4</a></span>()</code></div>
|
||||
<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
|
||||
<div class="col-first odd-row-color method-summary-table method-summary-table-ta\
|
||||
b2 method-summary-table-tab4"><code>void</code></div>
|
||||
<div class="col-second odd-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#m4\
|
||||
()">m4</a></span>()</code></div>
|
||||
<div class="col-last odd-row-color method-summary-table method-summary-table-tab\
|
||||
2 method-summary-table-tab4">
|
||||
<div class="block">This is Base::m4.</div>
|
||||
</div>
|
||||
<div class="col-first even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>java.lang.Object</code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#m5()">m5</a></span>()</code></div>
|
||||
<div class="col-last even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code>java.lang.Object</code></div>
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#m\
|
||||
5()">m5</a></span>()</code></div>
|
||||
<div class="col-last even-row-color method-summary-table method-summary-table-ta\
|
||||
b2 method-summary-table-tab4">
|
||||
<div class="block">This is Base::m5.</div>
|
||||
</div>
|
||||
<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>java.lang.Object</code></div>
|
||||
<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#m6()">m6</a></span>()</code></div>
|
||||
<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
|
||||
<div class="col-first odd-row-color method-summary-table method-summary-table-ta\
|
||||
b2 method-summary-table-tab4"><code>java.lang.Object</code></div>
|
||||
<div class="col-second odd-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#m6\
|
||||
()">m6</a></span>()</code></div>
|
||||
<div class="col-last odd-row-color method-summary-table method-summary-table-tab\
|
||||
2 method-summary-table-tab4">
|
||||
<div class="block">This is Base::m6.</div>
|
||||
</div>
|
||||
<div class="col-first even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>java.lang.Object</code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#m7()">m7</a></span>()</code></div>
|
||||
<div class="col-last even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code>java.lang.Object</code></div>
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#m\
|
||||
7()">m7</a></span>()</code></div>
|
||||
<div class="col-last even-row-color method-summary-table method-summary-table-ta\
|
||||
b2 method-summary-table-tab4">
|
||||
<div class="block">This is Base::m7.</div>
|
||||
</div>
|
||||
<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>abstract java.lang.Object</code></div>
|
||||
<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#m8()">m8</a></span>()</code></div>
|
||||
<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
|
||||
<div class="col-first odd-row-color method-summary-table method-summary-table-ta\
|
||||
b2 method-summary-table-tab3"><code>abstract java.lang.Object</code></div>
|
||||
<div class="col-second odd-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab3"><code><span class="member-name-link"><a href="#m8\
|
||||
()">m8</a></span>()</code></div>
|
||||
<div class="col-last odd-row-color method-summary-table method-summary-table-tab\
|
||||
2 method-summary-table-tab3">
|
||||
<div class="block">This is Base::m8.</div>
|
||||
</div>
|
||||
""",
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2017, 2021, 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
|
||||
@ -86,12 +86,12 @@ public class TestProperty extends JavadocTester {
|
||||
|
||||
// tab classes should be used in the method table
|
||||
"""
|
||||
<div class="col-first even-row-color method-summary-table-tab2 method-summary-table-t\
|
||||
ab4 method-summary-table"><code><a href="ObjectProperty.html" title="class in pk\
|
||||
<div class="col-first even-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code><a href="ObjectProperty.html" title="class in pk\
|
||||
g">ObjectProperty</a><<a href="MyObj.html" title="class in pkg">MyObj</a>[]&g\
|
||||
t;</code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#badPro\
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#badPro\
|
||||
perty()">badProperty</a></span>()</code></div>"""
|
||||
);
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2013, 2021, 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
|
||||
@ -668,9 +668,9 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
checkOutput("typeannos/RepeatingOnMethod.html", true,
|
||||
"""
|
||||
<code>(package private) java.lang.String</code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#test1(\
|
||||
)">test1</a></span>()</code>""",
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#t\
|
||||
est1()">test1</a></span>()</code>""",
|
||||
|
||||
"""
|
||||
<code>(package private) <a href="RepTypeUseA.html" title="annotation in typeanno\
|
||||
@ -678,9 +678,9 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepT\
|
||||
ypeUseB</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeU\
|
||||
seB</a> java.lang.String</code></div>
|
||||
<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#test2(\
|
||||
)">test2</a></span>()</code>""",
|
||||
<div class="col-second odd-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#te\
|
||||
st2()">test2</a></span>()</code>""",
|
||||
|
||||
"""
|
||||
<code>(package private) <a href="RepTypeUseA.html" title="annotation in typeanno\
|
||||
@ -688,9 +688,9 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepT\
|
||||
ypeUseB</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeU\
|
||||
seB</a> java.lang.String</code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#test3(\
|
||||
)">test3</a></span>()</code>""",
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#t\
|
||||
est3()">test3</a></span>()</code>""",
|
||||
|
||||
"""
|
||||
<code>(package private) <a href="RepAllContextsA.html" title="annotation in type\
|
||||
@ -698,9 +698,9 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
typeannos">@RepAllContextsA</a> <a href="RepAllContextsB.html" title="annotatio\
|
||||
n in typeannos">@RepAllContextsB</a> <a href="RepAllContextsB.html" title="annot\
|
||||
ation in typeannos">@RepAllContextsB</a> java.lang.String</code></div>
|
||||
<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#test4(\
|
||||
)">test4</a></span>()</code>""",
|
||||
<div class="col-second odd-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#te\
|
||||
st4()">test4</a></span>()</code>""",
|
||||
|
||||
"""
|
||||
<code><span class="member-name-link"><a href="#test5(java.lang.String,java.lang.\
|
||||
@ -763,20 +763,27 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
<a href="RepParameterB.html" title="annotation in typeannos">@RepParameterB</a> \
|
||||
<a href="RepParameterB.html" title="annotation in typeannos">@RepParameterB</a>
|
||||
java.lang.String parameter,
|
||||
<a href="RepParameterA.html" title="annotation in typeannos">@RepParameterA</a> <a href="RepParameterA.html" title="annotation in typeannos">@RepParameterA</a> <a href="RepParameterB.html" title="annotation in typeannos">@RepParameterB</a> <a href="RepParameterB.html" title="annotation in typeannos">@RepParameterB</a>
|
||||
java.lang.String <a href="RepTypeUseA.html" title="annotation in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="annotation in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeUseB</a> ... vararg)</span></div>""");
|
||||
<a href="RepParameterA.html" title="annotation in typeannos">@RepParameterA</a>\
|
||||
<a href="RepParameterA.html" title="annotation in typeannos">@RepParameterA</a>\
|
||||
<a href="RepParameterB.html" title="annotation in typeannos">@RepParameterB</a>\
|
||||
<a href="RepParameterB.html" title="annotation in typeannos">@RepParameterB</a>
|
||||
java.lang.String <a href="RepTypeUseA.html" title="annotation in typeannos">@Re\
|
||||
pTypeUseA</a> <a href="RepTypeUseA.html" title="annotation in typeannos">@RepTyp\
|
||||
eUseA</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeUse\
|
||||
B</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeUseB</a\
|
||||
> ... vararg)</span></div>""");
|
||||
|
||||
checkOutput("typeannos/RepeatingOnTypeParametersBoundsTypeArgumentsOnMethod.html", true,
|
||||
"""
|
||||
<code>(package private) <T> java.lang.String</code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-t\
|
||||
able-tab4 method-summary-table"><code><span class="member-name-link"><a href="#g\
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#g\
|
||||
enericMethod(T)">genericMethod</a></span>​(T t)</code>""",
|
||||
|
||||
"""
|
||||
<code>(package private) <T> java.lang.String</code></div>
|
||||
<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#generi\
|
||||
<div class="col-second odd-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#generi\
|
||||
cMethod2(T)">genericMethod2</a></span>​(<a href="RepTypeUseA.html" title="\
|
||||
annotation in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="anno\
|
||||
tation in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotati\
|
||||
@ -785,9 +792,9 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
|
||||
"""
|
||||
<code>(package private) java.lang.String</code></div>
|
||||
<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-\
|
||||
tab4 method-summary-table"><code><span class="member-name-link"><a href="#test()\
|
||||
">test</a></span>()</code>""",
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><span class="member-name-link"><a href="#t\
|
||||
est()">test</a></span>()</code>""",
|
||||
|
||||
"""
|
||||
<span class="return-type">java.lang.String</span> <span class="element-name">test</\
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2003, 2021, 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
|
||||
@ -55,8 +55,8 @@ public class TestTypeParameters extends JavadocTester {
|
||||
|
||||
checkOutput("pkg/C.html", true,
|
||||
"""
|
||||
<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-t\
|
||||
ab4 method-summary-table"><code><W extends java.lang.String,​
|
||||
<div class="col-first odd-row-color method-summary-table method-summary-table-ta\
|
||||
b2 method-summary-table-tab4"><code><W extends java.lang.String,​
|
||||
V extends java.util.List><br>java.lang.Object</code></div>""",
|
||||
"<code><T> java.lang.Object</code>");
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2003, 2021, 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
|
||||
@ -75,9 +75,9 @@ public class TestUnnamedPackage extends JavadocTester {
|
||||
<div class="summary-table two-column-summary">
|
||||
<div class="table-header col-first">Class</div>
|
||||
<div class="table-header col-last">Description</div>
|
||||
<div class="col-first even-row-color all-classes-table-tab2 all-classes-table"><a hre\
|
||||
f="C.html" title="class in <Unnamed>">C</a></div>
|
||||
<div class="col-last even-row-color all-classes-table-tab2 all-classes-table">
|
||||
<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><\
|
||||
a href="C.html" title="class in <Unnamed>">C</a></div>
|
||||
<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
|
||||
<div class="block">This is a class in the unnamed package.</div>
|
||||
</div>
|
||||
</div>""");
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user