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

Fix for failing testcase.

Browse source
This commit is contained in:
Markus Schorn 2006-11-22 09:01:30 +00:00
parent 6d1289a31e
commit aa1849f26b
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java
View file

@ -157,7 +157,7 @@ public class IndexBugsTests extends BaseTestCase {
String varName= "arrayDataSize"; String varName= "arrayDataSize";
StringBuffer content= new StringBuffer(); StringBuffer content= new StringBuffer();
content.append("unsigned char arrayData[] = {\n"); content.append("unsigned char arrayData[] = {\n");
for(int i=0; i<1024*500-1; i++) { for(int i=0; i<1024*250-1; i++) {
content.append("0x00,"); content.append("0x00,");
} }
content.append("0x00};\n"); content.append("0x00};\n");
@ -165,11 +165,9 @@ public class IndexBugsTests extends BaseTestCase {
int indexOfDecl = content.indexOf(varName); int indexOfDecl = content.indexOf(varName);
assertTrue(CCorePlugin.getIndexManager().joinIndexer(80000, NPM)); assertTrue(CCorePlugin.getIndexManager().joinIndexer(80000, NPM));
long time= System.currentTimeMillis();
IFile file= createFile(getProject(), fileName, content.toString()); IFile file= createFile(getProject(), fileName, content.toString());
// must be done in a reasonable amount of time // must be done in a reasonable amount of time
waitUntilFileIsIndexed(file, 10000); waitUntilFileIsIndexed(file, 10000);
System.out.println((System.currentTimeMillis() -time));
fIndex.acquireReadLock(); fIndex.acquireReadLock();
try { try {
IIndexBinding[] bindings= fIndex.findBindings(getPattern("arrayDataSize"), true, IndexFilter.ALL, NPM); IIndexBinding[] bindings= fIndex.findBindings(getPattern("arrayDataSize"), true, IndexFilter.ALL, NPM);

29
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/AsyncViewerTest.java
View file

@ -192,15 +192,15 @@ public class AsyncViewerTest extends BaseUITestCase {
// + a // + a
// + b // + b
dlg.fViewer.setInput(root); runEventQueue(50); dlg.fViewer.setInput(root);
assertEquals(2, countVisibleItems(dlg.fViewer)); waitForItems(dlg.fViewer, 2);
// - a // - a
// - ... // - ...
// + b // + b
dlg.fViewer.setExpandedState(a, true); runEventQueue(50); dlg.fViewer.setExpandedState(a, true);
waitForItems(dlg.fViewer, 3);
assertEquals("...", dlg.fViewer.getTree().getItem(0).getItem(0).getText()); assertEquals("...", dlg.fViewer.getTree().getItem(0).getItem(0).getText());
assertEquals(3, countVisibleItems(dlg.fViewer));
// - a // - a
// + b // + b
@ -211,14 +211,15 @@ public class AsyncViewerTest extends BaseUITestCase {
// + a // + a
// + b // + b
dlg.fViewer.setInput(null); dlg.fViewer.setInput(null);
dlg.fViewer.setInput(root); runEventQueue(50); dlg.fViewer.setInput(root);
waitForItems(dlg.fViewer, 2);
// expand async with two children // expand async with two children
dlg.fViewer.setExpandedState(b, true); runEventQueue(50);
// + a // + a
// - b // - b
// - ... // - ...
assertEquals(3, countVisibleItems(dlg.fViewer)); dlg.fViewer.setExpandedState(b, true);
waitForItems(dlg.fViewer, 3);
assertEquals("...", dlg.fViewer.getTree().getItem(1).getItem(0).getText()); assertEquals("...", dlg.fViewer.getTree().getItem(1).getItem(0).getText());
// - a // - a
@ -231,17 +232,25 @@ public class AsyncViewerTest extends BaseUITestCase {
// + a // + a
// + b // + b
dlg.fViewer.setInput(null); dlg.fViewer.setInput(null);
dlg.fViewer.setInput(root); runEventQueue(50); dlg.fViewer.setInput(root);
waitForItems(dlg.fViewer, 2);
// wait until children are computed (for the sake of the +-sign) // wait until children are computed (for the sake of the +-sign)
runEventQueue(800); runEventQueue(800);
assertEquals(2, countVisibleItems(dlg.fViewer)); assertEquals(2, countVisibleItems(dlg.fViewer));
dlg.fViewer.setExpandedState(a, true); dlg.fViewer.setExpandedState(a, true);
assertEquals(2, countVisibleItems(dlg.fViewer)); waitForItems(dlg.fViewer, 2);
dlg.fViewer.setExpandedState(b, true); dlg.fViewer.setExpandedState(b, true);
assertEquals(4, countVisibleItems(dlg.fViewer)); waitForItems(dlg.fViewer, 4);
} }
private void waitForItems(TreeViewer viewer, int count) {
for (int i=0; i<100 && countVisibleItems(viewer) < count; i++) {
runEventQueue(10);
}
assertEquals(count, countVisibleItems(viewer));
}
public void testRecompute() throws InterruptedException { public void testRecompute() throws InterruptedException {
TestDialog dlg = createTestDialog(true); TestDialog dlg = createTestDialog(true);
Node a,b,c; Node a,b,c;