jdk-sandbox: comparison langtools/test/jdk/jshell/CompletionSuggestionTest.java

equal deleted inserted replaced

-:a64c9a565bb7
+:bdf4b1b26697
 * questions.
 */
 /*
 * @test
-* @bug 8131025 8141092 8153761 8145263 8131019 8175886 8176184 8176241
+* @bug 8131025 8141092 8153761 8145263 8131019 8175886 8176184 8176241 8176110
 * @summary Test Completion and Documentation
 * @library /tools/lib
 * @modules jdk.compiler/com.sun.tools.javac.api
 *          jdk.compiler/com.sun.tools.javac.main
 *          jdk.jdeps/com.sun.tools.javap
 assertCompletion("method(0, |", true, "ccTest3");
 assertCompletion("list.add(|", true, "ccTest1", "ccTest2", "ccTest3");
 assertCompletion("list.add(0, |", true, "ccTest3");
 assertCompletion("new String(|", true, "ccTest3");
 assertCompletion("new String(new char[0], |", true, "ccTest1", "ccTest2");
-assertCompletionIncludesExcludes("new jav|", new HashSet<>(Arrays.asList("java", "javax")), Collections.emptySet());
+assertCompletionIncludesExcludes("new jav|", new HashSet<>(Arrays.asList("java.", "javax.")), Collections.emptySet());
 assertCompletion("Class<String> clazz = String.c|", true, "class");
 Snippet klass = classKey(assertEval("class Klass {void method(int n) {} private void method(String str) {}}"));
 assertCompletion("new Klass().method(|", true, "ccTest1", "ccTest2");
 Snippet klass2 = classKey(assertEval("class Klass {static void method(int n) {} void method(String str) {}}",
 assertCompletion("new I.|", "A()");
 assertCompletion("new String(I.A|", "A");
 }
 public void testFullyQualified() {
-assertCompletion("Optional<String> opt = java.u|", "util");
+assertCompletion("Optional<String> opt = java.u|", "util.");
 assertCompletionIncludesExcludes("Optional<Strings> opt = java.util.O|", new HashSet<>(Collections.singletonList("Optional")), Collections.emptySet());
 assertEval("void method(java.util.Optional<String> opt) {}");
-assertCompletion("method(java.u|", "util");
+assertCompletion("method(java.u|", "util.");
 assertCompletion("Object.notElement.|");
-assertCompletion("Object o = com.su|", "sun");
+assertCompletion("Object o = com.su|", "sun.");
 Path p1 = outDir.resolve("dir1");
 compiler.compile(p1,
 "package p1.p2;\n" +
 "public class Test {\n" +
 "}");
 String jarName = "test.jar";
 compiler.jar(p1, jarName, "p1/p2/Test.class", "p1/p3/Test.class");
 addToClasspath(compiler.getPath(p1.resolve(jarName)));
-assertCompletionIncludesExcludes("|", new HashSet<>(Collections.singletonList("p1")), Collections.emptySet());
+assertCompletionIncludesExcludes("|", new HashSet<>(Collections.singletonList("p1.")), Collections.emptySet());
-assertCompletion("p1.|", "p2", "p3");
+assertCompletion("p1.|", "p2.", "p3.");
 assertCompletion("p1.p2.|", "Test");
 assertCompletion("p1.p3.|", "Test");
 }
 public void testCheckAccessibility() {
 assertCompletion("java.util.regex.Pattern.co|", "compile(");
 }
 public void testCompletePackages() {
-assertCompletion("java.u|", "util");
+assertCompletion("java.u|", "util.");
-assertCompletionIncludesExcludes("jav|", new HashSet<>(Arrays.asList("java", "javax")), Collections.emptySet());
+assertCompletionIncludesExcludes("jav|", new HashSet<>(Arrays.asList("java.", "javax.")), Collections.emptySet());
 }
 public void testImports() {
-assertCompletion("import java.u|", "util");
+assertCompletion("import java.u|", "util.");
-assertCompletionIncludesExcludes("import jav|", new HashSet<>(Arrays.asList("java", "javax")), Collections.emptySet());
+assertCompletionIncludesExcludes("import jav|", new HashSet<>(Arrays.asList("java.", "javax.")), Collections.emptySet());
-assertCompletion("import static java.u|", "util");
+assertCompletion("import static java.u|", "util.");
-assertCompletionIncludesExcludes("import static jav|", new HashSet<>(Arrays.asList("java", "javax")), Collections.emptySet());
+assertCompletionIncludesExcludes("import static jav|", new HashSet<>(Arrays.asList("java.", "javax.")), Collections.emptySet());
 assertCompletion("import static java.lang.Boolean.g|", "getBoolean");
 assertCompletion("import java.util.*|");
 assertCompletionIncludesExcludes("import java.lang.String.|",
 Collections.emptySet(),
 new HashSet<>(Arrays.asList("CASE_INSENSITIVE_ORDER", "copyValueOf", "format", "join", "valueOf", "class", "length")));
 new HashSet<>(Arrays.asList("Entry")),
 new HashSet<>(Arrays.asList("class")));
 }
 public void testImportStart() {
-assertCompletionIncludesExcludes("import c|", Set.of("com"), Set.of());
+assertCompletionIncludesExcludes("import c|", Set.of("com."), Set.of());
 }
 public void testBrokenClassFile() throws Exception {
 Compiler compiler = new Compiler();
 Path testOutDir = Paths.get("CompletionTestBrokenClassFile");

changeset 45747	bdf4b1b26697
parent 44814	d008ab12a00a