mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Fix occasional test failures.
This commit is contained in:
parent
450e32afb8
commit
c3e77eea37
2 changed files with 7 additions and 4 deletions
|
@ -87,6 +87,7 @@ public class IndexBugsTests extends BaseTestCase {
|
|||
super.setUp();
|
||||
fCProject= CProjectHelper.createCCProject("__bugsTest__", "bin", IPDOMManager.ID_FAST_INDEXER);
|
||||
CCorePlugin.getIndexManager().reindex(fCProject);
|
||||
waitForIndexer();
|
||||
fIndex= CCorePlugin.getIndexManager().getIndex(fCProject);
|
||||
}
|
||||
|
||||
|
@ -1370,9 +1371,8 @@ public class IndexBugsTests extends BaseTestCase {
|
|||
TestSourceReader.createFile(fCProject.getProject(), "f1/g/h/header.h", "#define ID three\n");
|
||||
TestSourceReader.createFile(fCProject.getProject(), "f1/g/source.cpp", contents + "int CONCAT(one, ID);\n");
|
||||
TestSourceReader.createFile(fCProject.getProject(), "f2/g/source.cpp", contents + "int CONCAT(two, ID);\n");
|
||||
IFile f= TestSourceReader.createFile(fCProject.getProject(), "f1/g/h/source.cpp", contents + "int CONCAT(three, ID);\n");
|
||||
waitUntilFileIsIndexed(f, 4000);
|
||||
indexManager.reindex(fCProject);
|
||||
TestSourceReader.createFile(fCProject.getProject(), "f1/g/h/source.cpp", contents + "int CONCAT(three, ID);\n");
|
||||
|
||||
waitForIndexer();
|
||||
fIndex.acquireReadLock();
|
||||
try {
|
||||
|
|
|
@ -7,8 +7,8 @@
|
|||
*
|
||||
* Contributors:
|
||||
* IBM Corporation - initial API and implementation
|
||||
* Markus Schorn (Wind River Systems)
|
||||
*******************************************************************************/
|
||||
|
||||
package org.eclipse.cdt.internal.pdom.tests;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
@ -146,6 +146,9 @@ public class PDOMSearchTest extends PDOMTestBase {
|
|||
// methods
|
||||
methods = class2.getDeclaredMethods();
|
||||
assertEquals(2, methods.length);
|
||||
if (methods[0].getName().equals("~Class1")) {
|
||||
IBinding h= methods[1]; methods[1]= methods[0]; methods[0]=h;
|
||||
}
|
||||
assertEquals("Class1", methods[0].getName());
|
||||
assertEquals("~Class1", methods[1].getName());
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue