From bd08d38101e2bb778778bbab5b88f600a26cc246 Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Wed, 13 Jun 2007 12:59:12 +0000
Subject: [PATCH] Fixes linux-specific failures in the automated ui-tests.

---
 .../eclipse/cdt/ui/tests/BaseUITestCase.java  | 34 +++++++++++++------
 .../callhierarchy/CallHierarchyBugs.java      |  2 +-
 .../callhierarchy/CallHierarchyTestSuite.java |  2 +-
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java
index 4b8f5dfa40a..e37b46f89ba 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java
@@ -28,8 +28,9 @@ import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IViewReference;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPartSite;
 import org.eclipse.ui.IWorkbenchWindow;
@@ -46,7 +47,6 @@ import org.eclipse.cdt.core.model.CModelException;
 import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.core.testplugin.util.BaseTestCase;
 import org.eclipse.cdt.core.testplugin.util.TestSourceReader;
-import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.testplugin.CTestPlugin;
 
 public class BaseUITestCase extends BaseTestCase {
@@ -142,10 +142,10 @@ public class BaseUITestCase extends BaseTestCase {
 	}
 	
 	protected void expandTreeItem(TreeItem item) {
-		item.setExpanded(true);
 		Event event = new Event();
 		event.item = item;
 		item.getParent().notifyListeners(SWT.Expand, event);	
+		item.setExpanded(true);
 		runEventQueue(0);
 	}
 
@@ -190,9 +190,21 @@ public class BaseUITestCase extends BaseTestCase {
 		}
 	}
 	
-	protected void showCDTPerspective() throws WorkbenchException {
-		final IWorkbench workbench = PlatformUI.getWorkbench();
-		workbench.showPerspective(CUIPlugin.ID_CPERSPECTIVE, workbench.getActiveWorkbenchWindow());
+	protected void restoreAllParts() throws WorkbenchException {
+		IWorkbenchPage page= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+		page.zoomOut();
+		runEventQueue(0);
+
+		IViewReference[] viewRefs= page.getViewReferences();
+		for (int i = 0; i < viewRefs.length; i++) {
+			IViewReference ref = viewRefs[i];
+			page.setPartState(ref, IWorkbenchPage.STATE_RESTORED);
+		}
+		IEditorReference[] editorRefs= page.getEditorReferences();
+		for (int i = 0; i < editorRefs.length; i++) {
+			IEditorReference ref = editorRefs[i];
+			page.setPartState(ref, IWorkbenchPage.STATE_RESTORED);
+		}
 		runEventQueue(0);
 	}
 	
@@ -214,15 +226,18 @@ public class BaseUITestCase extends BaseTestCase {
 	}
 	
 	protected Control getFocusControl(Class clazz, Control differentTo, int wait) {
+		Control fc= null;
 		for (int i = 0; i <= wait/10; i++) {
-			Control fc= Display.getCurrent().getFocusControl();
+			fc= Display.getCurrent().getFocusControl();
 			if (clazz.isInstance(fc) && fc != differentTo) {
 				return fc;
 			}
 			runEventQueue(10);
 		}
-		fail();
-		return null;
+		assertNotNull(fc);
+		assertTrue(fc != differentTo);
+		assertTrue("Unexpected class " + fc.getClass().getName(), clazz.isInstance(fc));
+		return fc;
 	}
 
 	final protected TreeItem checkTreeNode(Tree tree, int i0, String label) {
@@ -272,5 +287,4 @@ public class BaseUITestCase extends BaseTestCase {
 		assertEquals(label, item.getText());
 		return item;
 	}
-
 }
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBugs.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBugs.java
index 885719a22e0..0ab8c2cf5b4 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBugs.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBugs.java
@@ -42,7 +42,7 @@ public class CallHierarchyBugs extends CallHierarchyBaseTest {
 
 	protected void setUp() throws Exception {
 		super.setUp();
-		showCDTPerspective();
+		restoreAllParts();
 	}
 	
 	// class SomeClass {
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyTestSuite.java
index a0e678be4a6..2e5dcfa0fe6 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyTestSuite.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyTestSuite.java
@@ -20,7 +20,7 @@ public class CallHierarchyTestSuite extends TestSuite {
     }
     
     public CallHierarchyTestSuite() {
-        super("Tests in package org.eclipse.cdt.ui.tests.callhierarchy");
+        super(CallHierarchyTestSuite.class.getName());
         addTest(BasicCallHierarchyTest.suite());
         addTest(BasicCppCallHierarchyTest.suite());
         addTest(InitializersInCallHierarchyTest.suite());