author | hannesw |
Tue, 24 Sep 2019 11:49:48 +0200 | |
changeset 58286 | e4d90117c5de |
parent 54619 | b43cc3b9ef40 |
permissions | -rw-r--r-- |
54619
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
1 |
/* |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
2 |
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
4 |
* |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
8 |
* |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
13 |
* accompanied this code). |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
14 |
* |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
18 |
* |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
21 |
* questions. |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
22 |
*/ |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
23 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
24 |
/* |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
25 |
* @test |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
26 |
* @bug 8178982 8220497 8210683 |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
27 |
* @summary Test the search feature of javadoc. |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
28 |
* @library ../../lib |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
29 |
* @modules jdk.javadoc/jdk.javadoc.internal.tool |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
30 |
* @build javadoc.tester.* |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
31 |
* @run main TestSearchScript |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
32 |
*/ |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
33 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
34 |
import javadoc.tester.JavadocTester; |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
35 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
36 |
import javax.script.Invocable; |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
37 |
import javax.script.ScriptEngine; |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
38 |
import javax.script.ScriptEngineManager; |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
39 |
import javax.script.ScriptException; |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
40 |
import java.io.BufferedReader; |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
41 |
import java.io.File; |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
42 |
import java.io.FileReader; |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
43 |
import java.io.IOException; |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
44 |
import java.util.List; |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
45 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
46 |
/* |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
47 |
* Tests for the search feature using Nashorn JavaScript engine. |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
48 |
*/ |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
49 |
public class TestSearchScript extends JavadocTester { |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
50 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
51 |
public static void main(String... args) throws Exception { |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
52 |
TestSearchScript tester = new TestSearchScript(); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
53 |
tester.runTests(); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
54 |
} |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
55 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
56 |
private Invocable getEngine() throws ScriptException, IOException, NoSuchMethodException { |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
57 |
ScriptEngineManager engineManager = new ScriptEngineManager(); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
58 |
ScriptEngine engine = engineManager.getEngineByName("nashorn"); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
59 |
engine.eval(new BufferedReader(new FileReader(new File(testSrc, "javadoc-search.js")))); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
60 |
Invocable inv = (Invocable) engine; |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
61 |
inv.invokeFunction("loadIndexFiles", outputDir.getAbsolutePath()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
62 |
return inv; |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
63 |
} |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
64 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
65 |
@Test |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
66 |
public void testModuleSearch() throws ScriptException, IOException, NoSuchMethodException { |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
67 |
javadoc("-d", "out-full", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
68 |
"-Xdoclint:none", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
69 |
"-use", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
70 |
"--module-source-path", testSrc, |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
71 |
"--module", "mapmodule", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
72 |
"mappkg", "mappkg.impl"); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
73 |
checkExit(Exit.OK); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
74 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
75 |
Invocable inv = getEngine(); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
76 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
77 |
// exact match, case sensitivity |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
78 |
checkSearch(inv, "mapmodule", List.of("mapmodule")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
79 |
checkSearch(inv, "mappkg", List.of("mapmodule/mappkg", "mapmodule/mappkg.impl", "mappkg.system.property")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
80 |
checkSearch(inv, "Mapmodule", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
81 |
checkSearch(inv, "Mappkg", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
82 |
checkSearch(inv, "mymap", List.of("mappkg.impl.MyMap", "mappkg.impl.MyMap.MyMap()", "mappkg.impl.MyMap.MyMap(Map)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
83 |
checkSearch(inv, "MyMap", List.of("mappkg.impl.MyMap", "mappkg.impl.MyMap.MyMap()", "mappkg.impl.MyMap.MyMap(Map)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
84 |
checkSearch(inv, "mymap(", List.of("mappkg.impl.MyMap.MyMap()", "mappkg.impl.MyMap.MyMap(Map)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
85 |
checkSearch(inv, "MyMap(", List.of("mappkg.impl.MyMap.MyMap()", "mappkg.impl.MyMap.MyMap(Map)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
86 |
checkSearch(inv, "mymap()", List.of("mappkg.impl.MyMap.MyMap()")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
87 |
checkSearch(inv, "MyMap()", List.of("mappkg.impl.MyMap.MyMap()")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
88 |
checkSearch(inv, "Mymap", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
89 |
checkSearch(inv, "Mymap()", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
90 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
91 |
// left boundaries, ranking |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
92 |
checkSearch(inv, "map", List.of("mapmodule", "mapmodule/mappkg", "mapmodule/mappkg.impl", "mappkg.Map", "mappkg.impl.MyMap", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
93 |
"mappkg.impl.MyMap.MyMap()", "mappkg.impl.MyMap.MyMap(Map)", "mappkg.system.property")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
94 |
checkSearch(inv, "Map", List.of("mappkg.Map", "mappkg.impl.MyMap", "mappkg.impl.MyMap.MyMap()", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
95 |
"mappkg.impl.MyMap.MyMap(Map)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
96 |
checkSearch(inv, "MAP", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
97 |
checkSearch(inv, "value", List.of("mappkg.impl.MyMap.OTHER_VALUE", "mappkg.impl.MyMap.some_value")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
98 |
checkSearch(inv, "VALUE", List.of("mappkg.impl.MyMap.OTHER_VALUE")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
99 |
checkSearch(inv, "map.other", List.of("mappkg.impl.MyMap.OTHER_VALUE")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
100 |
checkSearch(inv, "Map.some_", List.of("mappkg.impl.MyMap.some_value")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
101 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
102 |
checkSearch(inv, "Mm", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
103 |
checkSearch(inv, "mym", List.of("mappkg.impl.MyMap", "mappkg.impl.MyMap.MyMap()", "mappkg.impl.MyMap.MyMap(Map)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
104 |
checkSearch(inv, "imp.mym.mym(", List.of("mappkg.impl.MyMap.MyMap()", "mappkg.impl.MyMap.MyMap(Map)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
105 |
checkSearch(inv, "imp.mym.mym(m", List.of("mappkg.impl.MyMap.MyMap(Map)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
106 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
107 |
// camel case |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
108 |
checkSearch(inv, "MM", List.of("mappkg.impl.MyMap", "mappkg.impl.MyMap.MyMap()", "mappkg.impl.MyMap.MyMap(Map)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
109 |
checkSearch(inv, "MyM", List.of("mappkg.impl.MyMap", "mappkg.impl.MyMap.MyMap()", "mappkg.impl.MyMap.MyMap(Map)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
110 |
checkSearch(inv, "Mym", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
111 |
checkSearch(inv, "i.MyM.MyM(", List.of("mappkg.impl.MyMap.MyMap()", "mappkg.impl.MyMap.MyMap(Map)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
112 |
checkSearch(inv, "i.MMa.MMa(", List.of("mappkg.impl.MyMap.MyMap()", "mappkg.impl.MyMap.MyMap(Map)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
113 |
checkSearch(inv, "i.MyM.MyM(Ma", List.of("mappkg.impl.MyMap.MyMap(Map)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
114 |
checkSearch(inv, "i.MMa.MMa(M", List.of("mappkg.impl.MyMap.MyMap(Map)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
115 |
checkSearch(inv, "i.Mym.MyM(", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
116 |
checkSearch(inv, "i.Mym.Ma(", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
117 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
118 |
checkSearch(inv, "mapm", List.of("mapmodule")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
119 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
120 |
// child entity listing |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
121 |
checkSearch(inv, "mapmodule/", List.of("mapmodule/mappkg", "mapmodule/mappkg.impl")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
122 |
checkSearch(inv, "mapmod/", List.of("mapmodule/mappkg", "mapmodule/mappkg.impl")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
123 |
checkSearch(inv, "module/", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
124 |
checkSearch(inv, "le/", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
125 |
checkSearch(inv, "mapmodule.", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
126 |
checkSearch(inv, "mapmod.", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
127 |
checkSearch(inv, "mappkg.", List.of("mapmodule/mappkg.impl", "mappkg.Map", "mappkg.system.property")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
128 |
checkSearch(inv, "mappkg.", List.of("mapmodule/mappkg.impl", "mappkg.Map", "mappkg.system.property")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
129 |
checkSearch(inv, "Map.", List.of("mappkg.Map.contains(Object)", "mappkg.Map.get(Object)", "mappkg.Map.iterate()", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
130 |
"mappkg.Map.put(Object, Object)", "mappkg.Map.remove(Object)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
131 |
"mappkg.impl.MyMap.contains(Object)", "mappkg.impl.MyMap.get(Object)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
132 |
"mappkg.impl.MyMap.iterate()", "mappkg.impl.MyMap.MyMap()", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
133 |
"mappkg.impl.MyMap.MyMap(Map)", "mappkg.impl.MyMap.OTHER_VALUE", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
134 |
"mappkg.impl.MyMap.put(Object, Object)", "mappkg.impl.MyMap.remove(Object)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
135 |
"mappkg.impl.MyMap.some_value")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
136 |
checkSearch(inv, "mym.", List.of("mappkg.impl.MyMap.contains(Object)", "mappkg.impl.MyMap.get(Object)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
137 |
"mappkg.impl.MyMap.iterate()", "mappkg.impl.MyMap.MyMap()", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
138 |
"mappkg.impl.MyMap.MyMap(Map)", "mappkg.impl.MyMap.OTHER_VALUE", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
139 |
"mappkg.impl.MyMap.put(Object, Object)", "mappkg.impl.MyMap.remove(Object)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
140 |
"mappkg.impl.MyMap.some_value")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
141 |
checkSearch(inv, "MyMap.i", List.of("mappkg.impl.MyMap.iterate()")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
142 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
143 |
// system properties |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
144 |
checkSearch(inv, "mappkg.system.property", List.of("mappkg.system.property")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
145 |
checkSearch(inv, "system.property", List.of("mappkg.system.property")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
146 |
checkSearch(inv, "property", List.of("mappkg.system.property")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
147 |
checkSearch(inv, "sys.prop", List.of("mappkg.system.property")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
148 |
checkSearch(inv, "m.s.p", List.of("mappkg.system.property")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
149 |
checkSearch(inv, "operty", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
150 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
151 |
// search tag |
58286
e4d90117c5de
8231122: @index tag with newline causes tag search to fail
hannesw
parents:
54619
diff
changeset
|
152 |
checkSearch(inv, "search tag", List.of("multiline search tag", "search tag")); |
e4d90117c5de
8231122: @index tag with newline causes tag search to fail
hannesw
parents:
54619
diff
changeset
|
153 |
checkSearch(inv, "search tag", List.of("multiline search tag", "search tag")); |
e4d90117c5de
8231122: @index tag with newline causes tag search to fail
hannesw
parents:
54619
diff
changeset
|
154 |
checkSearch(inv, "search ", List.of("multiline search tag", "search tag")); |
e4d90117c5de
8231122: @index tag with newline causes tag search to fail
hannesw
parents:
54619
diff
changeset
|
155 |
checkSearch(inv, "tag", List.of("multiline search tag", "search tag")); |
e4d90117c5de
8231122: @index tag with newline causes tag search to fail
hannesw
parents:
54619
diff
changeset
|
156 |
checkSearch(inv, "sea", List.of("multiline search tag", "search tag")); |
e4d90117c5de
8231122: @index tag with newline causes tag search to fail
hannesw
parents:
54619
diff
changeset
|
157 |
checkSearch(inv, "multi", List.of("multiline search tag")); |
54619
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
158 |
checkSearch(inv, "ear", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
159 |
} |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
160 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
161 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
162 |
@Test |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
163 |
public void testPackageSource() throws ScriptException, IOException, NoSuchMethodException { |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
164 |
javadoc("-d", "out-overload", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
165 |
"-Xdoclint:none", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
166 |
"-use", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
167 |
"-sourcepath", testSrc, |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
168 |
"listpkg"); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
169 |
checkExit(Exit.OK); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
170 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
171 |
Invocable inv = getEngine(); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
172 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
173 |
// exact match, case sensitvity, left boundaries |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
174 |
checkSearch(inv, "list", List.of("listpkg", "listpkg.List", "listpkg.ListProvider", "listpkg.MyList", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
175 |
"listpkg.MyListFactory", "listpkg.ListProvider.ListProvider()", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
176 |
"listpkg.MyListFactory.createList(ListProvider, MyListFactory)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
177 |
"listpkg.ListProvider.makeNewList()", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
178 |
"listpkg.MyList.MyList()", "listpkg.MyListFactory.MyListFactory()")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
179 |
checkSearch(inv, "List", List.of("listpkg.List", "listpkg.ListProvider", "listpkg.MyList", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
180 |
"listpkg.MyListFactory", "listpkg.ListProvider.ListProvider()", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
181 |
"listpkg.MyListFactory.createList(ListProvider, MyListFactory)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
182 |
"listpkg.ListProvider.makeNewList()", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
183 |
"listpkg.MyList.MyList()", "listpkg.MyListFactory.MyListFactory()")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
184 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
185 |
// partial match |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
186 |
checkSearch(inv, "fact", List.of("listpkg.MyListFactory", "listpkg.MyListFactory.MyListFactory()")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
187 |
checkSearch(inv, "pro", List.of("listpkg.ListProvider", "listpkg.ListProvider.ListProvider()")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
188 |
checkSearch(inv, "listpro", List.of("listpkg.ListProvider", "listpkg.ListProvider.ListProvider()")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
189 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
190 |
// camel case |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
191 |
checkSearch(inv, "l.MLF.cL(LP, MLF)", List.of("listpkg.MyListFactory.createList(ListProvider, MyListFactory)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
192 |
checkSearch(inv, "Fact.creaLi(LiPro,MLiFact)", List.of("listpkg.MyListFactory.createList(ListProvider, MyListFactory)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
193 |
checkSearch(inv, "(LP,ML", List.of("listpkg.MyListFactory.createList(ListProvider, MyListFactory)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
194 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
195 |
// ranking of overloaded methods JDK-8210683 |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
196 |
checkSearch(inv, "list.of", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
197 |
List.of("listpkg.List.of()", "listpkg.List.of(E)", "listpkg.List.of(E, E)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
198 |
"listpkg.List.of(E, E, E)", "listpkg.List.of(E, E, E, E)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
199 |
"listpkg.List.of(E, E, E, E, E)", "listpkg.List.of(E...)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
200 |
checkSearch(inv, "Li.of", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
201 |
List.of("listpkg.List.of()", "listpkg.List.of(E)", "listpkg.List.of(E, E)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
202 |
"listpkg.List.of(E, E, E)", "listpkg.List.of(E, E, E, E)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
203 |
"listpkg.List.of(E, E, E, E, E)", "listpkg.List.of(E...)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
204 |
checkSearch(inv, "li.Li.o", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
205 |
List.of("listpkg.List.of()", "listpkg.List.of(E)", "listpkg.List.of(E, E)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
206 |
"listpkg.List.of(E, E, E)", "listpkg.List.of(E, E, E, E)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
207 |
"listpkg.List.of(E, E, E, E, E)", "listpkg.List.of(E...)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
208 |
checkSearch(inv, "l.l.o", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
209 |
List.of("listpkg.List.of()", "listpkg.List.of(E)", "listpkg.List.of(E, E)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
210 |
"listpkg.List.of(E, E, E)", "listpkg.List.of(E, E, E, E)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
211 |
"listpkg.List.of(E, E, E, E, E)", "listpkg.List.of(E...)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
212 |
checkSearch(inv, "L.l.o", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
213 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
214 |
// whitespace |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
215 |
checkSearch(inv, "(e,e,e", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
216 |
List.of("listpkg.List.of(E, E, E)", "listpkg.List.of(E, E, E, E)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
217 |
"listpkg.List.of(E, E, E, E, E)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
218 |
checkSearch(inv, "(e, e,e", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
219 |
List.of("listpkg.List.of(E, E, E)", "listpkg.List.of(E, E, E, E)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
220 |
"listpkg.List.of(E, E, E, E, E)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
221 |
checkSearch(inv, "(e, e, e", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
222 |
List.of("listpkg.List.of(E, E, E)", "listpkg.List.of(E, E, E, E)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
223 |
"listpkg.List.of(E, E, E, E, E)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
224 |
checkSearch(inv, "(e, e, e", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
225 |
List.of("listpkg.List.of(E, E, E)", "listpkg.List.of(E, E, E, E)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
226 |
"listpkg.List.of(E, E, E, E, E)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
227 |
checkSearch(inv, "(e, e, e ,", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
228 |
List.of("listpkg.List.of(E, E, E, E)", "listpkg.List.of(E, E, E, E, E)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
229 |
checkSearch(inv, "(e , e, e,", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
230 |
List.of("listpkg.List.of(E, E, E, E)", "listpkg.List.of(E, E, E, E, E)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
231 |
checkSearch(inv, " listpkg .list .of ", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
232 |
List.of("listpkg.List.of()", "listpkg.List.of(E)", "listpkg.List.of(E, E)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
233 |
"listpkg.List.of(E, E, E)", "listpkg.List.of(E, E, E, E)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
234 |
"listpkg.List.of(E, E, E, E, E)", "listpkg.List.of(E...)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
235 |
checkSearch(inv, " l. l. o", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
236 |
List.of("listpkg.List.of()", "listpkg.List.of(E)", "listpkg.List.of(E, E)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
237 |
"listpkg.List.of(E, E, E)", "listpkg.List.of(E, E, E, E)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
238 |
"listpkg.List.of(E, E, E, E, E)", "listpkg.List.of(E...)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
239 |
checkSearch(inv, "list . of", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
240 |
List.of("listpkg.List.of()", "listpkg.List.of(E)", "listpkg.List.of(E, E)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
241 |
"listpkg.List.of(E, E, E)", "listpkg.List.of(E, E, E, E)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
242 |
"listpkg.List.of(E, E, E, E, E)", "listpkg.List.of(E...)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
243 |
checkSearch(inv, "lis t.of", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
244 |
checkSearch(inv, "list . of(e,e,e,", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
245 |
List.of("listpkg.List.of(E, E, E, E)", "listpkg.List.of(E, E, E, E, E)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
246 |
checkSearch(inv, "l . o (e,e,e,", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
247 |
List.of("listpkg.List.of(E, E, E, E)", "listpkg.List.of(E, E, E, E, E)")); |
58286
e4d90117c5de
8231122: @index tag with newline causes tag search to fail
hannesw
parents:
54619
diff
changeset
|
248 |
checkSearch(inv, "search \tt", List.of("other search tag")); |
54619
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
249 |
checkSearch(inv, "sear ch", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
250 |
checkSearch(inv, "( e ..", List.of("listpkg.List.of(E...)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
251 |
checkSearch(inv, "( i [ ]", List.of("listpkg.Nolist.withArrayArg(int[])")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
252 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
253 |
// empty/white space search should not trigger results |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
254 |
checkNullSearch(inv, ""); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
255 |
checkNullSearch(inv, " "); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
256 |
checkNullSearch(inv, " "); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
257 |
checkNullSearch(inv, " \t\t "); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
258 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
259 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
260 |
// _ word boundaries and case sensitivity |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
261 |
checkSearch(inv, "some", List.of("listpkg.Nolist.SOME_INT_CONSTANT")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
262 |
checkSearch(inv, "SOME", List.of("listpkg.Nolist.SOME_INT_CONSTANT")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
263 |
checkSearch(inv, "Some", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
264 |
checkSearch(inv, "int", List.of("listpkg.Nolist.SOME_INT_CONSTANT")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
265 |
checkSearch(inv, "INT", List.of("listpkg.Nolist.SOME_INT_CONSTANT")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
266 |
checkSearch(inv, "Int", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
267 |
checkSearch(inv, "int_con", List.of("listpkg.Nolist.SOME_INT_CONSTANT")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
268 |
checkSearch(inv, "INT_CON", List.of("listpkg.Nolist.SOME_INT_CONSTANT")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
269 |
checkSearch(inv, "NT", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
270 |
checkSearch(inv, "NT_", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
271 |
checkSearch(inv, "_const", List.of("listpkg.Nolist.SOME_INT_CONSTANT")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
272 |
checkSearch(inv, "_CONST", List.of("listpkg.Nolist.SOME_INT_CONSTANT")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
273 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
274 |
// Test for all packages, all classes links |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
275 |
checkSearch(inv, "all", List.of("All Packages", "All Classes")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
276 |
checkSearch(inv, "All", List.of("All Packages", "All Classes")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
277 |
checkSearch(inv, "ALL", List.of()); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
278 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
279 |
// test for generic types, var-arg and array args |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
280 |
checkSearch(inv, "(map<string, ? ext collection>)", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
281 |
List.of("listpkg.Nolist.withTypeParams(Map<String, ? extends Collection>)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
282 |
checkSearch(inv, "(m<str,? ext coll>", |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
283 |
List.of("listpkg.Nolist.withTypeParams(Map<String, ? extends Collection>)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
284 |
checkSearch(inv, "(object...", List.of("listpkg.Nolist.withVarArgs(Object...)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
285 |
checkSearch(inv, "(obj...", List.of("listpkg.Nolist.withVarArgs(Object...)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
286 |
checkSearch(inv, "(e..", List.of("listpkg.List.of(E...)")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
287 |
checkSearch(inv, "(int[]", List.of("listpkg.Nolist.withArrayArg(int[])")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
288 |
checkSearch(inv, "(i[]", List.of("listpkg.Nolist.withArrayArg(int[])")); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
289 |
} |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
290 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
291 |
void checkSearch(Invocable inv, String query, List<String> results) throws ScriptException, NoSuchMethodException { |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
292 |
checkList((List) inv.invokeFunction("search", query), results); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
293 |
} |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
294 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
295 |
void checkList(List<?> result, List<?> expected) { |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
296 |
checking("Checking list: " + result); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
297 |
if (!expected.equals(result)) { |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
298 |
failed("Expected: " + expected + ", got: " + result); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
299 |
} else { |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
300 |
passed("List matches expected result"); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
301 |
} |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
302 |
} |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
303 |
|
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
304 |
void checkNullSearch(Invocable inv, String query) throws ScriptException, NoSuchMethodException { |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
305 |
Object result = inv.invokeFunction("search", query); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
306 |
checking("Checking null result"); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
307 |
if (result == null) { |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
308 |
passed("Result is null as expected"); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
309 |
} else { |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
310 |
failed("Expected: null, got: " + result); |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
311 |
} |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
312 |
} |
b43cc3b9ef40
8220497: Improve Javadoc search feature and add test coverage
hannesw
parents:
diff
changeset
|
313 |
} |