4b01aa4f71
Reviewed-by: jjg
143 lines
7.8 KiB
Java
143 lines
7.8 KiB
Java
/*
|
|
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
*
|
|
* This code is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License version 2 only, as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This code is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
* version 2 for more details (a copy is included in the LICENSE file that
|
|
* accompanied this code).
|
|
*
|
|
* You should have received a copy of the GNU General Public License version
|
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
* or visit www.oracle.com if you need additional information or have any
|
|
* questions.
|
|
*/
|
|
|
|
/*
|
|
* @test
|
|
* @bug 8214126
|
|
* @summary Method signatures not formatted correctly in browser
|
|
* @library ../../lib/
|
|
* @modules jdk.javadoc/jdk.javadoc.internal.tool
|
|
* @build javadoc.tester.*
|
|
* @run main TestMethodSignature
|
|
*/
|
|
|
|
import javadoc.tester.JavadocTester;
|
|
|
|
public class TestMethodSignature extends JavadocTester {
|
|
|
|
public static void main(String... args) throws Exception {
|
|
TestMethodSignature tester = new TestMethodSignature();
|
|
tester.runTests();
|
|
}
|
|
|
|
@Test
|
|
public void test() {
|
|
javadoc("-d", "out",
|
|
"-sourcepath", testSrc,
|
|
"pkg");
|
|
checkExit(Exit.OK);
|
|
|
|
checkOutput("pkg/C.html", true,
|
|
"<div class=\"memberSignature\"><span class=\"annotations\">"
|
|
+ "@Generated(\"GeneratedConstructor\")\n"
|
|
+ "</span><span class=\"modifiers\">public</span> "
|
|
+ "<span class=\"memberName\">C</span>()</div>",
|
|
|
|
"<div class=\"memberSignature\"><span class=\"modifiers\">public static</span>"
|
|
+ " <span class=\"returnType\">void</span> <span class=\"memberName\">"
|
|
+ "simpleMethod</span>​(<span class=\"arguments\">int i,\n"
|
|
+ "java.lang.String s,\nboolean b)</span></div>",
|
|
|
|
"<div class=\"memberSignature\"><span class=\"annotations\">@Generated"
|
|
+ "(value=\"SomeGeneratedName\",\n date=\"a date\",\n"
|
|
+ " comments=\"some comment about the method below\")\n"
|
|
+ "</span><span class=\"modifiers\">public static</span> <span "
|
|
+ "class=\"returnType\">void</span> <span class=\"memberName\">annotatedMethod"
|
|
+ "</span>​(<span class=\"arguments\">int i,\n"
|
|
+ "java.lang.String s,\nboolean b)</span></div>",
|
|
|
|
"<div class=\"memberSignature\"><span class=\"modifiers\">public static</span>"
|
|
+ " <span class=\"typeParametersLong\"><T1 extends java.lang.AutoCloseable,​\n"
|
|
+ "T2 extends java.lang.AutoCloseable,​\n"
|
|
+ "T3 extends java.lang.AutoCloseable,​\n"
|
|
+ "T4 extends java.lang.AutoCloseable,​\n"
|
|
+ "T5 extends java.lang.AutoCloseable,​\n"
|
|
+ "T6 extends java.lang.AutoCloseable,​\n"
|
|
+ "T7 extends java.lang.AutoCloseable,​\n"
|
|
+ "T8 extends java.lang.AutoCloseable></span>\n"
|
|
+ "<span class=\"returnType\"><a href=\"C.With8Types.html\" "
|
|
+ "title=\"class in pkg\">C.With8Types</a><T1,​T2,​T3,"
|
|
+ "​T4,​T5,​T6,​T7,​T8></span> "
|
|
+ "<span class=\"memberName\">bigGenericMethod</span>​("
|
|
+ "<span class=\"arguments\"><a href=\"C.F0.html\" "
|
|
+ "title=\"interface in pkg\">C.F0</a><? extends T1> t1,\n"
|
|
+ "<a href=\"C.F0.html\" title=\"interface in pkg\">"
|
|
+ "C.F0</a><? extends T2> t2,\n"
|
|
+ "<a href=\"C.F0.html\" title=\"interface in pkg\">"
|
|
+ "C.F0</a><? extends T3> t3,\n"
|
|
+ "<a href=\"C.F0.html\" title=\"interface in pkg\">"
|
|
+ "C.F0</a><? extends T4> t4,\n"
|
|
+ "<a href=\"C.F0.html\" title=\"interface in pkg\">"
|
|
+ "C.F0</a><? extends T5> t5,\n"
|
|
+ "<a href=\"C.F0.html\" title=\"interface in pkg\">"
|
|
+ "C.F0</a><? extends T6> t6,\n"
|
|
+ "<a href=\"C.F0.html\" title=\"interface in pkg\">"
|
|
+ "C.F0</a><? extends T7> t7,\n"
|
|
+ "<a href=\"C.F0.html\" title=\"interface in pkg\">"
|
|
+ "C.F0</a><? extends T8> t8)</span>\n"
|
|
+ " "
|
|
+ "throws <span class=\"exceptions\">java.lang.IllegalArgumentException,\n"
|
|
+ "java.lang.IllegalStateException</span></div>",
|
|
|
|
"<div class=\"memberSignature\"><span class=\"annotations\">"
|
|
+ "@Generated(value=\"SomeGeneratedName\",\n"
|
|
+ " date=\"a date\",\n"
|
|
+ " comments=\"some comment about the method below\")\n"
|
|
+ "</span><span class=\"modifiers\">public static</span> "
|
|
+ "<span class=\"typeParametersLong\">"
|
|
+ "<T1 extends java.lang.AutoCloseable,​\n"
|
|
+ "T2 extends java.lang.AutoCloseable,​\n"
|
|
+ "T3 extends java.lang.AutoCloseable,​\n"
|
|
+ "T4 extends java.lang.AutoCloseable,​\n"
|
|
+ "T5 extends java.lang.AutoCloseable,​\n"
|
|
+ "T6 extends java.lang.AutoCloseable,​\n"
|
|
+ "T7 extends java.lang.AutoCloseable,​\n"
|
|
+ "T8 extends java.lang.AutoCloseable></span>\n"
|
|
+ "<span class=\"returnType\"><a href=\"C.With8Types.html\" "
|
|
+ "title=\"class in pkg\">C.With8Types</a><T1,​T2,​T3,"
|
|
+ "​T4,​T5,​T6,​T7,​T8></span> "
|
|
+ "<span class=\"memberName\">bigGenericAnnotatedMethod</span>​("
|
|
+ "<span class=\"arguments\"><a href=\"C.F0.html\" "
|
|
+ "title=\"interface in pkg\">C.F0</a><? extends T1> t1,\n"
|
|
+ "<a href=\"C.F0.html\" title=\"interface in pkg\">"
|
|
+ "C.F0</a><? extends T2> t2,\n"
|
|
+ "<a href=\"C.F0.html\" title=\"interface in pkg\">"
|
|
+ "C.F0</a><? extends T3> t3,\n"
|
|
+ "<a href=\"C.F0.html\" title=\"interface in pkg\">"
|
|
+ "C.F0</a><? extends T4> t4,\n"
|
|
+ "<a href=\"C.F0.html\" title=\"interface in pkg\">"
|
|
+ "C.F0</a><? extends T5> t5,\n"
|
|
+ "<a href=\"C.F0.html\" title=\"interface in pkg\">"
|
|
+ "C.F0</a><? extends T6> t6,\n"
|
|
+ "<a href=\"C.F0.html\" title=\"interface in pkg\">"
|
|
+ "C.F0</a><? extends T7> t7,\n"
|
|
+ "<a href=\"C.F0.html\" title=\"interface in pkg\">"
|
|
+ "C.F0</a><? extends T8> t8)</span>\n"
|
|
+ " "
|
|
+ "throws <span class=\"exceptions\">java.lang.IllegalArgumentException,\n"
|
|
+ "java.lang.IllegalStateException</span></div>\n"
|
|
+ "<div class=\"block\">Generic method with eight type args and annotation.</div>");
|
|
|
|
}
|
|
}
|