Skip to content

Commit cb121fe

Browse files
Maximilian Wittmermerks
authored andcommitted
Activate and Fix FindReplaceLogicTest
The FindReplaceLogic was not included in the TestSuite and thus not executed by CI. Additionally, I fixed a bug where the tests would not run correctly on linux and mac because windows-style line-breaks were assumed in the Strings.
1 parent ea87817 commit cb121fe

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/FindReplaceLogicTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ public void testPerformReplaceAllForwardRegEx() {
153153

154154
findReplaceLogic.performReplaceAll("[", "", parentShell.getDisplay());
155155
assertThat(textViewer.getDocument().get(), equalTo("almost@an_email"));
156-
expectStatusIsMessageWithString(findReplaceLogic, "Unclosed character class near index 0\r\n"
157-
+ "[\r\n"
156+
expectStatusIsMessageWithString(findReplaceLogic, "Unclosed character class near index 0" + System.lineSeparator()
157+
+ "[" + System.lineSeparator()
158158
+ "^");
159159

160160
}
@@ -176,8 +176,8 @@ public void testPerformReplaceAllForward() {
176176

177177
findReplaceLogic.performReplaceAll("[", "", parentShell.getDisplay());
178178
assertThat(textViewer.getDocument().get(), equalTo("almost@an_email"));
179-
expectStatusIsMessageWithString(findReplaceLogic, "Unclosed character class near index 0\r\n"
180-
+ "[\r\n"
179+
expectStatusIsMessageWithString(findReplaceLogic, "Unclosed character class near index 0" + System.lineSeparator()
180+
+ "[" + System.lineSeparator()
181181
+ "^");
182182
}
183183

tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
import org.junit.runners.Suite;
1818
import org.junit.runners.Suite.SuiteClasses;
1919

20+
import org.eclipse.ui.internal.findandreplace.FindReplaceLogicTest;
21+
2022
import org.eclipse.ui.workbench.texteditor.tests.minimap.MinimapPageTest;
2123
import org.eclipse.ui.workbench.texteditor.tests.minimap.MinimapWidgetTest;
2224
import org.eclipse.ui.workbench.texteditor.tests.revisions.ChangeRegionTest;
@@ -44,7 +46,8 @@
4446
MinimapPageTest.class,
4547
MinimapWidgetTest.class,
4648
TextEditorPluginTest.class,
47-
TextViewerDeleteLineTargetTest.class
49+
TextViewerDeleteLineTargetTest.class,
50+
FindReplaceLogicTest.class,
4851
})
4952
public class WorkbenchTextEditorTestSuite {
5053
// see @SuiteClasses

0 commit comments

Comments
 (0)