1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8204321: javadoc tests fail after JDK-8203780

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Athijegannathan Sundararajan 2018-06-05 23:10:54 +05:30
parent 26b8ea76f5
commit f2a30dcb3e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
View File

@ -399,7 +399,7 @@ public class TestSearch extends JavadocTester {
"<!--[if IE]>\n", "<!--[if IE]>\n",
"<script type=\"text/javascript\" src=\"jquery/jszip-utils/dist/jszip-utils-ie.min.js\"></script>\n", "<script type=\"text/javascript\" src=\"jquery/jszip-utils/dist/jszip-utils-ie.min.js\"></script>\n",
"<![endif]-->\n", "<![endif]-->\n",
"<script type=\"text/javascript\" src=\"jquery/jquery-1.10.2.js\"></script>\n", "<script type=\"text/javascript\" src=\"jquery/jquery-1.12.4.js\"></script>\n",
"<script type=\"text/javascript\" src=\"jquery/jquery-ui.js\"></script>", "<script type=\"text/javascript\" src=\"jquery/jquery-ui.js\"></script>",
"var pathtoroot = \"./\";\n" "var pathtoroot = \"./\";\n"
+ "var useModuleDirectories = " + moduleDirectoriesVar + ";\n" + "var useModuleDirectories = " + moduleDirectoriesVar + ";\n"
@ -591,7 +591,7 @@ public class TestSearch extends JavadocTester {
void checkJqueryAndImageFiles(boolean expectedOutput) { void checkJqueryAndImageFiles(boolean expectedOutput) {
checkFiles(expectedOutput, checkFiles(expectedOutput,
"search.js", "search.js",
"jquery/jquery-1.10.2.js", "jquery/jquery-1.12.4.js",
"jquery/jquery-ui.js", "jquery/jquery-ui.js",
"jquery/jquery-ui.css", "jquery/jquery-ui.css",
"jquery/jquery-ui.min.js", "jquery/jquery-ui.min.js",

2
test/langtools/jdk/javadoc/tool/api/basic/APITest.java
View File

@ -198,7 +198,7 @@ class APITest {
"help-doc.html", "help-doc.html",
"index-all.html", "index-all.html",
"index.html", "index.html",
"jquery/jquery-1.10.2.js", "jquery/jquery-1.12.4.js",
"jquery/jquery-ui.js", "jquery/jquery-ui.js",
"jquery/jquery-ui.css", "jquery/jquery-ui.css",
"jquery/jquery-ui.min.js", "jquery/jquery-ui.min.js",

2
test/langtools/tools/javadoc/api/basic/APITest.java
View File

@ -198,7 +198,7 @@ class APITest {
"help-doc.html", "help-doc.html",
"index-all.html", "index-all.html",
"index.html", "index.html",
"jquery/jquery-1.10.2.js", "jquery/jquery-1.12.4.js",
"jquery/jquery-ui.js", "jquery/jquery-ui.js",
"jquery/jquery-ui.css", "jquery/jquery-ui.css",
"jquery/jquery-ui.min.js", "jquery/jquery-ui.min.js",