mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 20:05:35 +02:00
Code Issues Wiki Activity

Increased indexer timeout.

Browse source
This commit is contained in:
Sergey Prigogin 2012-05-21 21:02:37 -07:00
parent a17d1225d1
commit 9a4f1087e2
1 changed files with 41 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCompositeTests.java
View file

@ -51,8 +51,11 @@ public class IndexCompositeTests extends BaseTestCase {
return suite(IndexCompositeTests.class); return suite(IndexCompositeTests.class);
} }
private static final int NONE = 0, REFS = IIndexManager.ADD_DEPENDENCIES; private static final int NONE = 0;
private static final int REFD = IIndexManager.ADD_DEPENDENT, BOTH = REFS | REFD; private static final int REFS = IIndexManager.ADD_DEPENDENCIES;
private static final int REFD = IIndexManager.ADD_DEPENDENT;
private static final int BOTH = REFS | REFD;
private static final IndexFilter FILTER= new IndexFilter() { private static final IndexFilter FILTER= new IndexFilter() {
@Override @Override
public boolean acceptBinding(IBinding binding) throws CoreException { public boolean acceptBinding(IBinding binding) throws CoreException {
@ -75,7 +78,7 @@ public class IndexCompositeTests extends BaseTestCase {
// class B {}; // class B {};
public void testPairDisjointContent() throws Exception { public void testPairDisjointContent() throws Exception {
CharSequence[] contents = getContentsForTest(2); CharSequence[] contents = getContentsForTest(2);
List projects = new ArrayList(); List<ICProject> projects = new ArrayList<ICProject>();
try { try {
ProjectBuilder pb = new ProjectBuilder("projB" + System.currentTimeMillis(), true); ProjectBuilder pb = new ProjectBuilder("projB" + System.currentTimeMillis(), true);
@ -98,8 +101,8 @@ public class IndexCompositeTests extends BaseTestCase {
setIndex(cprojA, REFD); assertBCount(1, 1); setIndex(cprojA, REFD); assertBCount(1, 1);
setIndex(cprojA, BOTH); assertBCount(2, 2); setIndex(cprojA, BOTH); assertBCount(2, 2);
} finally { } finally {
for (Iterator i = projects.iterator(); i.hasNext();) for (ICProject project : projects)
((ICProject)i.next()).getProject().delete(true, true, new NullProgressMonitor()); project.getProject().delete(true, true, new NullProgressMonitor());
} }
} }
@ -122,7 +125,7 @@ public class IndexCompositeTests extends BaseTestCase {
// namespace X { class A2 {}; B2 b; C2 c; } // namespace X { class A2 {}; B2 b; C2 c; }
public void testTripleLinear() throws Exception { public void testTripleLinear() throws Exception {
CharSequence[] contents = getContentsForTest(3); CharSequence[] contents = getContentsForTest(3);
List projects = new ArrayList(); List<ICProject> projects = new ArrayList<ICProject>();
try { try {
ProjectBuilder pb = new ProjectBuilder("projC" + System.currentTimeMillis(), true); ProjectBuilder pb = new ProjectBuilder("projC" + System.currentTimeMillis(), true);
@ -214,8 +217,8 @@ public class IndexCompositeTests extends BaseTestCase {
assertNamespaceXMemberCount(5); assertNamespaceXMemberCount(5);
assertFieldCount("C1", 1); assertFieldCount("C1", 1);
} finally { } finally {
for (Iterator i = projects.iterator(); i.hasNext();) for (ICProject project : projects)
((ICProject)i.next()).getProject().delete(true, true, new NullProgressMonitor()); project.getProject().delete(true, true, new NullProgressMonitor());
} }
} }
@ -238,7 +241,7 @@ public class IndexCompositeTests extends BaseTestCase {
// void foo(C1 c) {} // void foo(C1 c) {}
public void testTripleUpwardV() throws Exception { public void testTripleUpwardV() throws Exception {
CharSequence[] contents = getContentsForTest(3); CharSequence[] contents = getContentsForTest(3);
List projects = new ArrayList(); List<ICProject> projects = new ArrayList<ICProject>();
try { try {
ProjectBuilder pb = new ProjectBuilder("projB" + System.currentTimeMillis(), true); ProjectBuilder pb = new ProjectBuilder("projB" + System.currentTimeMillis(), true);
@ -315,8 +318,8 @@ public class IndexCompositeTests extends BaseTestCase {
assertBCount(gABC, aABC); assertBCount(gABC, aABC);
assertNamespaceXMemberCount(4); assertNamespaceXMemberCount(4);
} finally { } finally {
for (Iterator i = projects.iterator(); i.hasNext();) for (ICProject project : projects)
((ICProject)i.next()).getProject().delete(true, true, new NullProgressMonitor()); project.getProject().delete(true, true, new NullProgressMonitor());
} }
} }
@ -337,7 +340,7 @@ public class IndexCompositeTests extends BaseTestCase {
// namespace X { class A2 {}; } // namespace X { class A2 {}; }
public void testTripleDownwardV() throws Exception { public void testTripleDownwardV() throws Exception {
CharSequence[] contents = getContentsForTest(3); CharSequence[] contents = getContentsForTest(3);
List projects = new ArrayList(); List<ICProject> projects = new ArrayList<ICProject>();
try { try {
ProjectBuilder pb = new ProjectBuilder("projC" + System.currentTimeMillis(), true); ProjectBuilder pb = new ProjectBuilder("projC" + System.currentTimeMillis(), true);
@ -412,8 +415,8 @@ public class IndexCompositeTests extends BaseTestCase {
assertBCount(gABC, aABC); assertBCount(gABC, aABC);
assertNamespaceXMemberCount(4); assertNamespaceXMemberCount(4);
} finally { } finally {
for (Iterator i = projects.iterator(); i.hasNext();) for (ICProject project : projects)
((ICProject)i.next()).getProject().delete(true, true, new NullProgressMonitor()); project.getProject().delete(true, true, new NullProgressMonitor());
} }
} }
@ -465,10 +468,11 @@ public class IndexCompositeTests extends BaseTestCase {
* Convenience class for setting up projects. * Convenience class for setting up projects.
*/ */
class ProjectBuilder { class ProjectBuilder {
private String name; private static final int INDEXER_TIMEOUT_SEC = 5;
private final String name;
private final boolean cpp;
private List dependencies = new ArrayList(); private List dependencies = new ArrayList();
private Map path2content = new HashMap(); private Map path2content = new HashMap();
private boolean cpp;
ProjectBuilder(String name, boolean cpp) { ProjectBuilder(String name, boolean cpp) {
this.name = name; this.name = name;
@ -503,7 +507,7 @@ class ProjectBuilder {
CCorePlugin.getIndexManager().setIndexerId(result, IPDOMManager.ID_FAST_INDEXER); CCorePlugin.getIndexManager().setIndexerId(result, IPDOMManager.ID_FAST_INDEXER);
if (lastFile != null) { if (lastFile != null) {
IIndex index= CCorePlugin.getIndexManager().getIndex(result); IIndex index= CCorePlugin.getIndexManager().getIndex(result);
TestSourceReader.waitUntilFileIsIndexed(index, lastFile, 2000); TestSourceReader.waitUntilFileIsIndexed(index, lastFile, INDEXER_TIMEOUT_SEC * 1000);
} }
BaseTestCase.waitForIndexer(result); BaseTestCase.waitForIndexer(result);
return result; return result;