mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 14:55:41 +02:00
Code Issues Wiki Activity

Improvements for automated UI-Tests

Browse source
This commit is contained in:
Markus Schorn 2007-05-14 10:52:11 +00:00
parent b61e9f2170
commit 04647950ec
4 changed files with 49 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java
View file

@ -21,6 +21,7 @@ import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Path;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Event;
@ -215,4 +216,51 @@ public class BaseUITestCase extends BaseTestCase {
return null; 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;
}
} }

48
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java
View file

@ -16,7 +16,6 @@ import org.eclipse.core.resources.IProject;
import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWTException; import org.eclipse.swt.SWTException;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem; import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException; import org.eclipse.ui.PartInitException;
@ -106,53 +105,6 @@ public class CallHierarchyBaseTest extends BaseUITestCase {
assertNotNull(ch); assertNotNull(ch);
return ch.getTreeViewer(); 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) { protected TreeItem checkTreeNode(TreeItem root, int i1, String label) {
TreeItem item= null; TreeItem item= null;

35
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java
View file

@ -16,7 +16,6 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException; import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI; import org.eclipse.ui.PlatformUI;
@ -95,38 +94,4 @@ public class IncludeBrowserBaseTest extends BaseUITestCase {
Tree tree= ib.getTreeViewer().getTree(); Tree tree= ib.getTreeViewer().getTree();
return tree; 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);
}
}
} }

47
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyBaseTest.java
View file

@ -151,52 +151,7 @@ public class TypeHierarchyBaseTest extends BaseUITestCase {
assertNotNull(th); assertNotNull(th);
return th.getMemberViewer(); 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) { protected TreeItem checkTreeNode(TreeItem root, int i1, String label) {
TreeItem item= null; TreeItem item= null;
try { try {