mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-16 17:14:41 +02:00
8061305: Javadoc crashes when method name ends with "Property"
Reviewed-by: jjg
This commit is contained in:
Kumar Srinivasan
parent
10d96d7aec
commit
60b8135982
5 changed files with 168 additions and 37 deletions
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
/*
|
||||
* @test
|
||||
* @bug 7112427 8012295 8025633 8026567
|
||||
* @bug 7112427 8012295 8025633 8026567 8061305
|
||||
* @summary Test of the JavaFX doclet features.
|
||||
* @author jvalenta
|
||||
* @library ../lib
|
||||
|
|
@ -39,44 +39,143 @@ public class TestJavaFX extends JavadocTester {
|
|||
}
|
||||
|
||||
@Test
|
||||
void test() {
|
||||
javadoc("-d", "out",
|
||||
void test1() {
|
||||
javadoc("-d", "out1",
|
||||
"-sourcepath", testSrc,
|
||||
"-javafx",
|
||||
testSrc("C.java"), testSrc("D.java"));
|
||||
checkExit(Exit.FAILED); // should be EXIT_OK -- need to fix C.java
|
||||
"-package",
|
||||
"pkg1");
|
||||
checkExit(Exit.OK);
|
||||
|
||||
checkOutput("C.html", true,
|
||||
checkOutput("pkg1/C.html", true,
|
||||
"<dt><span class=\"seeLabel\">See Also:</span></dt>\n"
|
||||
+ "<dd><a href=\"C.html#getRate--\"><code>getRate()</code></a>, \n"
|
||||
+ "<a href=\"C.html#setRate-double-\"><code>setRate(double)</code></a></dd>",
|
||||
+ "<dd><a href=\"../pkg1/C.html#getRate--\"><code>getRate()</code></a>, \n"
|
||||
+ "<a href=\"../pkg1/C.html#setRate-double-\">"
|
||||
+ "<code>setRate(double)</code></a></dd>",
|
||||
"<pre>public final void setRate(double value)</pre>\n"
|
||||
+ "<div class=\"block\">Sets the value of the property rate.</div>\n"
|
||||
+ "<dl>\n"
|
||||
+ "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>",
|
||||
+ "<div class=\"block\">Sets the value of the property rate.</div>\n"
|
||||
+ "<dl>\n"
|
||||
+ "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>",
|
||||
"<pre>public final double getRate()</pre>\n"
|
||||
+ "<div class=\"block\">Gets the value of the property rate.</div>\n"
|
||||
+ "<dl>\n"
|
||||
+ "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>",
|
||||
"<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"C.html#rateProperty\">rate</a></span></code>\n"
|
||||
+ "<div class=\"block\">Defines the direction/speed at which the <code>Timeline</code> is expected to",
|
||||
+ "<div class=\"block\">Gets the value of the property rate.</div>\n"
|
||||
+ "<dl>\n"
|
||||
+ "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>",
|
||||
"<td class=\"colLast\"><code><span class=\"memberNameLink\">"
|
||||
+ "<a href=\"../pkg1/C.html#rateProperty\">rate</a></span></code>\n"
|
||||
+ "<div class=\"block\">Defines the direction/speed at which the "
|
||||
+ "<code>Timeline</code> is expected to",
|
||||
"<span class=\"simpleTagLabel\">Default value:</span>",
|
||||
"<span class=\"simpleTagLabel\">Since:</span></dt>\n"
|
||||
+ "<dd>JavaFX 8.0</dd>",
|
||||
+ "<dd>JavaFX 8.0</dd>",
|
||||
"<p>Sets the value of the property <code>Property</code>",
|
||||
"<p>Gets the value of the property <code>Property</code>",
|
||||
"<span class=\"simpleTagLabel\">Property description:</span>",
|
||||
"<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"C.html#setTestMethodProperty--\">setTestMethodProperty</a></span>()</code> </td>",
|
||||
"<td class=\"colLast\"><code><span class=\"memberNameLink\">"
|
||||
+ "<a href=\"../pkg1/C.html#setTestMethodProperty--\">"
|
||||
+ "setTestMethodProperty</a></span>()</code> </td>",
|
||||
"<h4>isPaused</h4>\n"
|
||||
+ "<pre>public final double isPaused()</pre>\n"
|
||||
+ "<div class=\"block\">Gets the value of the property paused.</div>");
|
||||
+ "<pre>public final double isPaused()</pre>\n"
|
||||
+ "<div class=\"block\">Gets the value of the property paused.</div>");
|
||||
|
||||
checkOutput("C.html", false,
|
||||
checkOutput("pkg1/C.html", false,
|
||||
"A()");
|
||||
|
||||
checkOutput("D.html", true,
|
||||
"<h3>Properties inherited from class <a href=\"C.html\" title=\"class in <Unnamed>\">C</a></h3>\n"
|
||||
+ "<code><a href=\"C.html#pausedProperty\">paused</a>, <a href=\"C.html#rateProperty\">rate</a></code></li>");
|
||||
checkOutput("pkg1/D.html", true,
|
||||
"<h3>Properties inherited from class pkg1."
|
||||
+ "<a href=\"../pkg1/C.html\" title=\"class in pkg1\">C</a></h3>\n"
|
||||
+ "<code><a href=\"../pkg1/C.html#pausedProperty\">"
|
||||
+ "paused</a>, <a href=\"../pkg1/C.html#rateProperty\">rate</a></code></li>");
|
||||
}
|
||||
/*
|
||||
* Test with -javafx option enabled, to ensure property getters and setters
|
||||
* are treated correctly.
|
||||
*/
|
||||
@Test
|
||||
void test2() {
|
||||
javadoc("-d", "out2a",
|
||||
"-sourcepath", testSrc,
|
||||
"-javafx",
|
||||
"-package",
|
||||
"pkg2");
|
||||
checkExit(Exit.OK);
|
||||
checkOutput("pkg2/Test.html", true,
|
||||
"<li class=\"blockList\"><a name=\"property.detail\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
+ "<h3>Property Detail</h3>\n"
|
||||
+ "<a name=\"betaProperty\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
+ "<ul class=\"blockList\">\n"
|
||||
+ "<li class=\"blockList\">\n"
|
||||
+ "<h4>beta</h4>\n"
|
||||
+ "<pre>public java.lang.Object betaProperty</pre>\n"
|
||||
+ "</li>\n"
|
||||
+ "</ul>\n"
|
||||
+ "<a name=\"gammaProperty\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
+ "<ul class=\"blockList\">\n"
|
||||
+ "<li class=\"blockList\">\n"
|
||||
+ "<h4>gamma</h4>\n"
|
||||
+ "<pre>public final java.util.List<"
|
||||
+ "java.lang.String> gammaProperty</pre>\n"
|
||||
+ "</li>\n"
|
||||
+ "</ul>\n"
|
||||
+ "<a name=\"deltaProperty\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
+ "<ul class=\"blockListLast\">\n"
|
||||
+ "<li class=\"blockList\">\n"
|
||||
+ "<h4>delta</h4>\n"
|
||||
+ "<pre>public final java.util.List<"
|
||||
+ "java.util.Set<? super java.lang.Object>> deltaProperty</pre>\n"
|
||||
+ "</li>\n"
|
||||
+ "</ul>\n"
|
||||
+ "</li>");
|
||||
}
|
||||
/*
|
||||
* Test without -javafx option, to ensure property getters and setters
|
||||
* are treated just like any other java method.
|
||||
*/
|
||||
@Test
|
||||
void test3() {
|
||||
javadoc("-d", "out2b",
|
||||
"-sourcepath", testSrc,
|
||||
"-package",
|
||||
"pkg2");
|
||||
checkExit(Exit.OK);
|
||||
checkOutput("pkg2/Test.html", false, "<h3>Property Summary</h3>");
|
||||
checkOutput("pkg2/Test.html", true,
|
||||
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
|
||||
+ "<th class=\"colLast\" scope=\"col\">Method and Description</th>\n"
|
||||
+ "</tr>\n"
|
||||
+ "<tr id=\"i0\" class=\"altColor\">\n"
|
||||
+ "<td class=\"colFirst\"><code><T> java.lang.Object</code></td>\n"
|
||||
+ "<td class=\"colLast\"><code><span class=\"memberNameLink\">"
|
||||
+ "<a href=\"../pkg2/Test.html#alphaProperty-java.util.List-\">"
|
||||
+ "alphaProperty</a></span>(java.util.List<T> foo)</code> </td>\n"
|
||||
+ "</tr>\n"
|
||||
+ "<tr id=\"i1\" class=\"rowColor\">\n"
|
||||
+ "<td class=\"colFirst\"><code>java.lang.Object</code></td>\n"
|
||||
+ "<td class=\"colLast\"><code><span class=\"memberNameLink\">"
|
||||
+ "<a href=\"../pkg2/Test.html#betaProperty--\">betaProperty</a></span>()</code>"
|
||||
+ " </td>\n"
|
||||
+ "</tr>\n"
|
||||
+ "<tr id=\"i2\" class=\"altColor\">\n"
|
||||
+ "<td class=\"colFirst\"><code>"
|
||||
+ "java.util.List<java.util.Set<? super java.lang.Object>>"
|
||||
+ "</code></td>\n"
|
||||
+ "<td class=\"colLast\"><code><span class=\"memberNameLink\">"
|
||||
+ "<a href=\"../pkg2/Test.html#deltaProperty--\">"
|
||||
+ "deltaProperty</a></span>()</code> </td>\n"
|
||||
+ "</tr>\n"
|
||||
+ "<tr id=\"i3\" class=\"rowColor\">\n"
|
||||
+ "<td class=\"colFirst\"><code>java.util.List<java.lang.String>"
|
||||
+ "</code></td>\n"
|
||||
+ "<td class=\"colLast\"><code><span class=\"memberNameLink\">"
|
||||
+ "<a href=\"../pkg2/Test.html#gammaProperty--\">gammaProperty</a>"
|
||||
+ "</span>()</code> </td>"
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue