Improve o.e.text.tests.Accessor usages

akurtakov · akurtakov · commit 79f0f530c769 · 2025-08-14T09:51:57.000+03:00
* Make it varargs to reduce needless code
* Use adapters instead of reflection where possible
diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/ContextInformationTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/ContextInformationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2020 Stephan Wahlbrink and others.
+ * Copyright (c) 2017, 2025 Stephan Wahlbrink and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -87,7 +87,7 @@ public void testContextInfo_hide_Bug512251() throws Exception {
 		// ITextEditorActionConstants.DELETE_LINE
 		getDocument().set("");
 
-		new Accessor(getContentAssistant(), ContentAssistant.class).invoke("hide", new Object[0]);
+		new Accessor(getContentAssistant(), ContentAssistant.class).invoke("hide");
 	}
 
 	@Test
diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -403,17 +403,17 @@ void pollUntilInactive() throws InterruptedException {
 	}
 
 	boolean isActive() {
-		Object bool= fAccessor.invoke("isActive", null);
+		Object bool= fAccessor.invoke("isActive");
 		return ((Boolean) bool).booleanValue();
 	}
 
 	boolean isCanceled() {
-		Object bool= fAccessor.invoke("isCanceled", null);
+		Object bool= fAccessor.invoke("isCanceled");
 		return ((Boolean)bool).booleanValue();
 	}
 
 	boolean isDirty() {
-		Object bool= fAccessor.invoke("isDirty", null);
+		Object bool= fAccessor.invoke("isDirty");
 		return ((Boolean) bool).booleanValue();
 	}
 
diff --git a/tests/org.eclipse.text.tests/src/org/eclipse/text/tests/Accessor.java b/tests/org.eclipse.text.tests/src/org/eclipse/text/tests/Accessor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -146,7 +146,7 @@ public Accessor(String className, ClassLoader classLoader) {
 	 * @param arguments the method arguments which must all be instance of Object
 	 * @return the method return value
 	 */
-	public Object invoke(String methodName, Object[] arguments) {
+	public Object invoke(String methodName, Object... arguments) {
 		return invoke(methodName, getTypes(arguments), arguments);
 	}
 
@@ -158,7 +158,7 @@ public Object invoke(String methodName, Object[] arguments) {
 	 * @param arguments the method arguments
 	 * @return the method return value
 	 */
-	public Object invoke(String methodName, Class<?>[] types, Object[] arguments) {
+	public Object invoke(String methodName, Class<?>[] types, Object... arguments) {
 		Method method= null;
 		try {
 			method = fClass.getDeclaredMethod(methodName, types);
@@ -281,7 +281,7 @@ public Field getField(String fieldName) {
 		}
 	}
 
-	private static Class<?>[] getTypes(Object[] objects) {
+	private static Class<?>[] getTypes(Object... objects) {
 		if (objects == null)
 			return null;
 
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/GotoLineTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/GotoLineTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -101,7 +101,7 @@ private void goToLine(int line, int expectedResult) {
 				ITextEditor editor= (ITextEditor) part;
 				IAction action= editor.getAction(ITextEditorActionConstants.GOTO_LINE);
 				Accessor accessor= new Accessor(action, GotoLineAction.class);
-				accessor.invoke("gotoLine", new Class[] {int.class}, new Integer[] {Integer.valueOf(line)});
+				accessor.invoke("gotoLine", new Class[] { int.class }, Integer.valueOf(line));
 				Control control= part.getAdapter(Control.class);
 				if (control instanceof StyledText) {
 					int caretLine= -1;
diff --git a/tests/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/AbstratGenericEditorTest.java b/tests/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/AbstratGenericEditorTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016 Red Hat Inc. and others
+ * Copyright (c) 2016, 2025 Red Hat Inc. and others
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -26,10 +26,6 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 
-import org.eclipse.text.tests.Accessor;
-
-import org.eclipse.jface.text.source.SourceViewer;
-
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
@@ -38,8 +34,6 @@
 import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.tests.harness.util.UITestCase;
 
-import org.eclipse.ui.texteditor.AbstractTextEditor;
-
 /**
  * Closes intro, create {@link #project}, create {@link #file} and open {@link #editor}; and clean up.
  * Also contains additional utility methods
@@ -117,11 +111,6 @@ protected void cleanFileAndEditor() throws Exception {
 		}
 	}
 
-	protected SourceViewer getSourceViewer() {
-		SourceViewer sourceViewer= (SourceViewer) new Accessor(editor, AbstractTextEditor.class).invoke("getSourceViewer", new Object[0]);
-		return sourceViewer;
-	}
-
 	@After
 	public void tearDown() throws Exception {
 		cleanFileAndEditor();
diff --git a/tests/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/BasicEditionTest.java b/tests/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/BasicEditionTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Red Hat Inc. and others
+ * Copyright (c) 2020, 2025 Red Hat Inc. and others
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -15,6 +15,7 @@
 import org.junit.Test;
 
 import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextViewer;
 
 public class BasicEditionTest extends AbstratGenericEditorTest{
 
@@ -25,16 +26,17 @@ protected void createAndOpenFile() throws Exception {
 
 	@Test
 	public void testNewLineHasIndent() {
-		IDocument doc = getSourceViewer().getDocument();
+		ITextViewer sourceViewer = editor.getAdapter(ITextViewer.class);
+		IDocument doc = sourceViewer.getDocument();
 		// Tab only
 		doc.set("\t");
-		getSourceViewer().setSelectedRange(doc.getLength(), 1);
-		getSourceViewer().getTextWidget().insert("\n");
+		sourceViewer.setSelectedRange(doc.getLength(), 1);
+		sourceViewer.getTextWidget().insert("\n");
 		assertEquals("\t\n\t", doc.get());
 		// Space only
 		doc.set("   ");
-		getSourceViewer().setSelectedRange(doc.getLength(), 1);
-		getSourceViewer().getTextWidget().insert("\n");
+		sourceViewer.setSelectedRange(doc.getLength(), 1);
+		sourceViewer.getTextWidget().insert("\n");
 		assertEquals("   \n   ", doc.get());
 	}
 }
diff --git a/tests/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/ContextInfoTest.java b/tests/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/ContextInfoTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017 Stephan Wahlbrink and others.
+ * Copyright (c) 2017, 2025 Stephan Wahlbrink and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -31,6 +31,7 @@
 
 import org.eclipse.text.tests.Accessor;
 
+import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.jface.text.contentassist.ContentAssistant;
 import org.eclipse.jface.text.source.SourceViewer;
 
@@ -95,9 +96,9 @@ public void testContextInfo_hide_Bug512251() throws Exception {
 
 		editor.getAction(ITextEditorActionConstants.DELETE_LINE).run();
 
-		SourceViewer sourceViewer= getSourceViewer();
+		ITextViewer sourceViewer= editor.getAdapter(ITextViewer.class);
 		ContentAssistant assist= (ContentAssistant) new Accessor(sourceViewer, SourceViewer.class).get("fContentAssistant");
-		new Accessor(assist, ContentAssistant.class).invoke("hide", new Object[0]);
+		new Accessor(assist, ContentAssistant.class).invoke("hide");
 	}
 
 
diff --git a/tests/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/HoverTest.java b/tests/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/HoverTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016, 2017 Red Hat Inc. and others
+ * Copyright (c) 2016, 2025 Red Hat Inc. and others
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -58,8 +58,6 @@
 
 import org.eclipse.ui.workbench.texteditor.tests.ScreenshotTest;
 
-import org.eclipse.ui.texteditor.AbstractTextEditor;
-
 /**
  * @since 1.0
  */
@@ -232,7 +230,7 @@ private AbstractInformationControlManager triggerCompletionAndRetrieveInformatio
 		boolean foundHoverData = false;
 		int attemptNumber = 0;
 		
-		ITextViewer viewer= (ITextViewer) new Accessor(editor, AbstractTextEditor.class).invoke("getSourceViewer", new Object[0]);
+		ITextViewer viewer= editor.getAdapter(ITextViewer.class);
 		AbstractInformationControlManager textHoverManager= (AbstractInformationControlManager) new Accessor(viewer, TextViewer.class).get("fTextHoverManager");
 		
 		while (!foundHoverData && attemptNumber++ < MAXIMUM_HOVER_RETRY_COUNT) {
diff --git a/tests/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/ShowInformationTest.java b/tests/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/ShowInformationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 Red Hat Inc. and others
+ * Copyright (c) 2021, 2025 Red Hat Inc. and others
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -47,8 +47,6 @@
 
 import org.eclipse.ui.workbench.texteditor.tests.ScreenshotTest;
 
-import org.eclipse.ui.texteditor.AbstractTextEditor;
-
 /**
  * @since 1.2
  */
@@ -151,7 +149,7 @@ protected boolean condition() {
 		editorTextWidget.getShell().setFocus();
 		editorTextWidget.getShell().getDisplay().wake();
 
-		ITextViewer viewer= (ITextViewer) new Accessor(editor, AbstractTextEditor.class).invoke("getSourceViewer", new Object[0]);
+		ITextViewer viewer= editor.getAdapter(ITextViewer.class);
 
 		ITextOperationTarget textOperationTarget = (ITextOperationTarget)viewer;
 		assertTrue(textOperationTarget.canDoOperation(ISourceViewer.INFORMATION));
diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayTest.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 Vector Informatik GmbH and others.
+ * Copyright (c) 2024, 2025 Vector Informatik GmbH and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -45,7 +45,7 @@ public class FindReplaceOverlayTest extends FindReplaceUITest<OverlayAccess> {
 	@Override
 	public OverlayAccess openUIFromTextViewer(TextViewer viewer) {
 		Accessor actionAccessor= new Accessor(getFindReplaceAction(), FindReplaceAction.class);
-		actionAccessor.invoke("showOverlayInEditor", null);
+		actionAccessor.invoke("showOverlayInEditor");
 		FindReplaceOverlay overlay= (FindReplaceOverlay) actionAccessor.get("overlay");
 		OverlayAccess uiAccess= new OverlayAccess(getFindReplaceTarget(), overlay);
 		waitForFocus(uiAccess::hasFocus, testName.getMethodName());
diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -44,15 +44,15 @@ public class FindReplaceDialogTest extends FindReplaceUITest<DialogAccess> {
 	@Override
 	public DialogAccess openUIFromTextViewer(TextViewer viewer) {
 		Accessor findActionAccessor= new Accessor(getFindReplaceAction(), FindReplaceAction.class);
-		findActionAccessor.invoke("showDialog", null);
+		findActionAccessor.invoke("showDialog");
 
 		Object fFindReplaceDialogStub= findActionAccessor.get("fgFindReplaceDialogStub");
 		if (fFindReplaceDialogStub == null) {
 			fFindReplaceDialogStub= findActionAccessor.get("fgFindReplaceDialogStubShell");
 		}
 		Accessor fFindReplaceDialogStubAccessor= new Accessor(fFindReplaceDialogStub, "org.eclipse.ui.texteditor.FindReplaceAction$FindReplaceDialogStub", getClass().getClassLoader());
 
-		Dialog dialog= (Dialog) fFindReplaceDialogStubAccessor.invoke("getDialog", null);
+		Dialog dialog= (Dialog) fFindReplaceDialogStubAccessor.invoke("getDialog");
 		DialogAccess uiAccess= new DialogAccess(getFindReplaceTarget(), dialog);
 		waitForFocus(uiAccess::hasFocus, testName.getMethodName());
 		return uiAccess;
diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/HippieCompletionTest.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/HippieCompletionTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2024 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -435,7 +435,7 @@ private Accessor createAccessor(Iterator<String> suggestions, int startOffset) {
 	}
 
 	private String next(Accessor state) {
-		return (String)state.invoke("next", new Object[] {});
+		return (String) state.invoke("next");
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*******************************************************************************`
`2`		`- * Copyright (c) 2017, 2020 Stephan Wahlbrink and others.`
	`2`	`+ * Copyright (c) 2017, 2025 Stephan Wahlbrink and others.`
`3`	`3`	`*`
`4`	`4`	`* This program and the accompanying materials`
`5`	`5`	`* are made available under the terms of the Eclipse Public License 2.0`
`@@ -87,7 +87,7 @@ public void testContextInfo_hide_Bug512251() throws Exception {`
`87`	`87`	`// ITextEditorActionConstants.DELETE_LINE`
`88`	`88`	`getDocument().set("");`
`89`	`89`
`90`		`- new Accessor(getContentAssistant(), ContentAssistant.class).invoke("hide", new Object[0]);`
	`90`	`+ new Accessor(getContentAssistant(), ContentAssistant.class).invoke("hide");`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*******************************************************************************`
`2`		`- * Copyright (c) 2000, 2011 IBM Corporation and others.`
	`2`	`+ * Copyright (c) 2000, 2025 IBM Corporation and others.`
`3`	`3`	`*`
`4`	`4`	`* This program and the accompanying materials`
`5`	`5`	`* are made available under the terms of the Eclipse Public License 2.0`
`@@ -403,17 +403,17 @@ void pollUntilInactive() throws InterruptedException {`
`403`	`403`	`}`
`404`	`404`
`405`	`405`	`boolean isActive() {`
`406`		`- Object bool= fAccessor.invoke("isActive", null);`
	`406`	`+ Object bool= fAccessor.invoke("isActive");`
`407`	`407`	`return ((Boolean) bool).booleanValue();`
`408`	`408`	`}`
`409`	`409`
`410`	`410`	`boolean isCanceled() {`
`411`		`- Object bool= fAccessor.invoke("isCanceled", null);`
	`411`	`+ Object bool= fAccessor.invoke("isCanceled");`
`412`	`412`	`return ((Boolean)bool).booleanValue();`
`413`	`413`	`}`
`414`	`414`
`415`	`415`	`boolean isDirty() {`
`416`		`- Object bool= fAccessor.invoke("isDirty", null);`
	`416`	`+ Object bool= fAccessor.invoke("isDirty");`
`417`	`417`	`return ((Boolean) bool).booleanValue();`
`418`	`418`	`}`
`419`	`419`