Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Schorn2008-02-22 12:25:38 +0000
committerMarkus Schorn2008-02-22 12:25:38 +0000
commit270e8513e64e2f839ff7f3796af8b3ed7f0610a4 (patch)
treeb827d5e35a0629198949adb4cf2ef7222019e87e /core/org.eclipse.cdt.ui.tests
parentb803bae59f466cd6b2fd3f7e937ab4324a5044d0 (diff)
downloadorg.eclipse.cdt-270e8513e64e2f839ff7f3796af8b3ed7f0610a4.tar.gz
org.eclipse.cdt-270e8513e64e2f839ff7f3796af8b3ed7f0610a4.tar.xz
org.eclipse.cdt-270e8513e64e2f839ff7f3796af8b3ed7f0610a4.zip
Bindings for names resolved via using declarations, bug 219424.
Diffstat (limited to 'core/org.eclipse.cdt.ui.tests')
-rw-r--r--core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java1
-rw-r--r--core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/BasicCallHierarchyTest.java5
2 files changed, 2 insertions, 4 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 f7fa06fa36f..091badedf65 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
@@ -349,7 +349,6 @@ public class BaseUITestCase extends BaseTestCase {
}
runEventQueue(10);
}
- runEventQueue(30000);
fail("Timeout expired waiting for tree node " + label + "{" + i0 + "," + i1 + "}");
return null;
}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/BasicCallHierarchyTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/BasicCallHierarchyTest.java
index 9ff62ade11c..9f6361883bf 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/BasicCallHierarchyTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/BasicCallHierarchyTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 Wind River Systems, Inc. and others.
+ * Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,6 @@
* Contributors:
* Markus Schorn - initial API and implementation
*******************************************************************************/
-
package org.eclipse.cdt.ui.tests.callhierarchy;
import java.io.IOException;
@@ -659,7 +658,7 @@ public class BasicCallHierarchyTest extends CallHierarchyBaseTest {
i1= checkTreeNode(tree, 0, 0, "gf()"); // sf()[f1] <- gf()
i2= checkTreeNode(tree, 0, 1, "sf()"); // sf()[f1] <- sf()[f1]
- checkTreeNode(i0, 2, null);
+ checkTreeNode(tree, 0, 2, null);
expandTreeItem(i1);
expandTreeItem(i2);

Back to the top