changeset 3924:ef142ac9824e

8173419: Javadoc fix 8166175 results in test failures Reviewed-by: jjg, ksrini
author bpatel
date Thu, 26 Jan 2017 16:53:56 -0800
parents 86efeea0e59f
children 37c0e34e835c
files test/jdk/javadoc/tool/api/basic/APITest.java test/tools/javadoc/api/basic/APITest.java
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/test/jdk/javadoc/tool/api/basic/APITest.java	Thu Jan 26 14:35:04 2017 -0800
+++ b/test/jdk/javadoc/tool/api/basic/APITest.java	Thu Jan 26 16:53:56 2017 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, 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
@@ -224,9 +224,11 @@
             "jquery/images/ui-icons_222222_256x240.png",
             "jquery/images/ui-bg_glass_75_e6e6e6_1x400.png",
             "jquery/images/ui-bg_flat_75_ffffff_40x100.png",
+            "member-search-index.js",
             "member-search-index.zip",
             "overview-tree.html",
             "package-list",
+            "package-search-index.js",
             "package-search-index.zip",
             "pkg/C.html",
             "pkg/package-frame.html",
@@ -237,12 +239,13 @@
             "script.js",
             "search.js",
             "stylesheet.css",
+            "type-search-index.js",
             "type-search-index.zip"
     ));
 
     protected static Set<String> noIndexFiles = standardExpectFiles.stream()
             .filter(s -> !s.startsWith("jquery") && !s.startsWith("resources") && !s.endsWith("zip")
-                    && !s.equals("index-all.html") && !s.equals("search.js"))
+                    && !s.equals("index-all.html") && !s.equals("search.js") && !s.endsWith("-search-index.js"))
             .collect(Collectors.toSet());
 }
 
--- a/test/tools/javadoc/api/basic/APITest.java	Thu Jan 26 14:35:04 2017 -0800
+++ b/test/tools/javadoc/api/basic/APITest.java	Thu Jan 26 16:53:56 2017 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, 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
@@ -224,9 +224,11 @@
             "jquery/images/ui-icons_222222_256x240.png",
             "jquery/images/ui-bg_glass_75_e6e6e6_1x400.png",
             "jquery/images/ui-bg_flat_75_ffffff_40x100.png",
+            "member-search-index.js",
             "member-search-index.zip",
             "overview-tree.html",
             "package-list",
+            "package-search-index.js",
             "package-search-index.zip",
             "pkg/C.html",
             "pkg/package-frame.html",
@@ -237,12 +239,13 @@
             "script.js",
             "search.js",
             "stylesheet.css",
+            "type-search-index.js",
             "type-search-index.zip"
     ));
 
     protected static Set<String> noIndexFiles = standardExpectFiles.stream()
             .filter(s -> !s.startsWith("jquery") && !s.startsWith("resources") && !s.endsWith("zip")
-                    && !s.equals("index-all.html") && !s.equals("search.js"))
+                    && !s.equals("index-all.html") && !s.equals("search.js") && !s.endsWith("-search-index.js"))
             .collect(Collectors.toSet());
 }