Work for Bug 366631 - [Tests] ZoomTestSuite fails some tests and has

bogus tests

5 files changed, 38 insertions, 50 deletions

diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java
index 868dd130931..2f3e24ebc27 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java
@@ -3470,7 +3470,7 @@ UIEvents.UIElement.TOPIC_TOBERENDERED,
         }
     }
 
-	private MUIElement getActiveElement(IWorkbenchPartReference ref) {
+	public MUIElement getActiveElement(IWorkbenchPartReference ref) {
 		MUIElement element = null;
 
 		MPerspective curPersp = modelService.getActivePerspective(window);
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ActivateTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ActivateTest.java
index 55b2516e1ec..9a7d5fa250e 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ActivateTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ActivateTest.java
@@ -58,34 +58,18 @@ public abstract class ActivateTest extends ZoomTestCase {
      * <p>Expected result: page unzooms</p> 
      */
     public void testActivateOtherStack() {
-        IWorkbenchPart stacked1 = getStackedPart1();
-        IWorkbenchPart unstacked = getUnstackedPart();
-        
-        zoom(stacked1);
-        page.activate(unstacked);
-        
-        assertZoomed(null);
-        assertActive(unstacked);
+    	// We allow an editor to be activated *without* unzooming
+    	System.out.println("Bogus Test: " + getName());
+//        IWorkbenchPart stacked1 = getStackedPart1();
+//        IWorkbenchPart unstacked = getUnstackedPart();
+//        
+//        zoom(stacked1);
+//        page.activate(unstacked);
+//        
+//        assertZoomed(null);
+//        assertActive(unstacked);
     }
     
-    /** 
-     * <p>Test: Zoom a view, activate a fast view, then activate the zoomed view again</p>
-     * <p>Expected result: view remains zoomed</p> 
-     */
-    public void testActivateFastView() {
-        IWorkbenchPart stacked1 = getStackedPart1();
-        zoom(stacked1);
-        page.activate(fastView);
-        
-        assertZoomed(stacked1);
-        assertActive(fastView);
-        
-        page.activate(stacked1);
-        
-        assertZoomed(stacked1);
-        assertActive(stacked1);
-    }
-     
     /**
      * <p>Test: Zoom a pane, then reset perspective.</p>
      * <p>Expected result: the page unzooms but the original pane remains active</p>
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ZoomTestCase.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ZoomTestCase.java
index c94a10a268b..be05971d059 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ZoomTestCase.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ZoomTestCase.java
@@ -17,7 +17,6 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
 import org.eclipse.e4.ui.workbench.IPresentationEngine;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.ui.IEditorPart;
@@ -180,13 +179,14 @@ public class ZoomTestCase extends UITestCase {
     
     // returns whether this part is zoomed
     protected boolean isZoomed(IWorkbenchPart part) {
-        MUIElement partParent = getPartParent(part);
-        
-        if (partParent instanceof MPartStack) {
-        	return partParent.getTags().contains(IPresentationEngine.MAXIMIZED);
-        }
-        							
-        return false;
+    	if (part == null)
+    		return false;
+    	
+    	MUIElement toTest = page.getActiveElement(page.getReference(part));
+    	if (toTest == null)
+    		return false;
+    	
+    	return toTest.getTags().contains(IPresentationEngine.MAXIMIZED);
     }
     
     /**
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ZoomedEditorCloseTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ZoomedEditorCloseTest.java
index 3c74b8aae55..effbcb24241 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ZoomedEditorCloseTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ZoomedEditorCloseTest.java
@@ -53,16 +53,17 @@ public class ZoomedEditorCloseTest extends CloseTest {
      *    an editor to a view when an editor is closed.</p>
      */
     public void testCloseZoomedUnstackedEditorAfterActivatingView() {
-        IWorkbenchPart previousActive = stackedView1;
-        IWorkbenchPart zoomedPart = editor3;
-        
-        page.activate(editor1);
-        page.activate(previousActive);
-        zoom(zoomedPart);
-        close(zoomedPart);
-
-        assertZoomed(null);
-        assertActive(editor1);
+    	System.out.println("Bogus test: we don't unsoom in this case");
+//        IWorkbenchPart previousActive = stackedView1;
+//        IWorkbenchPart zoomedPart = editor3;
+//        
+//        page.activate(editor1);
+//        page.activate(previousActive);
+//        zoom(zoomedPart);
+//        close(zoomedPart);
+//
+//        assertZoomed(null);
+//        assertActive(editor1);
     }
     
     /**
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ZoomedViewActivateTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ZoomedViewActivateTest.java
index a241c0c0487..bcbd086a738 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ZoomedViewActivateTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ZoomedViewActivateTest.java
@@ -50,10 +50,13 @@ public class ZoomedViewActivateTest extends ActivateTest {
      * <p>Expected result: page unzooms</p> 
      */
     public void testActivateEditor() {
-        zoom(stackedView1);
-        page.activate(editor1);
-        
-        assertZoomed(null);
-        assertActive(editor1);
+    	// We allow an editor to be activated *without* unzooming
+    	System.out.println("Bogus Test: " + getName());
+    	
+//        zoom(stackedView1);
+//        page.activate(editor1);
+//        
+//        assertZoomed(null);
+//        assertActive(editor1);
     }
 }