From 04647950ec032670ec175ccb2fedb8fb1834b905 Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Mon, 14 May 2007 10:52:11 +0000
Subject: [PATCH] Improvements for automated UI-Tests

---
 .../eclipse/cdt/ui/tests/BaseUITestCase.java  | 48 +++++++++++++++++++
 .../callhierarchy/CallHierarchyBaseTest.java  | 48 -------------------
 .../IncludeBrowserBaseTest.java               | 35 --------------
 .../typehierarchy/TypeHierarchyBaseTest.java  | 47 +-----------------
 4 files changed, 49 insertions(+), 129 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 c53162254ed..3e88e6a3272 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
@@ -21,6 +21,7 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.SWTException;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
@@ -215,4 +216,51 @@ public class BaseUITestCase extends BaseTestCase {
 		return null;
 	}
 
+	final protected TreeItem checkTreeNode(Tree tree, int i0, String label) {
+		TreeItem root= null;
+		for (int i=0; i<200; i++) {
+			try {
+				root= tree.getItem(i0);
+				if (label.equals(root.getText())) {
+					return root;
+				}
+			} 
+			catch (SWTException e) {
+				// in case widget was disposed, item may be replaced
+			}
+			catch (IllegalArgumentException e) {
+				// item does not yet exist.
+			}
+			runEventQueue(10);
+		}
+		assertNotNull("Tree node " + label + "{" + i0 + "} does not exist!", root);
+		assertEquals(label, root.getText());
+		return root;
+	}
+	
+	final protected TreeItem checkTreeNode(Tree tree, int i0, int i1, String label) {
+		TreeItem item= null;
+		TreeItem root= tree.getItem(i0);
+		for (int i=0; i<200; i++) {
+			try {
+				item= root.getItem(i1);
+				if (!"...".equals(item.getText())) {
+					break;
+				}
+			} catch (SWTException e) {
+				// in case widget was disposed, item may be replaced
+			}
+			catch (IllegalArgumentException e) {
+				if (label == null) {
+					return null;
+				}
+			}
+			runEventQueue(10);
+		}
+		assertNotNull("Tree node " + label + "{" + i0 + "," + i1 + "} does not exist!", item);
+		assertNotNull("Unexpected tree node " + item.getText(), label);
+		assertEquals(label, item.getText());
+		return item;
+	}
+
 }
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java
index 161cf205c9b..e8582e3bc69 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java
@@ -16,7 +16,6 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.text.ITextSelection;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWTException;
-import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
@@ -106,53 +105,6 @@ public class CallHierarchyBaseTest extends BaseUITestCase {
 		assertNotNull(ch);
 		return ch.getTreeViewer();
 	}
-
-	protected TreeItem checkTreeNode(Tree tree, int i0, String label) {
-		TreeItem root= null;
-		for (int i=0; i<200; i++) {
-			try {
-				root= tree.getItem(i0);
-				if (label.equals(root.getText())) {
-					return root;
-				}
-			} 
-			catch (SWTException e) {
-				// in case widget was disposed, item may be replaced
-			}
-			catch (IllegalArgumentException e) {
-				// item does not yet exist.
-			}
-			runEventQueue(10);
-		}
-		assertNotNull("Tree node " + label + "{" + i0 + "} does not exist!", root);
-		assertEquals(label, root.getText());
-		return root;
-	}
-
-	protected TreeItem checkTreeNode(Tree tree, int i0, int i1, String label) {
-		TreeItem item= null;
-		TreeItem root= tree.getItem(i0);
-		for (int i=0; i<200; i++) {
-			try {
-				item= root.getItem(i1);
-				if (!"...".equals(item.getText())) {
-					break;
-				}
-			} catch (SWTException e) {
-				// in case widget was disposed, item may be replaced
-			}
-			catch (IllegalArgumentException e) {
-				if (label == null) {
-					return null;
-				}
-			}
-			runEventQueue(10);
-		}
-		assertNotNull("Tree node " + label + "{" + i0 + "," + i1 + "} does not exist!", item);
-		assertNotNull("Unexpected tree node " + item.getText(), label);
-		assertEquals(label, item.getText());
-		return item;
-	}
 	
 	protected TreeItem checkTreeNode(TreeItem root, int i1, String label) {
 		TreeItem item= null;
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java
index ad10fce5a1f..9f91b681b83 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java
@@ -16,7 +16,6 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
@@ -95,38 +94,4 @@ public class IncludeBrowserBaseTest extends BaseUITestCase {
 		Tree tree= ib.getTreeViewer().getTree();
 		return tree;
 	}
-
-	protected void checkTreeNode(Tree tree, int i0, String label) {
-		TreeItem root= null;
-		try {
-			for (int i=0; i<200; i++) {
-				root= tree.getItem(i0);
-				if (!"...".equals(root.getText())) {
-					break;
-				}
-				runEventQueue(10);
-			}
-		}
-		catch (IllegalArgumentException e) {
-			assertTrue("Tree node " + label + "{" + i0 + "} does not exist!", false);
-		}
-		assertEquals(label, root.getText());
-	}
-
-	protected void checkTreeNode(Tree tree, int i0, int i1, String label) {
-		try {
-			TreeItem root= tree.getItem(i0);
-			TreeItem item= root.getItem(i1);
-			for (int i=0; i<200; i++) {
-				if (!"...".equals(item.getText())) {
-					break;
-				}
-				runEventQueue(10);
-			}
-			assertEquals(label, item.getText());
-		}
-		catch (IllegalArgumentException e) {
-			assertTrue("Tree node " + label + "{" + i0 + "," + i1 + "} does not exist!", false);
-		}
-	}
 }
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyBaseTest.java
index 12570d5bc80..7f8cd731701 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyBaseTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyBaseTest.java
@@ -151,52 +151,7 @@ public class TypeHierarchyBaseTest extends BaseUITestCase {
 		assertNotNull(th);
 		return th.getMemberViewer();
 	}
-
-	protected TreeItem checkTreeNode(Tree tree, int i0, String label) {
-		TreeItem root= null;
-		try {
-			for (int i=0; i<200; i++) {
-				root= tree.getItem(i0);
-				try {
-					if (!"...".equals(root.getText())) {
-						break;
-					}
-				} catch (SWTException e) {
-					// in case widget was disposed, item may be replaced
-				}
-				runEventQueue(10);
-			}
-		}
-		catch (IllegalArgumentException e) {
-			fail("Tree node " + label + "{" + i0 + "} does not exist!");
-		}
-		assertEquals(label, root.getText());
-		return root;
-	}
-
-	protected TreeItem checkTreeNode(Tree tree, int i0, int i1, String label) {
-		TreeItem item= null;
-		try {
-			TreeItem root= tree.getItem(i0);
-			for (int i=0; i<200; i++) {
-				item= root.getItem(i1);
-				try {
-					if (!"...".equals(item.getText())) {
-						break;
-					}
-				} catch (SWTException e) {
-					// in case widget was disposed, item may be replaced
-				}
-				runEventQueue(10);
-			}
-		}
-		catch (IllegalArgumentException e) {
-			fail("Tree node " + label + "{" + i0 + "," + i1 + "} does not exist!");
-		}
-		assertEquals(label, item.getText());
-		return item;
-	}
-	
+		
 	protected TreeItem checkTreeNode(TreeItem root, int i1, String label) {
 		TreeItem item= null;
 		try {