Update Java 22 tests

Signed-off-by: Snjezana Peco <[email protected]>
snjeza · Mar 26, 2024 · 1781d55 · 1781d55
1 parent 25d7a0b
commit 1781d55
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 24 deletions.
diff --git a/org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target b/org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target
@@ -31,7 +31,7 @@
             <unit id="org.eclipse.jdt.core.compiler.batch" version="0.0.0"/>
             <unit id="org.eclipse.jdt.core" version="0.0.0"/>
             <unit id="org.eclipse.jdt.apt.core" version="0.0.0"/>
-            <repository location="https://download.eclipse.org/eclipse/updates/4.32-I-builds/I20240325-1800/"/>
+            <repository location="https://download.eclipse.org/jdtls/jdt-core-incubator/snapshots/"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>

diff --git a/org.eclipse.jdt.ls.tests/projects/eclipse/java22/src/main/java/foo/bar/Foo.java b/org.eclipse.jdt.ls.tests/projects/eclipse/java22/src/main/java/foo/bar/Foo.java
@@ -3,7 +3,9 @@
 /**
  * It's a Foo class
  */
-public sealed interface Foo
-permits Bar { 
+public class Foo {
+	public Foo() {
+		System.out.println();
+		super();
+	}
 }
-record Bar(String name) implements Foo { }
diff --git a/...ests/src/org/eclipse/jdt/ls/core/internal/correction/ModifierCorrectionsQuickFixTest.java b/...ests/src/org/eclipse/jdt/ls/core/internal/correction/ModifierCorrectionsQuickFixTest.java
@@ -1203,11 +1203,9 @@ public void testClassExtendFinalClass() throws Exception {
 
 	@Test
 	public void testAddSealedMissingClassModifierProposal() throws Exception {
-		Map<String, String> options22 = new HashMap<>();
-		JavaModelUtil.setComplianceOptions(options22, JavaCore.VERSION_22);
-		options22.put(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, JavaCore.ENABLED);
-		options22.put(JavaCore.COMPILER_PB_REPORT_PREVIEW_FEATURES, JavaCore.IGNORE);
-		fJProject.setOptions(options22);
+		Map<String, String> options17 = new HashMap<>();
+		JavaModelUtil.setComplianceOptions(options17, JavaCore.VERSION_17);
+		fJProject.setOptions(options17);
 		IPackageFragment pack1 = fSourceFolder.createPackageFragment("test", false, null);
 		assertNoErrors(fJProject.getResource());
 
@@ -1250,11 +1248,9 @@ public void testAddSealedMissingClassModifierProposal() throws Exception {
 
 	@Test
 	public void testAddSealedAsDirectSuperClass() throws Exception {
-		Map<String, String> options22 = new HashMap<>();
-		JavaModelUtil.setComplianceOptions(options22, JavaCore.VERSION_22);
-		options22.put(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, JavaCore.ENABLED);
-		options22.put(JavaCore.COMPILER_PB_REPORT_PREVIEW_FEATURES, JavaCore.IGNORE);
-		fJProject.setOptions(options22);
+		Map<String, String> options17 = new HashMap<>();
+		JavaModelUtil.setComplianceOptions(options17, JavaCore.VERSION_17);
+		fJProject.setOptions(options17);
 		IPackageFragment pack1 = fSourceFolder.createPackageFragment("test", false, null);
 		assertNoErrors(fJProject.getResource());
 
@@ -1279,11 +1275,9 @@ public void testAddSealedAsDirectSuperClass() throws Exception {
 
 	@Test
 	public void testAddPermitsToDirectSuperClass() throws Exception {
-		Map<String, String> options22 = new HashMap<>();
-		JavaModelUtil.setComplianceOptions(options22, JavaCore.VERSION_22);
-		options22.put(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, JavaCore.ENABLED);
-		options22.put(JavaCore.COMPILER_PB_REPORT_PREVIEW_FEATURES, JavaCore.IGNORE);
-		fJProject.setOptions(options22);
+		Map<String, String> options17 = new HashMap<>();
+		JavaModelUtil.setComplianceOptions(options17, JavaCore.VERSION_17);
+		fJProject.setOptions(options17);
 		IPackageFragment pack1 = fSourceFolder.createPackageFragment("test", false, null);
 		assertNoErrors(fJProject.getResource());
 

diff --git a/...ls.tests/src/org/eclipse/jdt/ls/core/internal/correction/UnresolvedTypesQuickFixTest.java b/...ls.tests/src/org/eclipse/jdt/ls/core/internal/correction/UnresolvedTypesQuickFixTest.java
@@ -1492,11 +1492,9 @@ public void testDontImportTestClassesInMainCode() throws Exception {
 
 	@Test
 	public void testTypeInSealedTypeDeclaration() throws Exception {
-		Map<String, String> options22 = new HashMap<>();
-		JavaModelUtil.setComplianceOptions(options22, JavaCore.VERSION_22);
-		options22.put(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, JavaCore.ENABLED);
-		options22.put(JavaCore.COMPILER_PB_REPORT_PREVIEW_FEATURES, JavaCore.IGNORE);
-		fJProject1.setOptions(options22);
+		Map<String, String> options17 = new HashMap<>();
+		JavaModelUtil.setComplianceOptions(options17, JavaCore.VERSION_17);
+		fJProject1.setOptions(options17);
 
 		IPackageFragment pack1 = fSourceFolder.createPackageFragment("test1", false, null);
 		StringBuilder buf = new StringBuilder();