Skip to content

Commit 632ccf5

Browse files
committed
Remove o.e.jface.text.tests copy of DisplayHelper
Use o.e.ui.tests.harness.util.DisplayHelper instead. Standardizing on one implementation to get less surprises.
1 parent e5929d3 commit 632ccf5

14 files changed

+36
-605
lines changed

tests/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ Export-Package:
1313
org.eclipse.jface.text.tests.rules,
1414
org.eclipse.jface.text.tests.source,
1515
org.eclipse.jface.text.tests.source.inlined,
16-
org.eclipse.jface.text.tests.templates.persistence,
17-
org.eclipse.jface.text.tests.util
16+
org.eclipse.jface.text.tests.templates.persistence
1817
Require-Bundle:
1918
org.eclipse.jface.text;bundle-version="[3.20.0,4.0.0)",
2019
org.eclipse.jface;bundle-version="[3.5.0,4.0.0)",
2120
org.junit;bundle-version="4.12.0",
2221
org.eclipse.text.tests;bundle-version="[3.5.0,4.0.0)",
2322
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
2423
org.eclipse.ui.workbench.texteditor,
24+
org.eclipse.ui.tests.harness,
2525
org.eclipse.test;bundle-version="3.6.200"
2626
Bundle-RequiredExecutionEnvironment: JavaSE-17
2727
Eclipse-BundleShape: dir

tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/MultiSelectionTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@
4343
import org.eclipse.jface.text.MultiTextSelection;
4444
import org.eclipse.jface.text.Region;
4545
import org.eclipse.jface.text.TextViewer;
46-
import org.eclipse.jface.text.tests.util.DisplayHelper;
46+
47+
import org.eclipse.ui.tests.harness.util.DisplayHelper;
4748

4849
public class MultiSelectionTest {
4950

tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextViewerTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2014, 2024 Google, Inc and others.
2+
* Copyright (c) 2014, 2025 Google, Inc and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -71,7 +71,8 @@
7171
import org.eclipse.jface.text.hyperlink.URLHyperlinkDetector;
7272
import org.eclipse.jface.text.source.SourceViewer;
7373
import org.eclipse.jface.text.source.SourceViewerConfiguration;
74-
import org.eclipse.jface.text.tests.util.DisplayHelper;
74+
75+
import org.eclipse.ui.tests.harness.util.DisplayHelper;
7576

7677
/**
7778
* Basic tests for TextViewer.
@@ -289,7 +290,7 @@ public static void ctrlHome(ITextViewer viewer) {
289290
static void postKeyEvent(Control widget, int keyCode, int stateMask, int type) {
290291
Display display= widget.getDisplay();
291292
widget.setFocus();
292-
DisplayHelper.driveEventQueue(display);
293+
DisplayHelper.runEventLoop(display, 0);
293294
Event event = new Event();
294295
event.widget = widget;
295296
event.keyCode = keyCode;
@@ -301,7 +302,7 @@ static void postKeyEvent(Control widget, int keyCode, int stateMask, int type) {
301302
for (Listener listener : listeners) {
302303
listener.handleEvent(event);
303304
}
304-
DisplayHelper.driveEventQueue(display);
305+
DisplayHelper.runEventLoop(display, 0);
305306
}
306307

307308
public static String generate5000Lines() {

tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningLineHeaderAnnotationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
import org.eclipse.jface.text.source.SourceViewer;
3636
import org.eclipse.jface.text.source.inlined.AbstractInlinedAnnotation;
3737
import org.eclipse.jface.text.source.inlined.InlinedAnnotationSupport;
38-
import org.eclipse.jface.text.tests.util.DisplayHelper;
38+
39+
import org.eclipse.ui.tests.harness.util.DisplayHelper;
3940

4041
public class CodeMiningLineHeaderAnnotationTest {
4142

tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningProjectionViewerTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@
6060
import org.eclipse.jface.text.source.projection.ProjectionViewer;
6161
import org.eclipse.jface.text.tests.contentassist.BarContentAssistProcessor;
6262
import org.eclipse.jface.text.tests.source.inlined.LineContentBoundsDrawingTest.AccessAllAnnoations;
63-
import org.eclipse.jface.text.tests.util.DisplayHelper;
63+
64+
import org.eclipse.ui.tests.harness.util.DisplayHelper;
6465

6566
public class CodeMiningProjectionViewerTest {
6667

@@ -193,7 +194,7 @@ public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
193194
fParent.setSize(200, 4 * fViewer.getTextWidget().getLineHeight());
194195
//fParent.pack(true);
195196
fParent.open();
196-
DisplayHelper.driveEventQueue(fParent.getDisplay());
197+
DisplayHelper.runEventLoop(fParent.getDisplay(), 0);
197198
// ensure ViewportGuard is initialized
198199
fViewer.getControl().notifyListeners(SWT.KeyUp, new Event());
199200
fViewer.setSelectedRange(1, 0);

tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2019 Red Hat Inc. and others.
2+
* Copyright (c) 2019, 2025 Red Hat Inc. and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -63,7 +63,8 @@
6363
import org.eclipse.jface.text.source.AnnotationPainter;
6464
import org.eclipse.jface.text.source.SourceViewer;
6565
import org.eclipse.jface.text.tests.TextViewerTest;
66-
import org.eclipse.jface.text.tests.util.DisplayHelper;
66+
67+
import org.eclipse.ui.tests.harness.util.DisplayHelper;
6768

6869
public class CodeMiningTest {
6970

tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/AbstractContentAssistTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
import org.eclipse.jface.text.source.ISourceViewer;
4343
import org.eclipse.jface.text.source.SourceViewer;
4444
import org.eclipse.jface.text.source.SourceViewerConfiguration;
45-
import org.eclipse.jface.text.tests.util.DisplayHelper;
45+
46+
import org.eclipse.ui.tests.harness.util.DisplayHelper;
4647

4748

4849
public class AbstractContentAssistTest {
@@ -65,7 +66,7 @@ public void setUp() {
6566
for (Shell s : shells) {
6667
s.dispose();
6768
}
68-
DisplayHelper.driveEventQueue(Display.getDefault());
69+
DisplayHelper.runEventLoop(Display.getDefault(), 0);
6970
}
7071

7172
@After
@@ -207,7 +208,7 @@ public Button getButton() {
207208

208209

209210
protected static void processEvents() {
210-
DisplayHelper.driveEventQueue(getDisplay());
211+
DisplayHelper.runEventLoop(getDisplay(), 0);
211212
}
212213

213214
private static Display getDisplay() {

tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/AsyncContentAssistTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
import org.eclipse.jface.text.IDocument;
4848
import org.eclipse.jface.text.contentassist.ContentAssistant;
4949
import org.eclipse.jface.text.source.SourceViewer;
50-
import org.eclipse.jface.text.tests.util.DisplayHelper;
50+
51+
import org.eclipse.ui.tests.harness.util.DisplayHelper;
5152

5253
public class AsyncContentAssistTest {
5354

@@ -117,7 +118,7 @@ public void testCompletePrefix() {
117118
contentAssistant.enablePrefixCompletion(true);
118119
contentAssistant.install(viewer);
119120
shell.open();
120-
DisplayHelper.driveEventQueue(shell.getDisplay());
121+
DisplayHelper.runEventLoop(shell.getDisplay(), 0);
121122
Display display= shell.getDisplay();
122123
final Collection<Shell> beforeShells= AbstractContentAssistTest.getCurrentShells();
123124
contentAssistant.showPossibleCompletions();

tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/FilteringAsyncContentAssistTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@
5050
import org.eclipse.jface.text.contentassist.IContextInformation;
5151
import org.eclipse.jface.text.contentassist.IContextInformationValidator;
5252
import org.eclipse.jface.text.source.SourceViewer;
53-
import org.eclipse.jface.text.tests.util.DisplayHelper;
53+
54+
import org.eclipse.ui.tests.harness.util.DisplayHelper;
5455

5556
/**
5657
* Tests for Async completion proposal popup proposals filtering mechanics
@@ -70,7 +71,7 @@ public void setup() {
7071
shell = new Shell();
7172
shell.setSize(300, 300);
7273
shell.open();
73-
DisplayHelper.driveEventQueue(shell.getDisplay());
74+
DisplayHelper.runEventLoop(shell.getDisplay(), 0);
7475

7576
viewer = new SourceViewer(shell, null, SWT.NONE);
7677
Document document = new Document();

tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/IncrementalAsyncContentAssistTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
import org.eclipse.jface.text.contentassist.ContentAssistant;
2929
import org.eclipse.jface.text.contentassist.ICompletionProposal;
3030
import org.eclipse.jface.text.source.SourceViewer;
31-
import org.eclipse.jface.text.tests.util.DisplayHelper;
31+
32+
import org.eclipse.ui.tests.harness.util.DisplayHelper;
3233

3334
public class IncrementalAsyncContentAssistTests {
3435

@@ -45,7 +46,7 @@ public void setup() {
4546
shell= new Shell();
4647
shell.setSize(300, 300);
4748
shell.open();
48-
DisplayHelper.driveEventQueue(shell.getDisplay());
49+
DisplayHelper.runEventLoop(shell.getDisplay(), 0);
4950

5051
viewer= new SourceViewer(shell, null, SWT.NONE);
5152
Document document= new Document();

0 commit comments

Comments
 (0)