An attempt at resolving a race condition/sporadic test failure in the CloseAllHandlerTest by reordering some testing scenarios, and making use of PlatformUI.getWorkbench().getActiveWorkbenchWindow() to get/init the active workbench window.

Author: feilimb

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/e4/CloseAllHandlerTest.java

@@ -45,9 +45,9 @@
 import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.ISources;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.internal.CloseAllHandler;
 import org.eclipse.ui.internal.Workbench;
 import org.junit.Before;
@@ -89,13 +89,13 @@ private MApplication getApplicationModel() {
 	 * Tests the enabled when and execution logic within the
 	 * {@link CloseAllHandler}.
 	 *
-	 * Scenario 1: E4 style part contribution which is tagged as representing an
+	 * Scenario 1: compatibility layer type editor is closed via the handler (and
+	 * the enablement of handler is checked).
+	 *
+	 * Scenario 2: E4 style part contribution which is tagged as representing an
 	 * 'editor' is closed via the handler (and the enablement of handler is
 	 * checked).
 	 *
-	 * Scenario 2: compatibility layer type editor is closed via the handler (and
-	 * the enablement of handler is checked).
-	 *
 	 * Scenario 3: a mix of an open compatibility layer type editor *and* an E4
 	 * style part contribution which is tagged as representing an 'editor' are both
 	 * closed via the handler (and the enablement of handler is checked).
@@ -114,35 +114,11 @@ public void testCloseMixedEditorTypes() {
 		boolean canExecute = handlerService.canExecute(parameterizedCommand);
 		assertFalse(canExecute);
 
-		// scenario 1: e4 part descriptor contribution
-		MPartDescriptor partDescriptor = createDummyPartDescriptor();
-		application.getDescriptors().add(partDescriptor);
-
-		// open our e4 part which represents an editor
-		MPart dummyPart = createAndOpenE4Part(partDescriptor);
-
-		// verify the close all handler is enabled now (since dummy editor has been
-		// opened)
-		canExecute = handlerService.canExecute(parameterizedCommand);
-		assertTrue(canExecute);
-
-		// close all editors (dummy editor should close!)
-		dummyPart = partService.findPart(DUMMY_E4_PART_ID);
-		assertNotNull(dummyPart);
-		handlerService.executeHandler(parameterizedCommand);
-		dummyPart = partService.findPart(DUMMY_E4_PART_ID);
-		assertNull(dummyPart);
-
-		// verify the close all handler is *not* enabled now (since dummy editor has
-		// been closed)
-		canExecute = handlerService.canExecute(parameterizedCommand);
-		assertFalse(canExecute);
-
 		// scenario 2: open a compatibility layer editor
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		assertNotNull("Active workbench window not found.", window);
+
 		IFileEditorInput input = new DummyFileEditorInput();
-		Object activeWindow = applicationContext.getActive(ISources.ACTIVE_WORKBENCH_WINDOW_NAME);
-		assertTrue("Active workbench window not found.", activeWindow instanceof IWorkbenchWindow);
-		IWorkbenchWindow window = (IWorkbenchWindow) activeWindow;
 		try {
 			window.getActivePage().openEditor(input, TEST_COMPATIBILITY_LAYER_EDITOR_ID);
 		} catch (PartInitException e) {
@@ -165,6 +141,30 @@ public void testCloseMixedEditorTypes() {
 		canExecute = handlerService.canExecute(parameterizedCommand);
 		assertFalse(canExecute);
 
+		// scenario 1: e4 part descriptor contribution
+		MPartDescriptor partDescriptor = createDummyPartDescriptor();
+		application.getDescriptors().add(partDescriptor);
+
+		// open our e4 part which represents an editor
+		MPart dummyPart = createAndOpenE4Part(partDescriptor);
+
+		// verify the close all handler is enabled now (since dummy editor has been
+		// opened)
+		canExecute = handlerService.canExecute(parameterizedCommand);
+		assertTrue(canExecute);
+
+		// close all editors (dummy editor should close!)
+		dummyPart = partService.findPart(DUMMY_E4_PART_ID);
+		assertNotNull(dummyPart);
+		handlerService.executeHandler(parameterizedCommand);
+		dummyPart = partService.findPart(DUMMY_E4_PART_ID);
+		assertNull(dummyPart);
+
+		// verify the close all handler is *not* enabled now (since dummy editor has
+		// been closed)
+		canExecute = handlerService.canExecute(parameterizedCommand);
+		assertFalse(canExecute);
+
 		// scenario 3:
 		// finally: re-open both the compatibility layer editor *and* the dummy e4 part
 		// which represents an editor, and verify they are *both* closed when we invoked