From c3e77eea378ea3ff03527a487b11f12e6b251293 Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Fri, 7 Nov 2008 12:10:54 +0000 Subject: [PATCH] Fix occasional test failures. --- .../eclipse/cdt/internal/index/tests/IndexBugsTests.java | 6 +++--- .../org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java index fc2396899fb..edb7b9b2cad 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java @@ -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 { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java index 2f99b6c8b15..ddc227b4a86 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java @@ -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());