Skip to content

Remove o.e.jface.text.tests copy of DisplayHelper #3193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ Export-Package:
org.eclipse.jface.text.tests.rules,
org.eclipse.jface.text.tests.source,
org.eclipse.jface.text.tests.source.inlined,
org.eclipse.jface.text.tests.templates.persistence,
org.eclipse.jface.text.tests.util
org.eclipse.jface.text.tests.templates.persistence
Require-Bundle:
org.eclipse.jface.text;bundle-version="[3.20.0,4.0.0)",
org.eclipse.jface;bundle-version="[3.5.0,4.0.0)",
org.junit;bundle-version="4.12.0",
org.eclipse.text.tests;bundle-version="[3.5.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
org.eclipse.ui.workbench.texteditor,
org.eclipse.ui.tests.harness,
org.eclipse.test;bundle-version="3.6.200"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Eclipse-BundleShape: dir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
import org.eclipse.jface.text.MultiTextSelection;
import org.eclipse.jface.text.Region;
import org.eclipse.jface.text.TextViewer;
import org.eclipse.jface.text.tests.util.DisplayHelper;

import org.eclipse.ui.tests.harness.util.DisplayHelper;

public class MultiSelectionTest {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2014, 2024 Google, Inc and others.
* Copyright (c) 2014, 2025 Google, Inc and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -71,7 +71,8 @@
import org.eclipse.jface.text.hyperlink.URLHyperlinkDetector;
import org.eclipse.jface.text.source.SourceViewer;
import org.eclipse.jface.text.source.SourceViewerConfiguration;
import org.eclipse.jface.text.tests.util.DisplayHelper;

import org.eclipse.ui.tests.harness.util.DisplayHelper;

/**
* Basic tests for TextViewer.
Expand Down Expand Up @@ -289,7 +290,7 @@ public static void ctrlHome(ITextViewer viewer) {
static void postKeyEvent(Control widget, int keyCode, int stateMask, int type) {
Display display= widget.getDisplay();
widget.setFocus();
DisplayHelper.driveEventQueue(display);
DisplayHelper.runEventLoop(display, 0);
Event event = new Event();
event.widget = widget;
event.keyCode = keyCode;
Expand All @@ -301,7 +302,7 @@ static void postKeyEvent(Control widget, int keyCode, int stateMask, int type) {
for (Listener listener : listeners) {
listener.handleEvent(event);
}
DisplayHelper.driveEventQueue(display);
DisplayHelper.runEventLoop(display, 0);
}

public static String generate5000Lines() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
import org.eclipse.jface.text.source.SourceViewer;
import org.eclipse.jface.text.source.inlined.AbstractInlinedAnnotation;
import org.eclipse.jface.text.source.inlined.InlinedAnnotationSupport;
import org.eclipse.jface.text.tests.util.DisplayHelper;

import org.eclipse.ui.tests.harness.util.DisplayHelper;

public class CodeMiningLineHeaderAnnotationTest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@
import org.eclipse.jface.text.source.projection.ProjectionViewer;
import org.eclipse.jface.text.tests.contentassist.BarContentAssistProcessor;
import org.eclipse.jface.text.tests.source.inlined.LineContentBoundsDrawingTest.AccessAllAnnoations;
import org.eclipse.jface.text.tests.util.DisplayHelper;

import org.eclipse.ui.tests.harness.util.DisplayHelper;

public class CodeMiningProjectionViewerTest {

Expand Down Expand Up @@ -193,7 +194,7 @@ public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
fParent.setSize(200, 4 * fViewer.getTextWidget().getLineHeight());
//fParent.pack(true);
fParent.open();
DisplayHelper.driveEventQueue(fParent.getDisplay());
DisplayHelper.runEventLoop(fParent.getDisplay(), 0);
// ensure ViewportGuard is initialized
fViewer.getControl().notifyListeners(SWT.KeyUp, new Event());
fViewer.setSelectedRange(1, 0);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2019 Red Hat Inc. and others.
* Copyright (c) 2019, 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
Expand Down Expand Up @@ -63,7 +63,8 @@
import org.eclipse.jface.text.source.AnnotationPainter;
import org.eclipse.jface.text.source.SourceViewer;
import org.eclipse.jface.text.tests.TextViewerTest;
import org.eclipse.jface.text.tests.util.DisplayHelper;

import org.eclipse.ui.tests.harness.util.DisplayHelper;

public class CodeMiningTest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.text.source.SourceViewer;
import org.eclipse.jface.text.source.SourceViewerConfiguration;
import org.eclipse.jface.text.tests.util.DisplayHelper;

import org.eclipse.ui.tests.harness.util.DisplayHelper;


public class AbstractContentAssistTest {
Expand All @@ -65,7 +66,7 @@ public void setUp() {
for (Shell s : shells) {
s.dispose();
}
DisplayHelper.driveEventQueue(Display.getDefault());
DisplayHelper.runEventLoop(Display.getDefault(), 0);
}

@After
Expand Down Expand Up @@ -207,7 +208,7 @@ public Button getButton() {


protected static void processEvents() {
DisplayHelper.driveEventQueue(getDisplay());
DisplayHelper.runEventLoop(getDisplay(), 0);
}

private static Display getDisplay() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.contentassist.ContentAssistant;
import org.eclipse.jface.text.source.SourceViewer;
import org.eclipse.jface.text.tests.util.DisplayHelper;

import org.eclipse.ui.tests.harness.util.DisplayHelper;

public class AsyncContentAssistTest {

Expand Down Expand Up @@ -117,7 +118,7 @@ public void testCompletePrefix() {
contentAssistant.enablePrefixCompletion(true);
contentAssistant.install(viewer);
shell.open();
DisplayHelper.driveEventQueue(shell.getDisplay());
DisplayHelper.runEventLoop(shell.getDisplay(), 0);
Display display= shell.getDisplay();
final Collection<Shell> beforeShells= AbstractContentAssistTest.getCurrentShells();
contentAssistant.showPossibleCompletions();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.jface.text.contentassist.IContextInformationValidator;
import org.eclipse.jface.text.source.SourceViewer;
import org.eclipse.jface.text.tests.util.DisplayHelper;

import org.eclipse.ui.tests.harness.util.DisplayHelper;

/**
* Tests for Async completion proposal popup proposals filtering mechanics
Expand All @@ -70,7 +71,7 @@ public void setup() {
shell = new Shell();
shell.setSize(300, 300);
shell.open();
DisplayHelper.driveEventQueue(shell.getDisplay());
DisplayHelper.runEventLoop(shell.getDisplay(), 0);

viewer = new SourceViewer(shell, null, SWT.NONE);
Document document = new Document();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
import org.eclipse.jface.text.contentassist.ContentAssistant;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.source.SourceViewer;
import org.eclipse.jface.text.tests.util.DisplayHelper;

import org.eclipse.ui.tests.harness.util.DisplayHelper;

public class IncrementalAsyncContentAssistTests {

Expand All @@ -45,7 +46,7 @@ public void setup() {
shell= new Shell();
shell.setSize(300, 300);
shell.open();
DisplayHelper.driveEventQueue(shell.getDisplay());
DisplayHelper.runEventLoop(shell.getDisplay(), 0);

viewer= new SourceViewer(shell, null, SWT.NONE);
Document document= new Document();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
import org.eclipse.jface.text.source.IAnnotationAccess;
import org.eclipse.jface.text.source.IAnnotationAccessExtension;
import org.eclipse.jface.text.source.projection.ProjectionViewer;
import org.eclipse.jface.text.tests.util.DisplayHelper;

import org.eclipse.ui.tests.harness.util.DisplayHelper;

public class AnnotationRulerColumnTest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
import org.eclipse.jface.text.source.inlined.LineContentAnnotation;
import org.eclipse.jface.text.tests.source.inlined.LineContentBoundsDrawingTest.AccessAllAnnoations;
import org.eclipse.jface.text.tests.source.inlined.LineContentBoundsDrawingTest.TestAnnotationPainter;
import org.eclipse.jface.text.tests.util.DisplayHelper;

import org.eclipse.ui.tests.harness.util.DisplayHelper;

public class AnnotationOnTabTest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
import org.eclipse.jface.text.source.SourceViewer;
import org.eclipse.jface.text.source.inlined.InlinedAnnotationSupport;
import org.eclipse.jface.text.source.inlined.LineContentAnnotation;
import org.eclipse.jface.text.tests.util.DisplayHelper;

import org.eclipse.ui.tests.harness.util.DisplayHelper;

/**
* This test verify that the bounds of the text as returned by StyledText.getTextBounds()
Expand Down
Loading
Loading