Run more tests with Java 23

eclipse-jdtls · Sep 24, 2024 · 13618d9 · 13618d9
1 parent 0cef78a
commit 13618d9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/...lipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/TestAll.java b/...lipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/TestAll.java
@@ -250,16 +250,18 @@ public static TestSuite getTestSuite(boolean addComplianceDiagnoseTest) {
 		all.addTest(AbstractCompilerTest.buildComplianceTestSuite(ClassFileConstants.getComplianceLevelForJavaVersion(ClassFileConstants.MAJOR_VERSION_22), tests_22));
 	}
 	if ((possibleComplianceLevels & AbstractCompilerTest.F_23) != 0) {
-		ArrayList tests_23 = (ArrayList)testClasses.clone();
-		tests_23.addAll(TEST_CLASSES_1_5);
-		addJava16Tests(tests_23);
-		TestCase.TESTS_PREFIX = null;
-		TestCase.TESTS_NAMES = null;
-		TestCase.TESTS_NUMBERS= null;
-		TestCase.TESTS_RANGE = null;
-		TestCase.RUN_ONLY_ID = null;
-		all.addTest(AbstractCompilerTest.buildComplianceTestSuite(ClassFileConstants.getComplianceLevelForJavaVersion(ClassFileConstants.MAJOR_VERSION_23), tests_23));
-	}
+        ArrayList tests_23 = (ArrayList)testClasses.clone();
+        tests_23.addAll(TEST_CLASSES_1_5);
+        addJava16Tests(tests_23);
+//      tests_22.add(SuperAfterStatementsTest.class);
+        // Reset forgotten subsets tests
+        TestCase.TESTS_PREFIX = null;
+        TestCase.TESTS_NAMES = null;
+        TestCase.TESTS_NUMBERS= null;
+        TestCase.TESTS_RANGE = null;
+        TestCase.RUN_ONLY_ID = null;
+        all.addTest(AbstractCompilerTest.buildComplianceTestSuite(ClassFileConstants.getComplianceLevelForJavaVersion(ClassFileConstants.MAJOR_VERSION_23), tests_23));
+    }
 	return all;
 }
 

diff --git a/...pse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/util/AbstractCompilerTest.java b/...pse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/util/AbstractCompilerTest.java
@@ -96,7 +96,7 @@ public class AbstractCompilerTest extends TestCase {
 		new int[] {F_20, ClassFileConstants.MAJOR_VERSION_20},
 		new int[] {F_21, ClassFileConstants.MAJOR_VERSION_21},
 		new int[] {F_22, ClassFileConstants.MAJOR_VERSION_22},
-		new int[] {F_23, ClassFileConstants.MAJOR_VERSION_23},
+		new int[] {F_23, ClassFileConstants.MAJOR_VERSION_23}
 	};
 
 	/**