1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00

No longer depends on sort order.

This commit is contained in:
Ken Ryall 2008-01-21 19:49:09 +00:00
parent de8fa2cc7d
commit b87dd32cf9

View file

@ -120,16 +120,21 @@ public class BasicSearchTest extends BaseUITestCase {
// project results are in a project node, containing directories and files // project results are in a project node, containing directories and files
Object[] resultElements = scp.getElements(result); Object[] resultElements = scp.getElements(result);
String label0= labpv.getText(resultElements[0]); String label0= labpv.getText(resultElements[0]);
String label1= labpv.getText(resultElements[1]);
// external results are in a tree, directory containing files // external results are in a tree, directory containing files
Object externalResult = resultElements[1]; Object externalResult = resultElements[1];
String path1= labpv.getText(externalResult); String path1= labpv.getText(externalResult);
String file1= labpv.getText(scp.getElements(externalResult)[0]); String file1= labpv.getText(scp.getElements(externalResult)[0]);
externalResult = resultElements[0];
String path2= labpv.getText(externalResult);
String file2= labpv.getText(scp.getElements(externalResult)[0]);
// check the results are rendered // check the results are rendered
String expected0= fCProject.getProject().getName(); String expected0= fCProject.getProject().getName();
String expected1= new Path(externalFile.getAbsolutePath()).toString(); String expected1= new Path(externalFile.getAbsolutePath()).toString();
assertEquals(expected0,label0); assertTrue(expected0.equals(label0) || expected0.equals(label1));
assertEquals(expected1,new Path(path1).append(file1).toString()); assertTrue(expected1.equals(new Path(path1).append(file1).toString()) || expected1.equals(new Path(path2).append(file2).toString()));
} }
// int x, y, xx, yy; // int x, y, xx, yy;
@ -242,11 +247,19 @@ public class BasicSearchTest extends BaseUITestCase {
// if all the hits were found // if all the hits were found
if (elements.length < maximumHits) { if (elements.length < maximumHits) {
// first result is an IStatus indicating indexer was busy // first result is an IStatus indicating indexer was busy
IStatus firstRootNode = (IStatus) scp.getElements(result)[0]; Object[] nodeElements = scp.getElements(result);
Object node = nodeElements[0];
if (!(node instanceof IStatus))
node = nodeElements[1];
if (node instanceof IStatus)
{
IStatus firstRootNode = (IStatus) node;
assertEquals(IStatus.WARNING, firstRootNode.getSeverity()); assertEquals(IStatus.WARNING, firstRootNode.getSeverity());
// can't really verify text in case message is localized... // can't really verify text in case message is localized...
} }
else
fail("can't get status");
}
} else { } else {
// must NOT have the IStatus // must NOT have the IStatus
Object firstRootNode = scp.getElements(result)[0]; Object firstRootNode = scp.getElements(result)[0];