From efc1dcaa5b263df2978764d87cecc9229adf6598 Mon Sep 17 00:00:00 2001
From: Jay Arthanareeswaran <jarthana@in.ibm.com>
Date: Wed, 4 Sep 2024 10:26:02 +0530
Subject: [PATCH] Upgrade test configuration to JavaSE-23 #483

---
 Jenkinsfile                                   |  2 +-
 org.eclipse.jdt.debug.jdi.tests/pom.xml       |  6 ++--
 .../debug/jdi/tests/AbstractJDITest.java      | 31 ++++++++++++++-----
 org.eclipse.jdt.debug.tests/build.properties  |  4 +--
 .../{java22 => java23}/Main1.java             |  0
 .../{java22 => java23}/Main2.java             |  0
 org.eclipse.jdt.debug.tests/pom.xml           |  6 ++--
 .../debug/testplugin/JavaProjectHelper.java   | 14 ++++-----
 .../jdt/debug/tests/AbstractDebugTest.java    | 26 +++++++++-------
 .../jdt/debug/tests/AutomatedSuite.java       |  2 +-
 .../launching/InstanceMainMethodsTests.java   |  2 +-
 11 files changed, 56 insertions(+), 37 deletions(-)
 rename org.eclipse.jdt.debug.tests/{java22 => java23}/Main1.java (100%)
 rename org.eclipse.jdt.debug.tests/{java22 => java23}/Main2.java (100%)

diff --git a/Jenkinsfile b/Jenkinsfile
index 95c4355232..7ef4516038 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,7 +21,7 @@ pipeline {
 				xvnc(useXauthority: true) {
 					sh """
 					mvn clean verify --batch-mode --fail-at-end -Dmaven.repo.local=$WORKSPACE/.m2/repository \
-						-Ptest-on-javase-21 -Pbree-libs -Papi-check -Pjavadoc\
+						-Ptest-on-javase-23 -Pbree-libs -Papi-check -Pjavadoc\
 						-Dmaven.test.failure.ignore=true\
 						-Dcompare-version-with-baselines.skip=false \
 						-Dproject.build.sourceEncoding=UTF-8 \
diff --git a/org.eclipse.jdt.debug.jdi.tests/pom.xml b/org.eclipse.jdt.debug.jdi.tests/pom.xml
index ebdcdd57fc..75c0556a6c 100644
--- a/org.eclipse.jdt.debug.jdi.tests/pom.xml
+++ b/org.eclipse.jdt.debug.jdi.tests/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2022 Eclipse Foundation and others.
+  Copyright (c) 2012, 2024 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -59,7 +59,7 @@
   </build>
   <profiles>
   	<profile>
-		<id>test-on-javase-21</id>
+		<id>test-on-javase-23</id>
 		<build>
 			<plugins>
 				<plugin>
@@ -76,7 +76,7 @@
 					<configuration>
 						<toolchains>
 							<jdk>
-								<id>JavaSE-21</id>
+								<id>JavaSE-23</id>
 							</jdk>
 						</toolchains>
 					</configuration>
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java
index 821ea418be..e78293ad30 100644
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java
+++ b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2022 IBM Corporation and others.
+ * Copyright (c) 2000, 2024 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -739,8 +739,7 @@ private void launchJavaTarget() {
 
 			commandLine.add("-classpath");
 			commandLine.add(fClassPath);
-			commandLine.add("-Xdebug");
-			commandLine.add("-Xnoagent");
+			addDebugOptions(commandLine);
 			commandLine.add("-Djava.compiler=NONE");
 			commandLine.add("-Xrunjdwp:transport=dt_socket,address=" + fBackEndPort + ",suspend=y,server=y");
 			injectVMArgs(commandLine);
@@ -783,8 +782,7 @@ private void launchSunTarget() {
 			}
 			commandLine.add("-classpath");
 			commandLine.add(fClassPath);
-			commandLine.add("-Xdebug");
-			commandLine.add("-Xnoagent");
+			addDebugOptions(commandLine);
 			commandLine.add("-Djava.compiler=NONE");
 			commandLine.add("-Xrunjdwp:transport=dt_socket,address=" + fBackEndPort + ",suspend=y,server=y");
 			injectVMArgs(commandLine);
@@ -818,8 +816,7 @@ private void launchIBMTarget() {
 
 			commandLine.add("-classpath");
 			commandLine.add(fClassPath);
-			commandLine.add("-Xdebug");
-			commandLine.add("-Xnoagent");
+			addDebugOptions(commandLine);
 			commandLine.add("-Djava.compiler=NONE");
 			commandLine.add("-Xrunjdwp:transport=dt_socket,address=" + fBackEndPort + ",suspend=y,server=y");
 			injectVMArgs(commandLine);
@@ -832,6 +829,26 @@ private void launchIBMTarget() {
 		}
 	}
 
+	private void addDebugOptions(Vector<String> commandLine) {
+		int vmVersion = 0;
+		try {
+			String versionString = System.getProperty("java.specification.version");
+			if (versionString != null) {
+				String[] nums = versionString.split("\\.");
+				if (nums.length > 0) {
+					vmVersion = Integer.parseInt(nums[0]);
+				}
+			}
+		} catch (Exception e) {
+			// Ignore
+		}
+		if (vmVersion < 22) {
+			commandLine.add("-Xdebug");
+		}
+		if (vmVersion < 23) {
+			commandLine.add("-Xnoagent");
+		}
+	}
 	protected String getMainClassName() {
 		return "org.eclipse.debug.jdi.tests.program.MainClass";
 	}
diff --git a/org.eclipse.jdt.debug.tests/build.properties b/org.eclipse.jdt.debug.tests/build.properties
index 1e94268901..3ed7fc5ee4 100644
--- a/org.eclipse.jdt.debug.tests/build.properties
+++ b/org.eclipse.jdt.debug.tests/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-#  Copyright (c) 2003, 2014 IBM Corporation and others.
+#  Copyright (c) 2003, 2024 IBM Corporation and others.
 #
 #  This program and the accompanying materials
 #  are made available under the terms of the Eclipse Public License 2.0
@@ -26,7 +26,7 @@ bin.includes = plugin.xml,\
                java8/,\
                java9/,\
                java16_/,\
-               java22/
+               java23/
 source.javadebugtests.jar = test plugin/,\
                             tests/,\
                             console tests/
diff --git a/org.eclipse.jdt.debug.tests/java22/Main1.java b/org.eclipse.jdt.debug.tests/java23/Main1.java
similarity index 100%
rename from org.eclipse.jdt.debug.tests/java22/Main1.java
rename to org.eclipse.jdt.debug.tests/java23/Main1.java
diff --git a/org.eclipse.jdt.debug.tests/java22/Main2.java b/org.eclipse.jdt.debug.tests/java23/Main2.java
similarity index 100%
rename from org.eclipse.jdt.debug.tests/java22/Main2.java
rename to org.eclipse.jdt.debug.tests/java23/Main2.java
diff --git a/org.eclipse.jdt.debug.tests/pom.xml b/org.eclipse.jdt.debug.tests/pom.xml
index 70e48654b5..f8c183742f 100644
--- a/org.eclipse.jdt.debug.tests/pom.xml
+++ b/org.eclipse.jdt.debug.tests/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2023 Eclipse Foundation and others.
+  Copyright (c) 2012, 2024 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -48,7 +48,7 @@
   </build>
   <profiles>
 	<profile>
-		<id>test-on-javase-21</id>
+		<id>test-on-javase-23</id>
 		<build>
 			<plugins>
 				<plugin>
@@ -65,7 +65,7 @@
 					<configuration>
 						<toolchains>
 							<jdk>
-								<id>JavaSE-21</id>
+								<id>JavaSE-23</id>
 							</jdk>
 						</toolchains>
 					</configuration>
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaProjectHelper.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaProjectHelper.java
index ff0525e357..09eff8de43 100644
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaProjectHelper.java	
+++ b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaProjectHelper.java	
@@ -65,7 +65,7 @@ public class JavaProjectHelper {
 	public static final String JAVA_SE_9_EE_NAME = "JavaSE-9";
 	public static final String JAVA_SE_16_EE_NAME = "JavaSE-16";
 	public static final String JAVA_SE_21_EE_NAME = "JavaSE-21";
-	public static final String JAVA_SE_22_EE_NAME = "JavaSE-22";
+	public static final String JAVA_SE_23_EE_NAME = "JavaSE-23";
 
 	/**
 	 * path to the test src for 'testprograms'
@@ -97,9 +97,9 @@ public class JavaProjectHelper {
 	 */
 	public static final IPath TEST_21_SRC_DIR = new Path("java21");
 	/**
-	 * path to the 22 test source
+	 * path to the 23 test source
 	 */
-	public static final IPath TEST_22_SRC_DIR = new Path("java22");
+	public static final IPath TEST_23_SRC_DIR = new Path("java23");
 
 	/**
 	 * path to the compiler error java file
@@ -181,12 +181,12 @@ public static boolean isJava21_Compatible() {
 	}
 
 	/**
-	 * Returns if the currently running VM is version compatible with Java 22
+	 * Returns if the currently running VM is version compatible with Java 23
 	 *
-	 * @return <code>true</code> if a Java 22 (or greater) VM is running <code>false</code> otherwise
+	 * @return <code>true</code> if a Java 23 (or greater) VM is running <code>false</code> otherwise
 	 */
-	public static boolean isJava22_Compatible() {
-		return isCompatible(22);
+	public static boolean isJava23_Compatible() {
+		return isCompatible(23);
 	}
 
 	/**
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
index 41e68b8e03..a3638b0cc2 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
@@ -180,7 +180,7 @@ public abstract class AbstractDebugTest extends TestCase implements  IEvaluation
 	public static final String NINE_PROJECT_NAME = "Nine";
 	public static final String ONESIX_PROJECT_NAME = "One_Six";
 	public static final String TWENTYONE_PROJECT_NAME = "Two_One";
-	public static final String TWENTYTWO_PROJECT_NAME = "Two_Two";
+	public static final String TWENTYTHREE_PROJECT_NAME = "Two_Three";
 	public static final String BOUND_JRE_PROJECT_NAME = "BoundJRE";
 	public static final String CLONE_SUFFIX = "Clone";
 
@@ -236,7 +236,7 @@ public abstract class AbstractDebugTest extends TestCase implements  IEvaluation
 	private static boolean loaded9 = false;
 	private static boolean loaded16_ = false;
 	private static boolean loaded21 = false;
-	private static boolean loaded22 = false;
+	private static boolean loaded23 = false;
 	private static boolean loadedEE = false;
 	private static boolean loadedJRE = false;
 	private static boolean loadedMulti = false;
@@ -617,18 +617,20 @@ synchronized void assert21Project() {
 	}
 
 	/**
-	 * Creates the Java 21 compliant project
+	 * Creates the Java 23 compliant project
 	 */
-	synchronized void assert22Project() {
+	synchronized void assert23Project() {
 		IJavaProject jp = null;
 		ArrayList<ILaunchConfiguration> cfgs = new ArrayList<>(1);
 		try {
-			if (!loaded22) {
-				jp = createProject(TWENTYTWO_PROJECT_NAME, JavaProjectHelper.TEST_22_SRC_DIR.toString(), JavaProjectHelper.JAVA_SE_22_EE_NAME, false);
+			if (!loaded23) {
+				jp = createProject(TWENTYTHREE_PROJECT_NAME, JavaProjectHelper.TEST_23_SRC_DIR.toString(), JavaProjectHelper.JAVA_SE_23_EE_NAME, false);
 				jp.setOption(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, JavaCore.ENABLED);
+				jp.setOption(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_23);
+				jp.setOption(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_23);
 				cfgs.add(createLaunchConfiguration(jp, "Main1"));
 				cfgs.add(createLaunchConfiguration(jp, "Main2"));
-				loaded22 = true;
+				loaded23 = true;
 				waitForBuild();
 			}
 		} catch (Exception e) {
@@ -642,7 +644,7 @@ synchronized void assert22Project() {
 			} catch (CoreException ce) {
 				// ignore
 			}
-			handleProjectCreationException(e, TWENTYTWO_PROJECT_NAME, jp);
+			handleProjectCreationException(e, TWENTYTHREE_PROJECT_NAME, jp);
 		}
 	}
 
@@ -943,13 +945,13 @@ protected IJavaProject get21Project() {
 	}
 
 	/**
-	 * Returns the 'Two_One' project, used for Java 21 tests.
+	 * Returns the 'Two_Three' project, used for Java 23 tests.
 	 *
 	 * @return the test project
 	 */
-	protected IJavaProject get22Project() {
-		assert22Project();
-		return getJavaProject(TWENTYTWO_PROJECT_NAME);
+	protected IJavaProject get23Project() {
+		assert23Project();
+		return getJavaProject(TWENTYTHREE_PROJECT_NAME);
 	}
 
 	/**
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java
index c9615813f3..19fb79975a 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java
@@ -195,7 +195,7 @@ public AutomatedSuite() {
 		addTest(new TestSuite(ConfigurationEncodingTests.class));
 		addTest(new TestSuite(LaunchConfigurationManagerTests.class));
 		addTest(new TestSuite(LaunchConfigurationTests.class));
-		if (JavaProjectHelper.isJava22_Compatible()) {
+		if (JavaProjectHelper.isJava23_Compatible()) {
 			addTest(new TestSuite(InstanceMainMethodsTests.class));
 		}
 		addTest(new TestSuite(ProjectClasspathVariableTests.class));
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/InstanceMainMethodsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/InstanceMainMethodsTests.java
index 330aaab517..b66820f825 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/InstanceMainMethodsTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/InstanceMainMethodsTests.java
@@ -26,7 +26,7 @@ public InstanceMainMethodsTests(String name) {
 
 	@Override
 	protected IJavaProject getProjectContext() {
-		return super.get22Project();
+		return super.get23Project();
 	}
 
 	public void testStaticMainWithoutArgs() throws Exception {