mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Fix occasional test failures.

Browse source
This commit is contained in:
Markus Schorn 2008-11-07 12:10:54 +00:00
parent 450e32afb8
commit c3e77eea37
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -87,6 +87,7 @@ public class IndexBugsTests extends BaseTestCase {
super.setUp(); super.setUp();
fCProject= CProjectHelper.createCCProject("__bugsTest__", "bin", IPDOMManager.ID_FAST_INDEXER); fCProject= CProjectHelper.createCCProject("__bugsTest__", "bin", IPDOMManager.ID_FAST_INDEXER);
CCorePlugin.getIndexManager().reindex(fCProject); CCorePlugin.getIndexManager().reindex(fCProject);
waitForIndexer();
fIndex= CCorePlugin.getIndexManager().getIndex(fCProject); 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/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(), "f1/g/source.cpp", contents + "int CONCAT(one, ID);\n");
TestSourceReader.createFile(fCProject.getProject(), "f2/g/source.cpp", contents + "int CONCAT(two, 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"); TestSourceReader.createFile(fCProject.getProject(), "f1/g/h/source.cpp", contents + "int CONCAT(three, ID);\n");
waitUntilFileIsIndexed(f, 4000);
indexManager.reindex(fCProject);
waitForIndexer(); waitForIndexer();
fIndex.acquireReadLock(); fIndex.acquireReadLock();
try { try {

5
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java
View file

@ -7,8 +7,8 @@
* *
* Contributors: * Contributors:
* IBM Corporation - initial API and implementation * IBM Corporation - initial API and implementation
* Markus Schorn (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.pdom.tests; package org.eclipse.cdt.internal.pdom.tests;
import java.util.Arrays; import java.util.Arrays;
@ -146,6 +146,9 @@ public class PDOMSearchTest extends PDOMTestBase {
// methods // methods
methods = class2.getDeclaredMethods(); methods = class2.getDeclaredMethods();
assertEquals(2, methods.length); 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[0].getName());
assertEquals("~Class1", methods[1].getName()); assertEquals("~Class1", methods[1].getName());