Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Schorn2008-02-29 09:10:44 +0000
committerMarkus Schorn2008-02-29 09:10:44 +0000
commita8e7f57545b557806b2a10fb1fb95c3e4489d9c6 (patch)
tree7928261fc4ac1cc8c841e2497440f5daeb132cf4 /core/org.eclipse.cdt.ui.tests
parent2250f00e98e6da685c175678bd7b2643b34ad876 (diff)
downloadorg.eclipse.cdt-a8e7f57545b557806b2a10fb1fb95c3e4489d9c6.tar.gz
org.eclipse.cdt-a8e7f57545b557806b2a10fb1fb95c3e4489d9c6.tar.xz
org.eclipse.cdt-a8e7f57545b557806b2a10fb1fb95c3e4489d9c6.zip
Combine CFindNodeForOffsetAction and CPPFindNodeForOffsetAction.
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.java9
1 files changed, 5 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 091badedf65..2462696e3cf 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
@@ -328,12 +328,13 @@ public class BaseUITestCase extends BaseTestCase {
final String text= firstItem.getText();
if (text.length() > 0 && !text.equals("...")) {
item= root.getItem(i1);
- assertNotNull("Unexpected tree node " + item.getText(), label);
- if (label.equals(item.getText())) {
+ itemText= item.getText();
+ assertNotNull("Unexpected tree node " + itemText, label);
+ if (label.equals(itemText)) {
return item;
}
if (i > 100) {
- assertEquals(label, item.getText());
+ assertEquals(label, itemText);
return item;
}
}
@@ -349,7 +350,7 @@ public class BaseUITestCase extends BaseTestCase {
}
runEventQueue(10);
}
- fail("Timeout expired waiting for tree node " + label + "{" + i0 + "," + i1 + "}");
+ assertEquals("Timeout expired waiting for tree node {" + i0 + "," + i1 + "}", label, itemText);
return null;
}
}

Back to the top