Find/Replace: align test class packages with production class packages

This moves the test classes for the find/replace functionality, in particular the ones for the find/replace overlay, to the packages according to those of the production classes.
eclipse-platform · Jul 1, 2024 · 15d2e1d · 15d2e1d
1 parent a15aafd
commit 15d2e1d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 13 deletions.
diff --git a/...texteditor/tests/FindReplaceTestUtil.java → ...l/findandreplace/FindReplaceTestUtil.java b/...texteditor/tests/FindReplaceTestUtil.java → ...l/findandreplace/FindReplaceTestUtil.java
@@ -11,7 +11,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.ui.workbench.texteditor.tests;
+package org.eclipse.ui.internal.findandreplace;
 
 import org.eclipse.swt.widgets.Display;
 

diff --git a/...h/texteditor/tests/FindReplaceUITest.java → ...nal/findandreplace/FindReplaceUITest.java b/...h/texteditor/tests/FindReplaceUITest.java → ...nal/findandreplace/FindReplaceUITest.java
@@ -11,9 +11,9 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.ui.workbench.texteditor.tests;
+package org.eclipse.ui.internal.findandreplace;
 
-import static org.eclipse.ui.workbench.texteditor.tests.FindReplaceTestUtil.runEventQueue;
+import static org.eclipse.ui.internal.findandreplace.FindReplaceTestUtil.runEventQueue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
@@ -34,7 +34,8 @@
 import org.eclipse.jface.text.TextViewer;
 
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.findandreplace.SearchOptions;
+
+import org.eclipse.ui.workbench.texteditor.tests.ScreenshotTest;
 
 public abstract class FindReplaceUITest<AccessType extends IFindReplaceUIAccess> {
 	@Rule

diff --git a/...exteditor/tests/IFindReplaceUIAccess.java → .../findandreplace/IFindReplaceUIAccess.java b/...exteditor/tests/IFindReplaceUIAccess.java → .../findandreplace/IFindReplaceUIAccess.java
@@ -8,20 +8,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package org.eclipse.ui.workbench.texteditor.tests;
+package org.eclipse.ui.internal.findandreplace;
 
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Widget;
 
 import org.eclipse.jface.text.IFindReplaceTarget;
 
-import org.eclipse.ui.internal.findandreplace.IFindReplaceLogic;
-import org.eclipse.ui.internal.findandreplace.SearchOptions;
-
 /**
  * Wraps UI access for different find/replace UIs
  */
-interface IFindReplaceUIAccess {
+public interface IFindReplaceUIAccess {
 
 	IFindReplaceTarget getTarget();
 

diff --git a/...teditor/tests/FindReplaceOverlayTest.java → ...place/overlay/FindReplaceOverlayTest.java b/...teditor/tests/FindReplaceOverlayTest.java → ...place/overlay/FindReplaceOverlayTest.java
@@ -11,7 +11,7 @@
  * Contributors:
  *     Vector Informatik GmbH - initial API and implementation
  *******************************************************************************/
-package org.eclipse.ui.workbench.texteditor.tests;
+package org.eclipse.ui.internal.findandreplace.overlay;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -28,6 +28,7 @@
 import org.eclipse.jface.text.IFindReplaceTarget;
 import org.eclipse.jface.text.TextViewer;
 
+import org.eclipse.ui.internal.findandreplace.FindReplaceUITest;
 import org.eclipse.ui.internal.findandreplace.SearchOptions;
 
 public class FindReplaceOverlayTest extends FindReplaceUITest<OverlayAccess> {

diff --git a/...bench/texteditor/tests/OverlayAccess.java → ...findandreplace/overlay/OverlayAccess.java b/...bench/texteditor/tests/OverlayAccess.java → ...findandreplace/overlay/OverlayAccess.java
@@ -11,7 +11,7 @@
  * Contributors:
  *     Vector Informatik GmbH - initial API and implementation
  *******************************************************************************/
-package org.eclipse.ui.workbench.texteditor.tests;
+package org.eclipse.ui.internal.findandreplace.overlay;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -36,7 +36,9 @@
 import org.eclipse.jface.text.IFindReplaceTargetExtension;
 
 import org.eclipse.ui.internal.findandreplace.FindReplaceLogic;
+import org.eclipse.ui.internal.findandreplace.FindReplaceTestUtil;
 import org.eclipse.ui.internal.findandreplace.IFindReplaceLogic;
+import org.eclipse.ui.internal.findandreplace.IFindReplaceUIAccess;
 import org.eclipse.ui.internal.findandreplace.SearchOptions;
 
 class OverlayAccess implements IFindReplaceUIAccess {

diff --git a/...orkbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/DialogAccess.java b/...orkbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/DialogAccess.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.ui.workbench.texteditor.tests;
 
-import static org.eclipse.ui.workbench.texteditor.tests.FindReplaceTestUtil.runEventQueue;
+import static org.eclipse.ui.internal.findandreplace.FindReplaceTestUtil.runEventQueue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasItems;
 import static org.hamcrest.Matchers.not;
@@ -35,6 +35,7 @@
 
 import org.eclipse.ui.internal.findandreplace.FindReplaceLogic;
 import org.eclipse.ui.internal.findandreplace.IFindReplaceLogic;
+import org.eclipse.ui.internal.findandreplace.IFindReplaceUIAccess;
 import org.eclipse.ui.internal.findandreplace.SearchOptions;
 
 class DialogAccess implements IFindReplaceUIAccess {

diff --git a/...texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java b/...texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/FindReplaceDialogTest.java
@@ -13,7 +13,7 @@
  *******************************************************************************/
 package org.eclipse.ui.workbench.texteditor.tests;
 
-import static org.eclipse.ui.workbench.texteditor.tests.FindReplaceTestUtil.runEventQueue;
+import static org.eclipse.ui.internal.findandreplace.FindReplaceTestUtil.runEventQueue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
@@ -36,6 +36,7 @@
 import org.eclipse.jface.text.IFindReplaceTarget;
 import org.eclipse.jface.text.TextViewer;
 
+import org.eclipse.ui.internal.findandreplace.FindReplaceUITest;
 import org.eclipse.ui.internal.findandreplace.SearchOptions;
 
 public class FindReplaceDialogTest extends FindReplaceUITest<DialogAccess> {

diff --git a/...tor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java b/...tor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java
@@ -18,6 +18,7 @@
 import org.junit.runners.Suite.SuiteClasses;
 
 import org.eclipse.ui.internal.findandreplace.FindReplaceLogicTest;
+import org.eclipse.ui.internal.findandreplace.overlay.FindReplaceOverlayTest;
 
 import org.eclipse.ui.workbench.texteditor.tests.minimap.MinimapPageTest;
 import org.eclipse.ui.workbench.texteditor.tests.minimap.MinimapWidgetTest;