Select module import

+ similar fixes for completion
+ split tests into 23 and 25
  - tests for disabled module imports remain in CompletionTests23

Fixes eclipse-jdt#4371

Author: stephan-herrmann

org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests23.java

@@ -15,12 +15,9 @@
 package org.eclipse.jdt.core.tests.model;
 
 import junit.framework.Test;
-import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 
 public class CompletionTests23 extends AbstractJavaModelCompletionTests {
@@ -41,7 +38,6 @@ public CompletionTests23(String name) {
 @Override
 public void setUpSuite() throws Exception {
 	this.completion23Project = setUpJavaProject("Completion23", "23", false);
-	this.completion23Project.setOption(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, JavaCore.ENABLED);
 	super.setUpSuite();
 }
 @Override
@@ -53,269 +49,52 @@ public static Test suite() {
 	return buildModelTestSuite(CompletionTests23.class);
 }
 
-public void testKeyword() throws JavaModelException {
-	this.workingCopies = new ICompilationUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-			"/Completion23/src/p/X.java",
-			"""
-			package p;
-			import m
-			public class X {}
-			""");
+// === positive tests for module imports have moved to CompletionTests25 ===
 
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-	requestor.allowAllRequiredProposals();
-	String str = this.workingCopies[0].getSource();
-	String completeBehind = "import m";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-	int relevanceWithoutCase = DEFAULT_RELEVANCE - R_CASE;
-	assertResults(
-			"Map[TYPE_REF]{java.util.Map;, java.util, Ljava.util.Map;, null, null, "+relevanceWithoutCase+"}\n" +
-			"MethodHandle[TYPE_REF]{java.lang.invoke.MethodHandle;, java.lang.invoke, Ljava.lang.invoke.MethodHandle;, null, null, "+relevanceWithoutCase+"}\n" +
-			"MethodHandles[TYPE_REF]{java.lang.invoke.MethodHandles;, java.lang.invoke, Ljava.lang.invoke.MethodHandles;, null, null, "+relevanceWithoutCase+"}\n" +
-			"MethodType[TYPE_REF]{java.lang.invoke.MethodType;, java.lang.invoke, Ljava.lang.invoke.MethodType;, null, null, "+relevanceWithoutCase+"}\n" +
-			"module[KEYWORD]{module, null, null, module, null, " + DEFAULT_RELEVANCE + "}",
-			requestor.getResults());
-}
 public void testKeyword_neg() throws JavaModelException {
 	// keyword not enabled, other proposals don't match
-	this.completion23Project.setOption(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, JavaCore.DISABLED);
-	try {
-		this.workingCopies = new ICompilationUnit[1];
-		this.workingCopies[0] = getWorkingCopy("/Completion23/src/p/X.java", """
-				package p;
-				import mod
-				public class X {}
-				""");
-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-		requestor.allowAllRequiredProposals();
-		String str = this.workingCopies[0].getSource();
-		String completeBehind = "import mod";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-		assertResults(
-				"",
-				requestor.getResults());
-	} finally {
-		this.completion23Project.setOption(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, JavaCore.ENABLED);
-	}
-}
-
-public void test001() throws JavaModelException {
-	// prefixed
-	// only java.base available (from JCL_23_LIB)
 	this.workingCopies = new ICompilationUnit[1];
-	this.workingCopies[0] = getWorkingCopy(
-			"/Completion23/src/p/X.java",
-			"""
+	this.workingCopies[0] = getWorkingCopy("/Completion23/src/p/X.java", """
 			package p;
-			import module java.
+			import mod
 			public class X {}
 			""");
-
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true);
+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
 	requestor.allowAllRequiredProposals();
 	String str = this.workingCopies[0].getSource();
-	String completeBehind = "java.";
-	int nameStart = str.lastIndexOf(completeBehind);
-	int cursorLocation = nameStart + completeBehind.length();
+	String completeBehind = "import mod";
+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
 	assertResults(
-			"[MODULE_REF]{java.base, java.base, null, null, null, ["+nameStart+", "+cursorLocation+"], "+DEFAULT_RELEVANCE + "}",
+			"",
 			requestor.getResults());
 }
 
 public void test001_neg() throws JavaModelException {
 	// prefixed
 	// only java.base available (from JCL_23_LIB)
-	// preview JEP 476 not enabled
+	// module imports not enabled
 	// other proposals don't match prefix
-	this.completion23Project.setOption(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, JavaCore.DISABLED);
-	try {
-		this.workingCopies = new ICompilationUnit[1];
-		this.workingCopies[0] = getWorkingCopy(
-				"/Completion23/src/p/X.java",
-				"""
-				package p;
-				import module java.b
-				public class X {}
-				""");
-
-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-		requestor.allowAllRequiredProposals();
-		String str = this.workingCopies[0].getSource();
-		String completeBehind = "java.b";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-		assertResults(
-				"",
-				requestor.getResults());
-	} finally {
-		this.completion23Project.setOption(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, JavaCore.ENABLED);
-	}
-}
-
-public void test002() throws JavaModelException {
-	// no prefix
-	// only java.base available (from JCL_23_LIB)
 	this.workingCopies = new ICompilationUnit[1];
 	this.workingCopies[0] = getWorkingCopy(
 			"/Completion23/src/p/X.java",
 			"""
 			package p;
-			import module\s
+			import module java.b
 			public class X {}
 			""");
 
 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
 	requestor.allowAllRequiredProposals();
 	String str = this.workingCopies[0].getSource();
-	String completeBehind = "module ";
+	String completeBehind = "java.b";
 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
 	assertResults(
-			"[MODULE_REF]{java.base, java.base, null, null, null, " + DEFAULT_RELEVANCE + "}",
+			"",
 			requestor.getResults());
 }
 
-public void test003() throws JavaModelException {
-	// no prefix
-	// 2 modules available: mod.one & java.base
-	// unnamed module reads them all
-	IPath jarPath = this.completion23Project.getPath().append("mod.one.jar");
-	try {
-		addClasspathEntry(this.completion23Project, newModularLibraryEntry(jarPath, null, null));
-		this.workingCopies = new ICompilationUnit[1];
-		this.workingCopies[0] = getWorkingCopy("/Completion23/src/p/X.java", """
-				package p;
-				import module\s
-				public class X {}
-				""");
-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-		requestor.allowAllRequiredProposals();
-		String str = this.workingCopies[0].getSource();
-		String completeBehind = "module ";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-		assertResults(
-				"[MODULE_REF]{java.base, java.base, null, null, null, " + DEFAULT_RELEVANCE + "}\n" +
-				"[MODULE_REF]{mod.one, mod.one, null, null, null, " + DEFAULT_RELEVANCE + "}",
-				requestor.getResults());
-	} finally {
-		removeClasspathEntry(this.completion23Project, jarPath);
-	}
-}
-
-public void test004() throws JavaModelException {
-	// with prefix
-	// 3 modules on the module path: mod.two, mod.one & java.base
-	// prefix selects 2 out of 3
-	IPath jarOnePath = this.completion23Project.getPath().append("mod.one.jar");
-	IPath jarTwoPath = this.completion23Project.getPath().append("mod.two.jar");
-	try {
-		addClasspathEntry(this.completion23Project, newModularLibraryEntry(jarOnePath, null, null));
-		addClasspathEntry(this.completion23Project, newModularLibraryEntry(jarTwoPath, null, null));
-		this.workingCopies = new ICompilationUnit[1];
-		this.workingCopies[0] = getWorkingCopy("/Completion23/src/p/X.java", """
-				package p;
-				import module mo
-				public class X {}
-				""");
-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-		requestor.allowAllRequiredProposals();
-		String str = this.workingCopies[0].getSource();
-		String completeBehind = "module mo";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-		assertResults(
-				"[MODULE_REF]{mod.one, mod.one, null, null, null, " + DEFAULT_RELEVANCE + "}\n" +
-				"[MODULE_REF]{mod.two, mod.two, null, null, null, " + DEFAULT_RELEVANCE + "}",
-				requestor.getResults());
-	} finally {
-		removeClasspathEntry(this.completion23Project, jarOnePath);
-		removeClasspathEntry(this.completion23Project, jarTwoPath);
-	}
-}
-
-public void test005() throws CoreException {
-	// with prefix
-	// 4 modules available: mod.test (self), mod.two (required), mod.one (transitively required) & java.base (from JCL_23_LIB)
-	// prefix selects 3 out of 4
-	IPath jarOnePath = this.completion23Project.getPath().append("mod.one.jar");
-	IPath jarTwoPath = this.completion23Project.getPath().append("mod.two.jar");
-	IFile moduleFile = null;
-	try {
-		addClasspathEntry(this.completion23Project, newModularLibraryEntry(jarOnePath, null, null));
-		addClasspathEntry(this.completion23Project, newModularLibraryEntry(jarTwoPath, null, null));
-		moduleFile = createFile("Completion23/src/module-info.java",
-				"""
-				module mod.test {
-					requires mod.two; // mod.two requires transitive mod.one
-				}
-				""");
-		this.workingCopies = new ICompilationUnit[1];
-		this.workingCopies[0] = getWorkingCopy("/Completion23/src/p/X.java", """
-				package p;
-				import module mo
-				public class X {}
-				""");
-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-		requestor.allowAllRequiredProposals();
-		String str = this.workingCopies[0].getSource();
-		String completeBehind = "module mo";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-		assertResults(
-				"[MODULE_REF]{mod.one, mod.one, null, null, null, " + DEFAULT_RELEVANCE + "}\n" +
-				"[MODULE_REF]{mod.test, mod.test, null, null, null, " + DEFAULT_RELEVANCE + "}\n" +
-				"[MODULE_REF]{mod.two, mod.two, null, null, null, " + DEFAULT_RELEVANCE + "}",
-				requestor.getResults());
-	} finally {
-		removeClasspathEntry(this.completion23Project, jarOnePath);
-		removeClasspathEntry(this.completion23Project, jarTwoPath);
-		if (moduleFile != null)
-			deleteResource(moduleFile);
-	}
-}
-public void test006() throws CoreException {
-	// with prefix
-	// 4 modules present: mod.test(self), mod.one, mod.two & java.base available
-	// + prefix rules out java.base
-	// + mod.two is proposed with lower relevance, because it is not read by the current module
-	IPath jarOnePath = this.completion23Project.getPath().append("mod.one.jar");
-	IPath jarTwoPath = this.completion23Project.getPath().append("mod.two.jar");
-	try {
-		addClasspathEntry(this.completion23Project, newModularLibraryEntry(jarOnePath, null, null));
-		addClasspathEntry(this.completion23Project, newModularLibraryEntry(jarTwoPath, null, null)); // not read my the current module
-		createFile("Completion23/src/module-info.java",
-				"""
-				module mod.test {
-					requires mod.one;
-				}
-				""");
-		this.workingCopies = new ICompilationUnit[1];
-		this.workingCopies[0] = getWorkingCopy("/Completion23/src/p/X.java", """
-				package p;
-				import module mo
-				public class X {}
-				""");
-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
-		requestor.allowAllRequiredProposals();
-		String str = this.workingCopies[0].getSource();
-		String completeBehind = "module mo";
-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
-		assertResults(
-				"[MODULE_REF]{mod.two, mod.two, null, null, null, " + (DEFAULT_RELEVANCE - R_NON_RESTRICTED) + "}\n" + // lower relevance, not read
-				"[MODULE_REF]{mod.one, mod.one, null, null, null, " + DEFAULT_RELEVANCE + "}\n" +
-				"[MODULE_REF]{mod.test, mod.test, null, null, null, " + DEFAULT_RELEVANCE + "}",
-				requestor.getResults());
-	} finally {
-		removeClasspathEntry(this.completion23Project, jarOnePath);
-		removeClasspathEntry(this.completion23Project, jarTwoPath);
-	}
-}
 
 public void testMarkdownTypeLink1() throws CoreException {
 	createFolder("/Completion23/src/javadoc");