mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 10:16:03 +02:00
Code Issues Wiki Activity

Fix occasional JUnit failure.

Browse source
This commit is contained in:
Markus Schorn 2010-05-18 07:55:53 +00:00
parent 09ee27c920
commit f40a8f3e32
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CppCallHierarchyTest.java
View file

@ -252,9 +252,9 @@ public class CppCallHierarchyTest extends CallHierarchyBaseTest {
openCallHierarchy(editor, false); openCallHierarchy(editor, false);
TreeViewer tv = getCHTreeViewer(); TreeViewer tv = getCHTreeViewer();
TreeItem item= checkTreeNode(tv.getTree(), 0, "main()"); checkTreeNode(tv.getTree(), 0, "main()");
TreeItem nextItem= checkTreeNode(item, 0, "MyClass::method1()"); TreeItem item= checkTreeNode(tv.getTree(), 0, 0, "MyClass::method1()");
checkTreeNode(item, 1, null); item= nextItem; checkTreeNode(tv.getTree(), 0, 1, null);
tv.setExpandedState(item.getData(), true); tv.setExpandedState(item.getData(), true);
TreeItem item0= checkTreeNode(item, 0, "MyClass::method1()"); TreeItem item0= checkTreeNode(item, 0, "MyClass::method1()");
@ -264,21 +264,21 @@ public class CppCallHierarchyTest extends CallHierarchyBaseTest {
// method 1 // method 1
try { try {
tv.setExpandedState(item0.getData(), true); tv.setExpandedState(item0.getData(), true);
nextItem= checkTreeNode(item0, 0, "MyClass::method2()"); checkTreeNode(item0, 0, "MyClass::method2()");
} }
catch (Throwable e) { catch (Throwable e) {
TreeItem tmp= item0; item0= item1; item1= tmp; TreeItem tmp= item0; item0= item1; item1= tmp;
} }
expandTreeItem(item0); expandTreeItem(item0);
nextItem= checkTreeNode(item0, 0, "MyClass::method2()"); item= checkTreeNode(item0, 0, "MyClass::method2()");
checkTreeNode(item0, 1, null); item0= nextItem; checkTreeNode(item0, 1, null); item0= item;
tv.setExpandedState(item0.getData(), true); tv.setExpandedState(item0.getData(), true);
checkTreeNode(item0, 0, null); checkTreeNode(item0, 0, null);
// method 2 // method 2
tv.setExpandedState(item1.getData(), true); tv.setExpandedState(item1.getData(), true);
nextItem= checkTreeNode(item1, 0, "MyClass::method3()"); item= checkTreeNode(item1, 0, "MyClass::method3()");
checkTreeNode(item1, 1, null); item1= nextItem; checkTreeNode(item1, 1, null); item1= item;
tv.setExpandedState(item1.getData(), true); tv.setExpandedState(item1.getData(), true);
checkTreeNode(item1, 0, null); checkTreeNode(item1, 0, null);
} }