Skip to content

Commit 013f3fb

Browse files
committed
Add UI event processing after command, close editors after test
Fixes: #666
1 parent c5f5c9e commit 013f3fb

File tree

3 files changed

+26
-0
lines changed

3 files changed

+26
-0
lines changed

ui/org.eclipse.pde.genericeditor.extension.tests/src/org/eclipse/pde/genericeditor/extension/tests/AbstractTargetEditorTest.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
import org.eclipse.jface.text.contentassist.ICompletionProposal;
4242
import org.eclipse.pde.internal.genericeditor.target.extension.autocomplete.TargetDefinitionContentAssist;
4343
import org.eclipse.ui.IEditorPart;
44+
import org.eclipse.ui.IWorkbenchPage;
45+
import org.eclipse.ui.IWorkbenchWindow;
4446
import org.eclipse.ui.PlatformUI;
4547
import org.eclipse.ui.ide.IDE;
4648
import org.junit.After;
@@ -87,6 +89,14 @@ protected String getLocationForSite(String name) {
8789

8890
@After
8991
public void tearDown() throws Exception {
92+
// Close any editors we opened
93+
IWorkbenchWindow[] workbenchPages = PlatformUI.getWorkbench().getWorkbenchWindows();
94+
for (IWorkbenchWindow workbenchPage : workbenchPages) {
95+
IWorkbenchPage page = workbenchPage.getActivePage();
96+
if (page != null) {
97+
page.closeAllEditors(false);
98+
}
99+
}
90100
if (tempFile != null) {
91101
tempFile.delete();
92102
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package org.eclipse.pde.genericeditor.extension.tests;
2+
3+
import org.eclipse.swt.widgets.Display;
4+
5+
public class TestUtils {
6+
7+
public static void processUIEvents() {
8+
Display display = Display.getCurrent();
9+
if (display != null && !display.isDisposed()) {
10+
while (display.readAndDispatch()) {
11+
// Keep pumping events until the queue is empty
12+
}
13+
}
14+
}
15+
}

ui/org.eclipse.pde.genericeditor.extension.tests/src/org/eclipse/pde/genericeditor/extension/tests/UpdateUnitVersionsCommandTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ private void confirmVersionUpdates(Map<String, String> expected) throws Exceptio
8282
@SuppressWarnings("unchecked")
8383
String updatedText = ((CompletableFuture<String>) response).get();
8484
assertNotNull(updatedText);
85+
TestUtils.processUIEvents();
8586

8687
Map<String, String> actual = getVersionsForIdsFromTargetFile(updatedText);
8788

0 commit comments

Comments
 (0)