--- a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java Tue Jan 29 15:19:43 2019 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java Wed Jan 30 16:39:26 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -176,30 +176,6 @@
checkOutput("pkg1/D.html", false, "shouldNotAppear");
}
- @Test
- public void test1_html4() {
- javadoc("-d", "out1-html4",
- "-html4",
- "-sourcepath", testSrc,
- "-javafx",
- "--disable-javafx-strict-checks",
- "-package",
- "pkg1");
- checkExit(Exit.OK);
-
- checkOutput("pkg1/C.html", true,
- "<dt><span class=\"seeLabel\">See Also:</span></dt>\n"
- + "<dd><a href=\"#getRate--\"><code>getRate()</code></a>, \n"
- + "<a href=\"#setRate-double-\">"
- + "<code>setRate(double)</code></a></dd>",
- "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
- + "<a href=\"#setTestMethodProperty--\">"
- + "setTestMethodProperty</a></span>()</code></th>",
- "<h3>Property Summary</h3>\n"
- + "<div class=\"memberSummary\">\n<table summary=\"Property Summary table, listing properties, and an explanation\">\n"
- + "<caption><span>Properties</span><span class=\"tabEnd\"> </span></caption>");
- }
-
/*
* Test with -javafx option enabled, to ensure property getters and setters
* are treated correctly.
@@ -263,53 +239,6 @@
+ " onclick=\"show(8);\">Concrete Methods</button></div>");
}
- @Test
- public void test2_html4() {
- javadoc("-d", "out2a-html4",
- "-html4",
- "-sourcepath", testSrc,
- "-javafx",
- "--disable-javafx-strict-checks",
- "-package",
- "pkg2");
- checkExit(Exit.OK);
- checkOutput("pkg2/Test.html", true,
- "<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>\n"
- + "</ul>",
- "<h3>Property Summary</h3>\n"
- + "<div class=\"memberSummary\">\n<table summary=\"Property Summary table, listing properties, and an explanation\">\n"
- + "<caption><span>Properties</span><span class=\"tabEnd\"> </span></caption>");
- }
-
/*
* Test without -javafx option, to ensure property getters and setters
* are treated just like any other java method.
@@ -356,48 +285,6 @@
);
}
- @Test
- public void test3_html4() {
- javadoc("-d", "out2b-html4",
- "-html4",
- "-sourcepath", testSrc,
- "-package",
- "pkg2");
- checkExit(Exit.OK);
- checkOutput("pkg2/Test.html", true,
- "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
- + "<th class=\"colSecond\" scope=\"col\">Method</th>\n"
- + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>\n"
- + "<tbody>\n"
- + "<tr class=\"altColor\" id=\"i0\">\n"
- + "<td class=\"colFirst\"><code><T> java.lang.Object</code></td>\n"
- + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
- + "<a href=\"#alphaProperty-java.util.List-\">alphaProperty</a>"
- + "</span>​(java.util.List<T> foo)</code></th>\n"
- + "<td class=\"colLast\"> </td>\n"
- + "</tr>\n"
- + "<tr class=\"rowColor\" id=\"i1\">\n"
- + "<td class=\"colFirst\"><code>java.lang.Object</code></td>\n"
- + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
- + "<a href=\"#betaProperty--\">betaProperty</a></span>()</code></th>\n"
- + "<td class=\"colLast\"> </td>\n"
- + "</tr>\n"
- + "<tr class=\"altColor\" id=\"i2\">\n"
- + "<td class=\"colFirst\"><code>java.util.List<java.util.Set<? super java.lang.Object>>"
- + "</code></td>\n"
- + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
- + "<a href=\"#deltaProperty--\">deltaProperty</a></span>()</code></th>\n"
- + "<td class=\"colLast\"> </td>\n"
- + "</tr>\n"
- + "<tr class=\"rowColor\" id=\"i3\">\n"
- + "<td class=\"colFirst\"><code>java.util.List<java.lang.String></code></td>\n"
- + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
- + "<a href=\"#gammaProperty--\">gammaProperty</a></span>()</code></th>\n"
- + "<td class=\"colLast\"> </td>"
- );
- }
-
/*
* Force the doclet to emit a warning when processing a synthesized,
* DocComment, and ensure that the run succeeds, using the newer