From ac654573f1099cc10bfd35f76c413673e141deff Mon Sep 17 00:00:00 2001 From: Heiko Klare Date: Tue, 21 Jul 2026 12:58:20 +0200 Subject: [PATCH] Find/replace tests: assert proper selection of options In case search options are not properly selected/unselected in tests, test may be effectively executed with different search options than expected and succeed without identifying issues when having the options properly selected/unselected. This adds according assertions to make sure that selection changes succeed. This also enhances the order of test execution in the texteditor test suite. --- .../ui/internal/findandreplace/overlay/OverlayAccess.java | 2 ++ .../eclipse/ui/workbench/texteditor/tests/DialogAccess.java | 2 ++ .../texteditor/tests/WorkbenchTextEditorTestSuite.java | 6 +++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/overlay/OverlayAccess.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/overlay/OverlayAccess.java index 6f178623465..e9368c78018 100644 --- a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/overlay/OverlayAccess.java +++ b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/overlay/OverlayAccess.java @@ -122,6 +122,7 @@ public void select(SearchOptions option) { ToolItem button= getButtonForSearchOption(option); if (button != null) { button.notifyListeners(SWT.Selection, null); + assertSelected(option); } } @@ -133,6 +134,7 @@ public void unselect(SearchOptions option) { ToolItem button= getButtonForSearchOption(option); if (button != null) { button.notifyListeners(SWT.Selection, null); + assertUnselected(option); } } diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/DialogAccess.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/DialogAccess.java index f05203ec826..c225ab9638c 100644 --- a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/DialogAccess.java +++ b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/DialogAccess.java @@ -132,6 +132,7 @@ public void select(SearchOptions option) { Button button= getButtonForSearchOption(option); button.setSelection(true); button.notifyListeners(SWT.Selection, null); + assertSelected(option); } @Override @@ -145,6 +146,7 @@ public void unselect(SearchOptions option) { button.setSelection(false); } button.notifyListeners(SWT.Selection, null); + assertUnselected(option); } diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java index d2ad80884ed..492442c11be 100644 --- a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java +++ b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java @@ -13,8 +13,8 @@ *******************************************************************************/ package org.eclipse.ui.workbench.texteditor.tests; -import org.junit.platform.suite.api.Suite; import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; import org.eclipse.ui.internal.findandreplace.FindReplaceLogicTest; import org.eclipse.ui.internal.findandreplace.HistoryStoreTest; @@ -46,9 +46,9 @@ MinimapWidgetTest.class, TextEditorPluginTest.class, TextViewerDeleteLineTargetTest.class, - FindReplaceDialogTest.class, - FindReplaceOverlayTest.class, FindReplaceLogicTest.class, + FindReplaceOverlayTest.class, + FindReplaceDialogTest.class, HistoryStoreTest.class, }) public class WorkbenchTextEditorTestSuite {