1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00

Yet another attempt to fix BasicSearchTests

This commit is contained in:
Anton Leherbauer 2009-04-28 10:21:27 +00:00
parent 72a4c706d9
commit 7068e8db28

View file

@ -22,9 +22,11 @@ import junit.framework.TestSuite;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProvider;
@ -313,7 +315,7 @@ public class BasicSearchTest extends BaseUITestCase {
String newContent= "void bar() {}"; String newContent= "void bar() {}";
IFile file = fCProject.getProject().getFile(new Path("references.cpp")); IFile file = fCProject.getProject().getFile(new Path("references.cpp"));
file.setContents(new ByteArrayInputStream(newContent.getBytes()), IResource.FORCE, NPM); file.setContents(new ByteArrayInputStream(newContent.getBytes()), IResource.FORCE, NPM);
runEventQueue(1000); Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_REFRESH, null);
assertTrue(CCorePlugin.getIndexManager().joinIndexer(360000, new NullProgressMonitor())); assertTrue(CCorePlugin.getIndexManager().joinIndexer(360000, new NullProgressMonitor()));
assertOccurences(query, 1); assertOccurences(query, 1);
@ -338,7 +340,7 @@ public class BasicSearchTest extends BaseUITestCase {
String newContent2= "void bar() {foo(); foo();}"; String newContent2= "void bar() {foo(); foo();}";
file.setContents(new ByteArrayInputStream(newContent2.getBytes()), IResource.FORCE, NPM); file.setContents(new ByteArrayInputStream(newContent2.getBytes()), IResource.FORCE, NPM);
runEventQueue(1000); Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_REFRESH, null);
assertTrue(CCorePlugin.getIndexManager().joinIndexer(360000, new NullProgressMonitor())); assertTrue(CCorePlugin.getIndexManager().joinIndexer(360000, new NullProgressMonitor()));
assertOccurences(query, 3); assertOccurences(query, 3);