From 5784926857258d814b10fae376a623d544fcaec3 Mon Sep 17 00:00:00 2001 From: John Cortell Date: Fri, 17 Aug 2012 11:45:54 -0500 Subject: [PATCH] Fix bug in test utility resulting in intermittent failures --- .../ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 c8a9ef8cec8..e2c515c4d0c 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 @@ -41,6 +41,7 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.WorkbenchException; import org.eclipse.ui.handlers.IHandlerService; +import org.eclipse.ui.internal.WorkbenchPartReference; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; @@ -282,12 +283,15 @@ public class BaseUITestCase extends BaseTestCase { } final protected TreeItem checkTreeNode(IViewPart part, int i0, String label) { + IViewReference viewRef = part.getViewSite().getPage().findViewReference(part.getViewSite().getId()); + Control viewControl = ((WorkbenchPartReference)viewRef).getPane().getControl(); + Tree tree= null; TreeItem root= null; StringBuilder cands= new StringBuilder(); for (int i= 0; i < 400; i++) { cands.setLength(0); - Control[] trees= findControls(part.getSite().getShell(), Tree.class); + Control[] trees= findControls(viewControl, Tree.class); for (int j = 0; j < trees.length; j++) { try { tree= (Tree) trees[j];