# HG changeset patch # User bpatel # Date 1485478436 28800 # Node ID 94b42093a2b29e4649b5c3580cf98dcecc15a94b # Parent 4b28b3f27a64c35a854f49bcc9a15286ff76a42d 8173419: Javadoc fix 8166175 results in test failures Reviewed-by: jjg, ksrini diff -r 4b28b3f27a64 -r 94b42093a2b2 langtools/test/jdk/javadoc/tool/api/basic/APITest.java --- a/langtools/test/jdk/javadoc/tool/api/basic/APITest.java Thu Jan 26 14:35:04 2017 -0800 +++ b/langtools/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 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()); } diff -r 4b28b3f27a64 -r 94b42093a2b2 langtools/test/tools/javadoc/api/basic/APITest.java --- a/langtools/test/tools/javadoc/api/basic/APITest.java Thu Jan 26 14:35:04 2017 -0800 +++ b/langtools/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 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()); }