Revert "Run more tests with Java 23"

This reverts commit 13618d9 as upstream as applied similar/better change when merging Java 23 support
eclipse-jdtls · Sep 24, 2024 · 9fb5696 · 9fb5696
1 parent 6113062
commit 9fb5696
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 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,18 +250,16 @@ 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);
-//      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));
-    }
+		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));
+	}
 	return all;
 }
 

diff --git a/...e.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/TestAll.java b/...e.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/TestAll.java
@@ -251,7 +251,6 @@ public static Test suite() {
 //	 since_22.add(SuperAfterStatementsTest.class);
 	 since_22.add(UnnamedPatternsAndVariablesTest.class);
 	 since_22.add(UseOfUnderscoreJava22Test.class);
-	 since_22.add(SuperAfterStatementsTest.class);
 	 since_22.add(SwitchPatternTest21.class);
 
 	 ArrayList since_23 = new ArrayList();

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},
 	};
 
 	/**