Modify the JMOD related tests to work with JDKs that don't include JM…

…OD files (#3587) Also, fix the ClasspathJmod to work for resources inside the workspace as well. #3587
eclipse-jdt · Jan 28, 2025 · 8a71d44 · 8a71d44
1 parent ca77e4c
commit 8a71d44
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 0 deletions.
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/Java9ElementTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/Java9ElementTests.java
@@ -26,6 +26,8 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 import junit.framework.Test;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
@@ -783,6 +785,10 @@ public void testSystemLibAsJMod() throws Exception {
 				IPath path = rawClasspath[i].getPath();
 				if (path.lastSegment().equals("jrt-fs.jar")) {
 					path = path.removeLastSegments(2).append("jmods").append("java.base.jmod");
+					if (path.toFile().exists()) {
+						// No jmod files in JDK? This test is not applicable
+						return;
+					}
 					IClasspathEntry newEntry = newModularLibraryEntry(path, rawClasspath[i].getSourceAttachmentPath(), new Path("java.base"));
 					rawClasspath[i] = newEntry;
 				}
@@ -838,6 +844,10 @@ public void test515342b() throws Exception {
 				IPath path = rawClasspath[i].getPath();
 				if (path.lastSegment().equals("jrt-fs.jar")) {
 					path = path.removeLastSegments(2).append("jmods").append("java.base.jmod");
+					if (!path.toFile().exists()) {
+						// No jmod files? Then this test is not applicable
+						return;
+					}
 					IClasspathEntry newEntry = newModularLibraryEntry(path, rawClasspath[i].getSourceAttachmentPath(), new Path("java.base"));
 					rawClasspath[i] = newEntry;
 				}
@@ -1430,6 +1440,11 @@ private IJavaProject createJavaProjectWithBaseSql() throws CoreException {
 			IPath path = rawClasspath[i].getPath();
 			if (path.lastSegment().equals("jrt-fs.jar")) {
 				path = path.removeLastSegments(2).append("jmods").append("java.base.jmod");
+				if (!path.toFile().exists()) {
+					// No jmod files? Just proceed with the jrt-fs.
+					newClasspath[i] = rawClasspath[i];
+					continue;
+				}
 				IClasspathEntry newEntry = JavaCore.newLibraryEntry(path, rawClasspath[i].getSourceAttachmentPath(), new Path("java.base"));
 				newClasspath[i] = newEntry;
 				path = path.removeLastSegments(2).append("jmods").append("java.sql.jmod");
@@ -1601,6 +1616,10 @@ public void test530024_001() throws Exception {
 				if (path.lastSegment().equals("jrt-fs.jar")) {
 					jdkRootPath = path.removeLastSegments(2);
 					path = jdkRootPath.append("jmods").append("java.base.jmod");
+					if (!path.toFile().exists()) {
+						// No jmod files? Then this test is not applicable
+						return;
+					}
 					IClasspathEntry newEntry = newModularLibraryEntry(path, rawClasspath[i].getSourceAttachmentPath(), new Path("java.base"));
 					rawClasspath[i] = newEntry;
 				}
@@ -1725,4 +1744,12 @@ public void test530653() throws CoreException, IOException {
 			deleteProject("Java9Elements");
 		}
 	}
+	public void testGH3549() throws CoreException, IOException {
+		IJavaProject project = setUpJavaProject("JModTests", "17");
+		waitForManualRefresh();
+		waitForAutoBuild();
+		project.getProject().build(IncrementalProjectBuilder.FULL_BUILD, null);
+		IMarker[] markers = project.getProject().findMarkers(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
+		assertMarkers("unexpected markers", "mod.c cannot be resolved to a module", markers);
+	}
 }
diff --git a/...eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ModuleBuilderTests.java b/...eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ModuleBuilderTests.java
@@ -2662,6 +2662,10 @@ public void testSystemLibAsJMod() throws CoreException {
 				IPath path = rawClasspath[i].getPath();
 				if (path.lastSegment().equals("jrt-fs.jar")) {
 					path = path.removeLastSegments(2).append("jmods").append("java.base.jmod");
+					if (!path.toFile().exists()) {
+						// No jmod? Then this test is not applicable.
+						return;
+					}
 					IClasspathEntry newEntry = JavaCore.newLibraryEntry(path, rawClasspath[i].getSourceAttachmentPath(), new Path("java.base"));
 					rawClasspath[i] = newEntry;
 				}
@@ -2698,6 +2702,10 @@ public void testSystemLibAsJMod_2() throws CoreException {
 				IPath path = rawClasspath[i].getPath();
 				if (path.lastSegment().equals("jrt-fs.jar")) {
 					path = path.removeLastSegments(2).append("jmods").append("java.base.jmod");
+					if (!path.toFile().exists()) {
+						// No jmod? Then this test is not applicable.
+						return;
+					}
 					IClasspathAttribute[] attributes = {
 							JavaCore.newClasspathAttribute(IClasspathAttribute.MODULE, "true") };
 					IClasspathEntry newEntry = JavaCore.newLibraryEntry(path, rawClasspath[i].getSourceAttachmentPath(),

diff --git a/org.eclipse.jdt.core.tests.model/workspace/JModTests/.classpath b/org.eclipse.jdt.core.tests.model/workspace/JModTests/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+    <classpathentry kind="var" path="JCL_17_LIB" sourcepath="JCL_17_SRC" rootpath="JCL_SRCROOT"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="lib" path="jmods/mod.a.jmod">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.eclipse.jdt.core.tests.model/workspace/JModTests/.project b/org.eclipse.jdt.core.tests.model/workspace/JModTests/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>mod.b</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.jdt.core.tests.model/workspace/JModTests/jmods/mod.a.jmod b/org.eclipse.jdt.core.tests.model/workspace/JModTests/jmods/mod.a.jmod
diff --git a/org.eclipse.jdt.core.tests.model/workspace/JModTests/src/module-info.java b/org.eclipse.jdt.core.tests.model/workspace/JModTests/src/module-info.java
@@ -0,0 +1,4 @@
+module mod.b {
+	requires mod.a;
+	requires mod.c;
+}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathLocation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathLocation.java
@@ -183,6 +183,11 @@ public static ClasspathLocation forLibrary(String libraryPathname, AccessRuleSet
 
 public static ClasspathLocation forLibrary(IFile library, AccessRuleSet accessRuleSet, IPath annotationsPath,
 										boolean isOnModulePath, String compliance) {
+	IPath location = library.getLocation();
+	String libraryPathname = location == null? library.getFullPath().toPortableString() : location.toOSString();
+	if (Util.archiveFormat(libraryPathname) == Util.JMOD_FILE) {
+		return new ClasspathJMod(libraryPathname, 0, accessRuleSet, annotationsPath);
+	}
 	return (CompilerOptions.versionToJdkLevel(compliance) < ClassFileConstants.JDK9) ?
 			new ClasspathJar(library, accessRuleSet, annotationsPath, isOnModulePath) :
 				new ClasspathMultiReleaseJar(library, accessRuleSet, annotationsPath, isOnModulePath, compliance);