AnnotateAssistTest1d8 test failed (#1478)

addresses the ClassCastException fixes #736
eclipse-jdt · Jun 26, 2024 · fafdd0e · fafdd0e
1 parent 690340f
commit fafdd0e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/...clipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AbstractAnnotateAssistTests.java b/...clipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AbstractAnnotateAssistTests.java
@@ -35,6 +35,8 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 
+import org.eclipse.jface.preference.IPreferenceStore;
+
 import org.eclipse.jface.text.TextSelection;
 import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.eclipse.jface.text.quickassist.IQuickAssistInvocationContext;
@@ -53,6 +55,7 @@
 import org.eclipse.jdt.internal.core.ClasspathEntry;
 import org.eclipse.jdt.internal.core.manipulation.util.Strings;
 
+import org.eclipse.jdt.ui.JavaUI;
 import org.eclipse.jdt.ui.tests.quickfix.JarUtil.ClassFileFilter;
 
 import org.eclipse.jdt.internal.ui.javaeditor.ClassFileEditor;
@@ -67,6 +70,17 @@ public abstract class AbstractAnnotateAssistTests extends QuickFixTest {
 
 	protected IJavaProject fJProject1;
 
+	// to be called from setUp/tearDown:
+	protected void setDefaultClassFileEditor(boolean set) {
+		@SuppressWarnings("restriction")
+		IPreferenceStore preferenceStore= org.eclipse.ui.internal.WorkbenchPlugin.getDefault().getPreferenceStore();
+		if (set) {
+			preferenceStore.setValue("defaultEditorForContentType_org.eclipse.jdt.core.javaClass", JavaUI.ID_CF_EDITOR);
+		} else {
+			preferenceStore.setToDefault("defaultEditorForContentType_org.eclipse.jdt.core.javaClass");
+		}
+	}
+
 	protected void ensureExists(IContainer parent) throws CoreException {
 		if (parent.exists()) return;
 		if (parent.getParent() != null)

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AnnotateAssistTest1d5.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AnnotateAssistTest1d5.java
@@ -64,11 +64,13 @@ public void setUp() throws Exception {
 		fJProject1= projectSetup.getProject();
 		fJProject1.getProject().getFolder(ANNOTATION_PATH).create(true, true, null);
 		fJProject1.setOption(JavaCore.COMPILER_ANNOTATION_NULL_ANALYSIS, JavaCore.ENABLED);
+		setDefaultClassFileEditor(true);
 	}
 
 	@After
 	public void tearDown() throws Exception {
 		JavaProjectHelper.clear(fJProject1, projectSetup.getDefaultClasspath());
+		setDefaultClassFileEditor(false);
 	}
 
 	// === Tests ===

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AnnotateAssistTest1d8.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AnnotateAssistTest1d8.java
@@ -153,11 +153,13 @@ public void setUp() throws Exception {
 		fJProject1= projectSetup.getProject();
 		fJProject1.getProject().getFolder(ANNOTATION_PATH).create(true, true, null);
 		fJProject1.setOption(JavaCore.COMPILER_ANNOTATION_NULL_ANALYSIS, JavaCore.ENABLED);
+		setDefaultClassFileEditor(true);
 	}
 
 	@After
 	public void tearDown() throws Exception {
 		JavaProjectHelper.clear(fJProject1, projectSetup.getDefaultClasspath());
+		setDefaultClassFileEditor(false);
 	}
 
 	/**