Skip to content

Revert "Fix ModuleOptionsTests failure on macOS Java 21 (#853)" #860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SougandhS merged 1 commit into from
Feb 12, 2026
Merged

Revert "Fix ModuleOptionsTests failure on macOS Java 21 (#853)" #860

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 2 additions & 50 deletions org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ModuleOptionsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2019, 2026 GK Software SE and others.
* Copyright (c) 2019, 2024 GK Software SE and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -18,7 +18,6 @@
import java.util.List;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Platform;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.jdt.core.IClasspathAttribute;
import org.eclipse.jdt.core.IClasspathEntry;
Expand Down Expand Up @@ -64,36 +63,6 @@ public class ModuleOptionsTests extends AbstractDebugTest {
+ "jdk.unsupported.desktop," //
+ "jdk.xml.dom";

private static final String ASSUMED_DEFAULT_MODULES_9_MAC_21 = "java.se," //
+ "jdk.accessibility,jdk.attach,jdk.compiler,jdk.dynalink,jdk.httpserver," //
+ "jdk.jartool,jdk.javadoc,jdk.jconsole,jdk.jdi," //
+ "jdk.jfr," //
+ "jdk.jshell,jdk.jsobject,jdk.management," //
+ "jdk.management.jfr," //
+ "jdk.naming.ldap," //
+ "jdk.net," //
+ "jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported," //
+ "jdk.scripting.nashorn," //
+ "jdk.unsupported.desktop," //
+ "jdk.xml.dom";

private static final String ASSUMED_DEFAULT_MODULES_21_MAC = "java.base," //
+ "java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging," //
+ "java.management,java.management.rmi,java.naming,java.net.http,java.prefs,java.rmi," //
+ "java.scripting,java.security.jgss,java.security.sasl,java.smartcardio," //
+ "java.sql,java.sql.rowset,java.transaction.xa,java.xml,java.xml.crypto," //
+ "jdk.accessibility,jdk.attach,jdk.compiler,jdk.dynalink,jdk.httpserver," //
+ "jdk.jartool,jdk.javadoc,jdk.jconsole,jdk.jdi," //
+ "jdk.jfr," //
+ "jdk.jshell,jdk.jsobject,jdk.management," //
+ "jdk.management.jfr," //
+ "jdk.naming.ldap," //
+ "jdk.net," //
+ "jdk.scripting.nashorn," //
+ "jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported," //
+ "jdk.unsupported.desktop," //
+ "jdk.xml.dom";


public ModuleOptionsTests(String name) {
super(name);
Expand Down Expand Up @@ -173,11 +142,6 @@ public void testLimitModules_release9() throws CoreException {
List<String> defaultModules = getDefaultModules(javaProject);
String expectedModules;
String moduleList = String.join(",", defaultModules);
if (Platform.OS.isMac() && Runtime.version().feature() == 21) {
assertEquals(ASSUMED_DEFAULT_MODULES_9_MAC_21, moduleList);
} else {
assertEquals(ASSUMED_DEFAULT_MODULES_9, moduleList);
}
assertEquals(ASSUMED_DEFAULT_MODULES_9, moduleList);
switch (moduleList) {
case ASSUMED_DEFAULT_MODULES_9:
Expand All @@ -189,17 +153,11 @@ public void testLimitModules_release9() throws CoreException {
+ "jdk.net," //
+ "jdk.nio.mapmode," //
// + "jdk.packager,jdk.packager.services,jdk.plugin.dom,"
// + "jdk.scripting.nashorn,"
// + "jdk.scripting.nashorn,"
+ "jdk.sctp,"
+ "jdk.security.auth,jdk.security.jgss,jdk.unsupported," //
+ "jdk.unsupported.desktop,jdk.xml.dom";
break;
case ASSUMED_DEFAULT_MODULES_9_MAC_21:
expectedModules = "java.instrument,java.net.http,java.scripting,java.sql.rowset,java.xml.crypto,"
+ "jdk.accessibility,jdk.dynalink,jdk.httpserver," + "jdk.jartool,jdk.jconsole,jdk.jshell," + "jdk.management.jfr,"
+ "jdk.naming.ldap," + "jdk.net," + "jdk.sctp," + "jdk.security.auth,jdk.security.jgss,jdk.unsupported,"
+ "jdk.scripting.nashorn," + "jdk.unsupported.desktop,jdk.xml.dom";
break;
default:
fail("Unknown set of default modules " + moduleList);
return;
Expand Down Expand Up @@ -242,12 +200,6 @@ public void testLimitModules1() throws JavaModelException {
+ "jdk.unsupported.desktop," //
+ "jdk.xml.dom";
break;
case ASSUMED_DEFAULT_MODULES_21_MAC:
expectedModules = "java.instrument,java.net.http,java.scripting,java.smartcardio,java.sql.rowset,java.xml.crypto,"
+ "jdk.accessibility," + "jdk.dynalink," + "jdk.httpserver," + "jdk.jartool,jdk.jconsole,jdk.jshell," + "jdk.jsobject,"
+ "jdk.management.jfr," + "jdk.naming.ldap," + "jdk.net," + "jdk.scripting.nashorn," + "jdk.sctp,"
+ "jdk.security.auth,jdk.security.jgss,jdk.unsupported," + "jdk.unsupported.desktop," + "jdk.xml.dom";
break;
default:
fail("Unknown set of default modules " + moduleList);
return;
Expand Down
Loading