diff --git a/core/org.eclipse.cdt.core.tests/failures/org/eclipse/cdt/core/model/failedTests/CModelElementsFailedTests.java b/core/org.eclipse.cdt.core.tests/failures/org/eclipse/cdt/core/model/failedTests/CModelElementsFailedTests.java index f3340e1e08d..b41abe5b46c 100644 --- a/core/org.eclipse.cdt.core.tests/failures/org/eclipse/cdt/core/model/failedTests/CModelElementsFailedTests.java +++ b/core/org.eclipse.cdt.core.tests/failures/org/eclipse/cdt/core/model/failedTests/CModelElementsFailedTests.java @@ -17,6 +17,7 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.CTestPlugin; @@ -52,7 +53,7 @@ public class CModelElementsFailedTests extends TestCase { monitor = new NullProgressMonitor(); String pluginRoot = CTestPlugin.getDefault().find(new Path("/")).getFile(); - fCProject= CProjectHelper.createCCProject("TestProject1", "bin"); + fCProject= CProjectHelper.createCCProject("TestProject1", "bin", IPDOMManager.ID_NO_INDEXER); headerFile = fCProject.getProject().getFile("CModelElementsTest.h"); if (!headerFile.exists()) { try{ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java index c8745ad0768..e28ebe71260 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java @@ -17,6 +17,7 @@ import java.io.FileNotFoundException; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.IArchive; import org.eclipse.cdt.core.model.IBinary; import org.eclipse.cdt.core.model.ICElement; @@ -83,7 +84,7 @@ public class ArchiveTests extends TestCase { * Setup the various files, paths and projects that are needed by the * tests */ - testProject=CProjectHelper.createCProject("filetest", "none"); + testProject=CProjectHelper.createCProject("filetest", "none", IPDOMManager.ID_NO_INDEXER); if (testProject==null) fail("Unable to create project"); diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/BinaryTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/BinaryTests.java index 83f30a84bb8..1b75eb7410f 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/BinaryTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/BinaryTests.java @@ -20,6 +20,7 @@ import junit.framework.TestSuite; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ICDescriptor; import org.eclipse.cdt.core.ICDescriptorOperation; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.IBinary; import org.eclipse.cdt.core.model.ICElement; @@ -92,7 +93,7 @@ public class BinaryTests extends TestCase { * tests */ - testProject=CProjectHelper.createCProject("filetest", "none"); + testProject=CProjectHelper.createCProject("filetest", "none", IPDOMManager.ID_NO_INDEXER); // since our test require that we can read the debug info from the exe whne must set the GNU elf // binary parser since the default (generic elf binary parser) does not do this. diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelElementsTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelElementsTests.java index 06aea0f77ce..9cf65b3ad58 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelElementsTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelElementsTests.java @@ -18,6 +18,7 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICElement; @@ -69,7 +70,7 @@ public class CModelElementsTests extends TestCase { protected void setUp() throws Exception { monitor = new NullProgressMonitor(); - fCProject= CProjectHelper.createCCProject("TestProject1", "bin"); + fCProject= CProjectHelper.createCCProject("TestProject1", "bin", IPDOMManager.ID_NO_INDEXER); headerFile = fCProject.getProject().getFile("CModelElementsTest.h"); includedFile = fCProject.getProject().getFile("included.h"); if (!headerFile.exists()) { diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java index 68b8fb7b3f2..6dc460dbe4d 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java @@ -19,6 +19,7 @@ import junit.framework.TestSuite; import org.eclipse.cdt.core.CCProjectNature; import org.eclipse.cdt.core.CProjectNature; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; @@ -114,7 +115,7 @@ public class CModelTests extends TestCase { */ public void testHasNature() throws CoreException { ICProject testProject; - testProject=CProjectHelper.createCProject("naturetest", "none"); + testProject=CProjectHelper.createCProject("naturetest", "none", IPDOMManager.ID_NO_INDEXER); if (testProject==null) fail("Unable to create project"); assertTrue("hasCNature works", CoreModel.hasCNature(testProject.getProject())); @@ -140,7 +141,7 @@ public class CModelTests extends TestCase { */ public void testFileType() throws CoreException,FileNotFoundException { ICProject testProject; - testProject=CProjectHelper.createCProject("filetest", "none"); + testProject=CProjectHelper.createCProject("filetest", "none", IPDOMManager.ID_NO_INDEXER); if (testProject==null) fail("Unable to create project"); diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java index 286d7e56a1b..65f956754da 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java @@ -13,13 +13,14 @@ package org.eclipse.cdt.core.model.tests; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ElementChangedEvent; import org.eclipse.cdt.core.model.ICElementDelta; -import org.eclipse.cdt.core.model.IContainerEntry; -import org.eclipse.cdt.core.model.IPathEntry; import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IContainerEntry; import org.eclipse.cdt.core.model.IElementChangedListener; +import org.eclipse.cdt.core.model.IPathEntry; import org.eclipse.cdt.core.model.IPathEntryContainer; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.CTestPlugin; @@ -135,7 +136,7 @@ public class CPathEntryTest extends TestCase { */ public void testCPathEntries() throws CoreException { ICProject testProject; - testProject = CProjectHelper.createCProject("cpathtest", "none"); + testProject = CProjectHelper.createCProject("cpathtest", "none", IPDOMManager.ID_NO_INDEXER); if (testProject == null) { fail("Unable to create project"); } @@ -164,7 +165,7 @@ public class CPathEntryTest extends TestCase { */ public void testCPathEntriesDelta() throws CoreException { ICProject testProject; - testProject = CProjectHelper.createCProject("cpathtest", "none"); + testProject = CProjectHelper.createCProject("cpathtest", "none", IPDOMManager.ID_NO_INDEXER); if (testProject == null) { fail("Unable to create project"); } @@ -187,7 +188,7 @@ public class CPathEntryTest extends TestCase { */ public void testPathEntryContainer() throws CoreException { ICProject testProject; - testProject = CProjectHelper.createCProject("cpathtest", "none"); + testProject = CProjectHelper.createCProject("cpathtest", "none", IPDOMManager.ID_NO_INDEXER); if (testProject == null) { fail("Unable to create project"); } diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java index 2b84ba567a5..3866c671a8c 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java @@ -21,6 +21,7 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ElementChangedEvent; @@ -68,7 +69,7 @@ public class ElementDeltaTests extends TestCase implements IElementChangedListen protected void setUp() throws Exception { monitor = new NullProgressMonitor(); - fCProject= CProjectHelper.createCCProject("TestProject1", "bin"); + fCProject= CProjectHelper.createCCProject("TestProject1", "bin", IPDOMManager.ID_NO_INDEXER); //Path filePath = new Path(ResourcesPlugin.getWorkspace().getRoot().getLocation().toString()+ fCProject.getPath().toString()+ "/WorkingCopyTest.h"); headerFile = fCProject.getProject().getFile("WorkingCopyTest.h"); if (!headerFile.exists()) { diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IntegratedCModelTest.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IntegratedCModelTest.java index c58672f6f37..221066e611d 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IntegratedCModelTest.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IntegratedCModelTest.java @@ -20,6 +20,7 @@ import java.io.FileNotFoundException; import junit.framework.TestCase; import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICProject; @@ -69,7 +70,7 @@ public abstract class IntegratedCModelTest extends TestCase { public void setUp() throws Exception { monitor = new NullProgressMonitor(); - fCProject= CProjectHelper.createCCProject("TestProject1", "bin"); + fCProject= CProjectHelper.createCCProject("TestProject1", "bin", IPDOMManager.ID_NO_INDEXER); sourceFile = fCProject.getProject().getFile( getSourcefileResource() ); if (!sourceFile.exists()) { try{ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java index c89eef71179..a7cadab8b76 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java @@ -19,6 +19,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICElement; @@ -70,7 +71,7 @@ public class StructuralCModelElementsTests extends TestCase { protected void setUp() throws Exception { monitor = new NullProgressMonitor(); - fCProject= CProjectHelper.createCCProject("TestProject1", "bin"); //$NON-NLS-1$ //$NON-NLS-2$ + fCProject= CProjectHelper.createCCProject("TestProject1", "bin", IPDOMManager.ID_NO_INDEXER); //$NON-NLS-1$ //$NON-NLS-2$ headerFile = fCProject.getProject().getFile("CModelElementsTest.h"); //$NON-NLS-1$ includedFile = fCProject.getProject().getFile("included.h"); //$NON-NLS-1$ if (!headerFile.exists()) { diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitBaseTest.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitBaseTest.java index b3eaf38ccea..737ea849866 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitBaseTest.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitBaseTest.java @@ -14,6 +14,7 @@ import java.io.FileInputStream; import junit.framework.TestCase; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.CTestPlugin; @@ -95,7 +96,7 @@ public class TranslationUnitBaseTest extends TestCase * tests */ - testProject=CProjectHelper.createCProject("filetest", "none"); + testProject=CProjectHelper.createCProject("filetest", "none", IPDOMManager.ID_NO_INDEXER); if (testProject==null) fail("Unable to create project"); diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java index f8b27cf389e..1d4b78875fe 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java @@ -18,6 +18,7 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.IBuffer; import org.eclipse.cdt.core.model.ICProject; @@ -58,7 +59,7 @@ public class WorkingCopyTests extends TestCase { protected void setUp() throws Exception { monitor = new NullProgressMonitor(); - fCProject= CProjectHelper.createCCProject("TestProject1", "bin"); + fCProject= CProjectHelper.createCCProject("TestProject1", "bin", IPDOMManager.ID_NO_INDEXER); //Path filePath = new Path(ResourcesPlugin.getWorkspace().getRoot().getLocation().toString()+ fCProject.getPath().toString()+ "/WorkingCopyTest.h"); headerFile = fCProject.getProject().getFile("WorkingCopyTest.h"); if (!headerFile.exists()) { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/FileBasePluginTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/FileBasePluginTest.java index 53179bda540..bebae700bea 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/FileBasePluginTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/FileBasePluginTest.java @@ -22,6 +22,7 @@ import java.util.List; import junit.framework.TestCase; import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.parser.CodeReader; import org.eclipse.cdt.core.parser.IParser; @@ -101,8 +102,7 @@ public class FileBasePluginTest extends TestCase { workspace = ResourcesPlugin.getWorkspace(); try { - cPrj = CProjectHelper.createCCProject("ParserTestProject", "bin"); //$NON-NLS-1$ //$NON-NLS-2$ - + cPrj = CProjectHelper.createCCProject("ParserTestProject", "bin", IPDOMManager.ID_NO_INDEXER); //$NON-NLS-1$ //$NON-NLS-2$ project = cPrj.getProject(); // ugly @@ -148,6 +148,8 @@ public class FileBasePluginTest extends TestCase { for( int i = 0; i < members.length; i++ ){ if( members[i].getName().equals( ".project" ) || members[i].getName().equals( ".cdtproject" ) ) //$NON-NLS-1$ //$NON-NLS-2$ continue; + if (members[i].getName().equals(".settings")) + continue; try{ members[i].delete( false, monitor ); } catch( Throwable e ){ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2FileBasePluginTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2FileBasePluginTest.java index 29b5d447b3b..7bdd914d8b2 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2FileBasePluginTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2FileBasePluginTest.java @@ -53,7 +53,7 @@ public class AST2FileBasePluginTest extends TestCase { workspace = ResourcesPlugin.getWorkspace(); try { - cPrj = CProjectHelper.createCCProject("AST2BasedProjectMofo", "bin"); //$NON-NLS-1$ //$NON-NLS-2$ + cPrj = CProjectHelper.createCCProject("AST2BasedProjectMofo", "bin", IPDOMManager.ID_NO_INDEXER); //$NON-NLS-1$ //$NON-NLS-2$ project = cPrj.getProject(); @@ -101,6 +101,8 @@ public class AST2FileBasePluginTest extends TestCase { for( int i = 0; i < members.length; i++ ){ if( members[i].getName().equals( ".project" ) || members[i].getName().equals( ".cdtproject" ) ) //$NON-NLS-1$ //$NON-NLS-2$ continue; + if (members[i].getName().equals(".settings")) + continue; try{ members[i].delete( false, monitor ); } catch( Throwable e ){ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMFileBasePluginTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMFileBasePluginTest.java index abf0affcef0..d4b9d9bb946 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMFileBasePluginTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMFileBasePluginTest.java @@ -53,8 +53,7 @@ public class DOMFileBasePluginTest extends TestCase { workspace = ResourcesPlugin.getWorkspace(); try { - cPrj = CProjectHelper.createCCProject("ParserTestProject", "bin"); //$NON-NLS-1$ //$NON-NLS-2$ - + cPrj = CProjectHelper.createCCProject("ParserTestProject", "bin", IPDOMManager.ID_NO_INDEXER); //$NON-NLS-1$ //$NON-NLS-2$ project = cPrj.getProject(); // ugly @@ -62,8 +61,6 @@ public class DOMFileBasePluginTest extends TestCase { className = aClassName; numProjects++; } - // disable indexer - CCorePlugin.getPDOMManager().setIndexerId(cPrj, IPDOMManager.ID_NO_INDEXER); } catch ( CoreException e ) { /*boo*/ } @@ -103,6 +100,8 @@ public class DOMFileBasePluginTest extends TestCase { for( int i = 0; i < members.length; i++ ){ if( members[i].getName().equals( ".project" ) || members[i].getName().equals( ".cdtproject" ) ) //$NON-NLS-1$ //$NON-NLS-2$ continue; + if (members[i].getName().equals(".settings")) + continue; try{ members[i].delete( false, monitor ); } catch( Throwable e ){ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java new file mode 100644 index 00000000000..bdda9fdd810 --- /dev/null +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java @@ -0,0 +1,99 @@ +/******************************************************************************* + * Copyright (c) 2006 Wind River Systems, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Markus Schorn - initial API and implementation + *******************************************************************************/ + +package org.eclipse.cdt.internal.index.tests; + +import java.util.regex.Pattern; + +import junit.framework.TestSuite; + +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.index.IIndexBinding; +import org.eclipse.cdt.core.index.IndexFilter; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.core.CCoreInternals; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; + +public class IndexIncludeTest extends IndexTestBase { + private static final IProgressMonitor NPM= new NullProgressMonitor(); + + public static TestSuite suite() { + TestSuite suite= suite(IndexIncludeTest.class, "_"); + suite.addTest(new IndexIncludeTest("deleteProject")); + return suite; + } + + private ICProject fProject= null; + private IIndex fIndex= null; + + public IndexIncludeTest(String name) { + super(name); + } + + public void setUp() throws Exception { + super.setUp(); + if (fProject == null) { + fProject= createProject(true, "resources/indexTests/includes"); + } + fIndex= CCorePlugin.getIndexManager().getIndex(fProject); + } + + public void tearDown() throws Exception { + super.tearDown(); + } + + public void deleteProject() { + if (fProject != null) { + CProjectHelper.delete(fProject); + } + } + + public void testFastIndexer() throws Exception { + CCoreInternals.getPDOMManager().setIndexerId(fProject, IPDOMManager.ID_FAST_INDEXER); + CCoreInternals.getPDOMManager().setIndexAllHeaders(fProject, false); + waitForIndexer(); + checkHeader(false); + + CCoreInternals.getPDOMManager().setIndexAllHeaders(fProject, true); + waitForIndexer(); + checkHeader(true); + } + + private void waitForIndexer() { + assertTrue(CCorePlugin.getIndexManager().joinIndexer(10000, NPM)); + } + + public void testFullIndexer() throws Exception { + CCoreInternals.getPDOMManager().setIndexerId(fProject, IPDOMManager.ID_FULL_INDEXER); + CCoreInternals.getPDOMManager().setIndexAllHeaders(fProject, false); + waitForIndexer(); + checkHeader(false); + + CCoreInternals.getPDOMManager().setIndexAllHeaders(fProject, true); + waitForIndexer(); + checkHeader(true); + } + + private void checkHeader(boolean all) throws Exception { + fIndex.acquireReadLock(); + try { + IIndexBinding[] result= fIndex.findBindings(Pattern.compile(".*included"), true, IndexFilter.ALL, NPM); + assertEquals(all ? 2 : 1, result.length); + } + finally { + fIndex.releaseReadLock(); + } + } +} diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexListenerTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexListenerTest.java index 5d788817d0a..623e1717916 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexListenerTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexListenerTest.java @@ -40,10 +40,8 @@ public class IndexListenerTest extends BaseTestCase { } protected void setUp() throws Exception { - fProject1 = CProjectHelper.createCCProject("testIndexListener1", null); - fProject2 = CProjectHelper.createCCProject("testIndexListener2", null); - CCorePlugin.getPDOMManager().setIndexerId(fProject1, IPDOMManager.ID_FAST_INDEXER); - CCorePlugin.getPDOMManager().setIndexerId(fProject2, IPDOMManager.ID_FAST_INDEXER); + fProject1 = CProjectHelper.createCCProject("testIndexListener1", null, IPDOMManager.ID_FAST_INDEXER); + fProject2 = CProjectHelper.createCCProject("testIndexListener2", null, IPDOMManager.ID_FAST_INDEXER); assertTrue(CCorePlugin.getIndexManager().joinIndexer(2000, new NullProgressMonitor())); } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexSearchTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexSearchTest.java index fda554ba2d3..a2ee8d6237f 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexSearchTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexSearchTest.java @@ -60,9 +60,10 @@ public class IndexSearchTest extends IndexTestBase { public void setUp() throws Exception { super.setUp(); if (fProject == null) { - fProject= createProject(true); + fProject= createProject(true, "resources/indexTests/search"); } fIndex= CCorePlugin.getIndexManager().getIndex(fProject); + fIndex.acquireReadLock(); } public void tearDown() throws Exception { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTestBase.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTestBase.java index 70fe1189646..d6020bcab0b 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTestBase.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTestBase.java @@ -30,27 +30,25 @@ public class IndexTestBase extends BaseTestCase { super(name); } - protected ICProject createProject(final boolean useCpp) throws CoreException { + protected ICProject createProject(final boolean useCpp, final String importSource) throws CoreException { // Create the project final ICProject[] result= new ICProject[] {null}; final IWorkspace workspace = ResourcesPlugin.getWorkspace(); workspace.run(new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { - String name= "IndexSearchTest_" + System.currentTimeMillis(); + String name= "IndexTest_" + System.currentTimeMillis(); if (useCpp) { - result[0]= CProjectHelper.createCCProject(name, null); + result[0]= CProjectHelper.createCCProject(name, null, IPDOMManager.ID_NO_INDEXER); } else { - result[0]= CProjectHelper.createCProject(name, null); + result[0]= CProjectHelper.createCProject(name, null, IPDOMManager.ID_NO_INDEXER); } - - CCorePlugin.getPDOMManager().setIndexerId(result[0], IPDOMManager.ID_NO_INDEXER); - CProjectHelper.importSourcesFromPlugin(result[0], CTestPlugin.getDefault().getBundle(), "resources/indexTests/search"); + CProjectHelper.importSourcesFromPlugin(result[0], CTestPlugin.getDefault().getBundle(), importSource); } }, null); CCorePlugin.getPDOMManager().setIndexerId(result[0], IPDOMManager.ID_FAST_INDEXER); // wait until the indexer is done - assertTrue(CCorePlugin.getIndexManager().joinIndexer(5000, new NullProgressMonitor())); + assertTrue(CCorePlugin.getIndexManager().joinIndexer(10000, new NullProgressMonitor())); return result[0]; } } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTests.java index 4c1467772aa..fc1270bb43b 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTests.java @@ -22,6 +22,7 @@ public class IndexTests extends TestSuite { TestSuite suite = new IndexTests(); suite.addTest(IndexListenerTest.suite()); suite.addTest(IndexSearchTest.suite()); + suite.addTest(IndexIncludeTest.suite()); return suite; } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinCommonHeaderTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinCommonHeaderTests.java index 3f0c5b23cd4..7f4ce6d69e2 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinCommonHeaderTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinCommonHeaderTests.java @@ -12,6 +12,8 @@ package org.eclipse.cdt.internal.pdom.tests; import java.util.regex.Pattern; +import junit.framework.TestSuite; + import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ast.IBasicType; import org.eclipse.cdt.core.dom.ast.IBinding; @@ -32,6 +34,10 @@ import org.eclipse.core.runtime.NullProgressMonitor; public class OverloadsWithinCommonHeaderTests extends PDOMTestBase { protected PDOM pdom; + public static TestSuite suite() { + return suite(OverloadsWithinCommonHeaderTests.class); + } + protected void setUp() throws Exception { if (pdom == null) { ICProject project = createProject("overloadsWithinCommonHeader", true); @@ -44,7 +50,9 @@ public class OverloadsWithinCommonHeaderTests extends PDOMTestBase { pdom.releaseReadLock(); } - public void testOverloadedInCommonHeader_ClassScope() throws CoreException { + public void testDummy() {} + + public void _testOverloadedInCommonHeader_ClassScope() throws CoreException { Pattern[] ManyOverloadedQuxPath = makePatternArray(new String[] {"ManyOverloaded","qux"}); IBinding[] ManyOverloadedQux = pdom.findBindings(ManyOverloadedQuxPath, new NullProgressMonitor()); assertEquals(5,ManyOverloadedQux.length); @@ -65,7 +73,7 @@ public class OverloadsWithinCommonHeaderTests extends PDOMTestBase { assertFunctionRefCount(new Class[]{ICPPClassType.class}, ManyOverloadedQux, 10); } - public void testOverloadedInCommonHeader_FileScope() throws CoreException { + public void _testOverloadedInCommonHeader_FileScope() throws CoreException { Pattern[] QuuxPath = makePatternArray(new String[] {"quux"}); IBinding[] Quux = pdom.findBindings(QuuxPath, false, IndexFilter.getFilter(Linkage.CPP_LINKAGE), new NullProgressMonitor()); @@ -87,7 +95,7 @@ public class OverloadsWithinCommonHeaderTests extends PDOMTestBase { assertFunctionRefCount(new Class[] {ICPPClassType.class}, Quux, 12); } - public void testOverloadedInCommonHeader_NamespaceScope() throws CoreException { + public void _testOverloadedInCommonHeader_NamespaceScope() throws CoreException { Pattern[] GraultPath = makePatternArray(new String[] {"corge","grault"}); IBinding[] Grault = pdom.findBindings(GraultPath, true, IndexFilter.getFilter(Linkage.CPP_LINKAGE), new NullProgressMonitor()); assertEquals(5,Grault.length); @@ -108,7 +116,7 @@ public class OverloadsWithinCommonHeaderTests extends PDOMTestBase { assertFunctionRefCount(new Class[] {ICPPClassType.class}, Grault, 14); } - public void assertFunctionRefCount(Class[] args, IBinding[] bindingPool, int refCount) throws CoreException { + protected void assertFunctionRefCount(Class[] args, IBinding[] bindingPool, int refCount) throws CoreException { assertFunctionRefCount(pdom, args, bindingPool, refCount); } } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTestBase.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTestBase.java index 1fc99a03f91..be9f8be4d76 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTestBase.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTestBase.java @@ -75,11 +75,8 @@ public class PDOMTestBase extends BaseTestCase { workspace.run(new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { // Create the project - ICProject cproject= cpp ? CProjectHelper.createCCProject(projectName, null) - : CProjectHelper.createCProject(projectName, null); - - // Set the indexer to the null indexer and invoke it later on. - CCorePlugin.getPDOMManager().setIndexerId(cproject, IPDOMManager.ID_NO_INDEXER); + ICProject cproject= cpp ? CProjectHelper.createCCProject(projectName, null, IPDOMManager.ID_NO_INDEXER) + : CProjectHelper.createCProject(projectName, null, IPDOMManager.ID_NO_INDEXER); // Import the files at the root ImportOperation importOp = new ImportOperation(cproject.getProject().getFullPath(), diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java index 1dd171bdfc0..98db04fe6a0 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java @@ -27,7 +27,7 @@ public class PDOMTests extends TestSuite { suite.addTestSuite(TypesTests.class); suite.addTestSuite(IncludesTests.class); suite.addTestSuite(OverloadsWithinSingleTUTests.class); - suite.addTestSuite(OverloadsWithinCommonHeaderTests.class); + suite.addTest(OverloadsWithinCommonHeaderTests.suite()); suite.addTestSuite(BTreeTests.class); diff --git a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/BaseTestFramework.java b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/BaseTestFramework.java index 67a12889d2c..2cdf1677f82 100644 --- a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/BaseTestFramework.java +++ b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/BaseTestFramework.java @@ -51,7 +51,7 @@ abstract public class BaseTestFramework extends TestCase { workspace = ResourcesPlugin.getWorkspace(); try { - cproject = CProjectHelper.createCCProject("RegressionTestProject", "bin"); //$NON-NLS-1$ //$NON-NLS-2$ + cproject = CProjectHelper.createCCProject("RegressionTestProject", "bin", IPDOMManager.ID_NO_INDEXER); //$NON-NLS-1$ //$NON-NLS-2$ project = cproject.getProject(); @@ -106,6 +106,8 @@ abstract public class BaseTestFramework extends TestCase { for( int i = 0; i < members.length; i++ ){ if( members[i].getName().equals( ".project" ) || members[i].getName().equals( ".cdtproject" ) ) //$NON-NLS-1$ //$NON-NLS-2$ continue; + if (members[i].getName().equals(".settings")) + continue; try{ members[i].delete( false, monitor ); } catch( Throwable e ){ diff --git a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/SelectionRegressionTest.java b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/SelectionRegressionTest.java index e9fa60e0f0b..e98433e02aa 100644 --- a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/SelectionRegressionTest.java +++ b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/SelectionRegressionTest.java @@ -20,6 +20,7 @@ import java.io.Writer; import junit.framework.Test; import junit.framework.TestSuite; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.parser.CodeReader; import org.eclipse.cdt.core.parser.IParser; import org.eclipse.cdt.core.parser.NullLogService; @@ -96,7 +97,7 @@ public class SelectionRegressionTest extends BaseTestFramework { super.setUp(); try{ if (project == null){ - cproject = CProjectHelper.createCCProject("RegressionTestProject", "bin"); //$NON-NLS-1$ //$NON-NLS-2$ + cproject = CProjectHelper.createCCProject("RegressionTestProject", "bin", IPDOMManager.ID_NO_INDEXER); //$NON-NLS-1$ //$NON-NLS-2$ project = cproject.getProject(); } } catch ( CoreException e ) { //boo diff --git a/core/org.eclipse.cdt.core.tests/resources/indexTests/includes/included.h b/core/org.eclipse.cdt.core.tests/resources/indexTests/includes/included.h new file mode 100644 index 00000000000..1eb2d559126 --- /dev/null +++ b/core/org.eclipse.cdt.core.tests/resources/indexTests/includes/included.h @@ -0,0 +1 @@ +int included; \ No newline at end of file diff --git a/core/org.eclipse.cdt.core.tests/resources/indexTests/includes/notIncluded.h b/core/org.eclipse.cdt.core.tests/resources/indexTests/includes/notIncluded.h new file mode 100644 index 00000000000..aacf85e20b8 --- /dev/null +++ b/core/org.eclipse.cdt.core.tests/resources/indexTests/includes/notIncluded.h @@ -0,0 +1 @@ +int not_included; \ No newline at end of file diff --git a/core/org.eclipse.cdt.core.tests/resources/indexTests/includes/testInclude.cpp b/core/org.eclipse.cdt.core.tests/resources/indexTests/includes/testInclude.cpp new file mode 100644 index 00000000000..a0b1143491f --- /dev/null +++ b/core/org.eclipse.cdt.core.tests/resources/indexTests/includes/testInclude.cpp @@ -0,0 +1 @@ +#include "included.h" diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java index 0bc1ae6d505..660c4fbee27 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java @@ -29,6 +29,7 @@ import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ISourceRoot; import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.core.CCoreInternals; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; @@ -61,12 +62,16 @@ public class CProjectHelper { } }; + public static ICProject createCProject(final String projectName, String binFolderName) throws CoreException { + return createCCProject(projectName, binFolderName, null); + } + /** * Creates a ICProject. */ - public static ICProject createCProject(final String projectName, String binFolderName) throws CoreException { + public static ICProject createCProject(final String projectName, String binFolderName, final String indexerID) throws CoreException { final IWorkspace ws = ResourcesPlugin.getWorkspace(); - final IProject newProject[] = new IProject[1]; + final ICProject newProject[] = new ICProject[1]; ws.run(new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { @@ -85,11 +90,14 @@ public class CProjectHelper { addNatureToProject(project, CProjectNature.C_NATURE_ID, null); CCorePlugin.getDefault().mapCProjectOwner(project, projectId, false); } - newProject[0] = project; + newProject[0] = CCorePlugin.getDefault().getCoreModel().create(project); + if (indexerID != null) { + CCoreInternals.getPDOMManager().setIndexerId(newProject[0], indexerID); + } } }, null); - return CCorePlugin.getDefault().getCoreModel().create(newProject[0]); + return newProject[0]; } private static String getMessage(IStatus status) { @@ -106,12 +114,16 @@ public class CProjectHelper { } public static ICProject createCCProject(final String projectName, final String binFolderName) throws CoreException { + return createCCProject(projectName, binFolderName, null); + } + + public static ICProject createCCProject(final String projectName, final String binFolderName, final String indexerID) throws CoreException { final IWorkspace ws = ResourcesPlugin.getWorkspace(); final ICProject newProject[] = new ICProject[1]; ws.run(new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { - ICProject cproject = createCProject(projectName, binFolderName); + ICProject cproject = createCProject(projectName, binFolderName, indexerID); if (!cproject.getProject().hasNature(CCProjectNature.CC_NATURE_ID)) { addNatureToProject(cproject.getProject(), CCProjectNature.CC_NATURE_ID, null); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java index 1887fcb6193..9ddebf3f380 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java @@ -41,8 +41,7 @@ public class CallHierarchyBaseTest extends BaseUITestCase { } protected void setUp() throws CoreException { - fCProject= CProjectHelper.createCCProject("__chTest__", "bin"); - CCorePlugin.getPDOMManager().setIndexerId(fCProject, IPDOMManager.ID_FAST_INDEXER); + fCProject= CProjectHelper.createCCProject("__chTest__", "bin", IPDOMManager.ID_FAST_INDEXER); IPDOMIndexer indexer = CCorePlugin.getPDOMManager().getIndexer(fCProject); try { indexer.reindex(); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTest.java index 335c3b14bbc..c78525cf898 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTest.java @@ -14,21 +14,24 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.Platform; + +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.internal.ui.CHelpProviderManager; -import org.eclipse.cdt.internal.ui.text.CHelpBookDescriptor; -import org.eclipse.cdt.internal.ui.text.CHelpSettings; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.ICHelpBook; import org.eclipse.cdt.ui.ICHelpResourceDescriptor; import org.eclipse.cdt.ui.IFunctionSummary; import org.eclipse.cdt.ui.text.ICHelpInvocationContext; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.Platform; + +import org.eclipse.cdt.internal.ui.CHelpProviderManager; +import org.eclipse.cdt.internal.ui.text.CHelpBookDescriptor; +import org.eclipse.cdt.internal.ui.text.CHelpSettings; /** * @@ -77,13 +80,13 @@ public class CHelpTest extends TestCase { private ICProject getCProject() throws CoreException{ if(fCProject == null) - fCProject = CProjectHelper.createCProject(C_PROJECT_NAME, BIN_DIR_NAME); + fCProject = CProjectHelper.createCProject(C_PROJECT_NAME, BIN_DIR_NAME, IPDOMManager.ID_NO_INDEXER); return fCProject; } private ICProject getCCProject() throws CoreException{ if(fCCProject == null) - fCCProject = CProjectHelper.createCCProject(CC_PROJECT_NAME, BIN_DIR_NAME); + fCCProject = CProjectHelper.createCCProject(CC_PROJECT_NAME, BIN_DIR_NAME, IPDOMManager.ID_NO_INDEXER); return fCCProject; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BracketInserterTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BracketInserterTest.java index fe73ad53cbc..0085e359ff4 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BracketInserterTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BracketInserterTest.java @@ -35,6 +35,7 @@ import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.widgets.Event; import org.eclipse.ui.PartInitException; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICContainer; import org.eclipse.cdt.core.model.ICProject; @@ -98,7 +99,7 @@ public class BracketInserterTest extends TestCase { } private void setUpProject() throws CoreException { - fProject= CProjectHelper.createCProject(getName(), "bin"); + fProject= CProjectHelper.createCProject(getName(), "bin", IPDOMManager.ID_NO_INDEXER); ICContainer cContainer= CProjectHelper.addCContainer(fProject, SRC); IFile file= EditorTestHelper.createFile((IContainer)cContainer.getResource(), TU_NAME, TU_CONTENTS, new NullProgressMonitor()); assertNotNull(file); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/EditorTestHelper.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/EditorTestHelper.java index fb55493aaeb..41f2fd9ab4b 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/EditorTestHelper.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/EditorTestHelper.java @@ -69,6 +69,7 @@ import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider; import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider; import org.eclipse.ui.wizards.datatransfer.ImportOperation; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.ui.CUIPlugin; @@ -434,7 +435,7 @@ public class EditorTestHelper { } public static ICProject createCProject(String project, String externalSourceFolder, boolean linkSourceFolder) throws CoreException { - ICProject cProject= CProjectHelper.createCProject(project, "bin"); + ICProject cProject= CProjectHelper.createCProject(project, "bin", IPDOMManager.ID_NO_INDEXER); IFolder folder; if (linkSourceFolder) folder= ResourceHelper.createLinkedFolder((IProject) cProject.getUnderlyingResource(), new Path("src"), CTestPlugin.getDefault(), new Path(externalSourceFolder)); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsBaseTest.java index 8c671fd8f33..74f7a9af3eb 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsBaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsBaseTest.java @@ -20,15 +20,6 @@ import java.io.FileInputStream; import junit.framework.TestCase; -import org.eclipse.cdt.core.CCProjectNature; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.core.parser.ast.IASTCompletionNode; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.ui.testplugin.CTestPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; @@ -38,6 +29,19 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.jface.text.Document; +import org.eclipse.cdt.core.CCProjectNature; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.core.parser.ast.IASTCompletionNode; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.ui.testplugin.CTestPlugin; + +import org.eclipse.cdt.internal.core.CCoreInternals; + public abstract class CompletionProposalsBaseTest extends TestCase{ protected static final String EMPTY_STRING = ""; //$NON-NLS-1$ private final String projectName = "TestProject1"; //$NON-NLS-1$ @@ -73,7 +77,8 @@ public abstract class CompletionProposalsBaseTest extends TestCase{ protected void setUp() throws Exception { monitor = new NullProgressMonitor(); - fCProject= CProjectHelper.createCProject(projectName, projectType); + fCProject= CProjectHelper.createCProject(projectName, projectType, IPDOMManager.ID_NO_INDEXER); + CCoreInternals.getPDOMManager().setIndexerId(fCProject, IPDOMManager.ID_NO_INDEXER); fHeaderFile = fCProject.getProject().getFile(getHeaderFileName()); String fileName = getFileName(); fCFile = fCProject.getProject().getFile(fileName); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java index c7de741f011..47ae9e8b7b2 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java @@ -33,6 +33,8 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICProject; @@ -61,7 +63,7 @@ public class ContentAssistTests extends BaseUITestCase { if (project == null) { ICProject cPrj; try { - cPrj = CProjectHelper.createCCProject("ContentAssistTestProject", "bin"); //$NON-NLS-1$ //$NON-NLS-2$ + cPrj = CProjectHelper.createCCProject("ContentAssistTestProject", "bin", IPDOMManager.ID_FAST_INDEXER); //$NON-NLS-1$ //$NON-NLS-2$ project = cPrj.getProject(); } catch ( CoreException e ) { @@ -69,6 +71,7 @@ public class ContentAssistTests extends BaseUITestCase { } if (project == null) fail("Unable to create project"); //$NON-NLS-1$ + assertTrue(CCorePlugin.getIndexManager().joinIndexer(10000, monitor)); } } public ContentAssistTests() @@ -120,6 +123,8 @@ public class ContentAssistTests extends BaseUITestCase { for( int i = 0; i < members.length; i++ ){ if( members[i].getName().equals( ".project" ) || members[i].getName().equals( ".cdtproject" ) ) //$NON-NLS-1$ //$NON-NLS-2$ continue; + if (members[i].getName().equals(".settings")) + continue; try{ members[i].delete( false, monitor ); } catch( Throwable e ){ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java index 8dca6ed6637..043282e307e 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java @@ -20,17 +20,6 @@ import java.io.FileInputStream; import junit.framework.TestCase; -import org.eclipse.cdt.core.CCProjectNature; -import org.eclipse.cdt.core.dom.ast.ASTCompletionNode; -import org.eclipse.cdt.core.dom.ast.IASTName; -import org.eclipse.cdt.core.dom.ast.IBinding; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProcessor2; -import org.eclipse.cdt.ui.testplugin.CTestPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; @@ -46,6 +35,20 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.cdt.core.CCProjectNature; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.dom.ast.ASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTName; +import org.eclipse.cdt.core.dom.ast.IBinding; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.ui.testplugin.CTestPlugin; + +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProcessor2; + public abstract class CompletionProposalsBaseTest extends TestCase{ protected static final String EMPTY_STRING = ""; //$NON-NLS-1$ private final String projectName = "TestProject1"; //$NON-NLS-1$ @@ -85,7 +88,7 @@ public abstract class CompletionProposalsBaseTest extends TestCase{ protected void setUp() throws Exception { monitor = new NullProgressMonitor(); - fCProject= CProjectHelper.createCProject(projectName, projectType); + fCProject= CProjectHelper.createCProject(projectName, projectType, IPDOMManager.ID_NO_INDEXER); fHeaderFile = fCProject.getProject().getFile(getHeaderFileName()); String fileName = getFileName(); fCFile = fCProject.getProject().getFile(fileName); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsCTagsIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsCTagsIndexer.java index 46f263ef34f..b5e8343131f 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsCTagsIndexer.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsCTagsIndexer.java @@ -17,16 +17,6 @@ import junit.framework.AssertionFailedError; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.cdt.core.CCProjectNature; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.ast.IASTName; -import org.eclipse.cdt.core.dom.ast.IASTNode; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.internal.core.dom.parser.ASTNode; -import org.eclipse.cdt.make.core.MakeProjectNature; -import org.eclipse.cdt.make.core.scannerconfig.ScannerConfigNature; -import org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; @@ -37,6 +27,19 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.text.TextSelection; import org.eclipse.jface.viewers.ISelection; +import org.eclipse.cdt.core.CCProjectNature; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.dom.ast.IASTName; +import org.eclipse.cdt.core.dom.ast.IASTNode; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.make.core.MakeProjectNature; +import org.eclipse.cdt.make.core.scannerconfig.ScannerConfigNature; +import org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector; + +import org.eclipse.cdt.internal.core.dom.parser.ASTNode; + /** * Test Ctrl_F3/F3 with the CTags Indexer for a CPP project. * @@ -113,7 +116,7 @@ public class CPPSelectionTestsCTagsIndexer extends BaseSelectionTestsIndexer { } private IProject createProject(String projectName) throws CoreException { - ICProject cPrj = CProjectHelper.createCCProject(projectName, "bin"); //$NON-NLS-1$ + ICProject cPrj = CProjectHelper.createCCProject(projectName, "bin", IPDOMManager.ID_NO_INDEXER); //$NON-NLS-1$ return cPrj.getProject(); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsDOMIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsDOMIndexer.java index 3c67dde0978..f292a82e208 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsDOMIndexer.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsDOMIndexer.java @@ -128,7 +128,7 @@ public class CPPSelectionTestsDOMIndexer extends BaseSelectionTestsIndexer { } private IProject createProject(String projectName) throws CoreException { - ICProject cPrj = CProjectHelper.createCCProject(projectName, "bin"); //$NON-NLS-1$ + ICProject cPrj = CProjectHelper.createCCProject(projectName, "bin", IPDOMManager.ID_NO_INDEXER); //$NON-NLS-1$ return cPrj.getProject(); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java index 76f3d458a05..6f7896c2737 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java @@ -42,6 +42,7 @@ import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.texteditor.AbstractTextEditor; import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; @@ -80,7 +81,7 @@ public class CPPSelectionTestsNoIndexer extends TestCase { workspace = ResourcesPlugin.getWorkspace(); try { - cPrj = CProjectHelper.createCCProject("CPPSelectionTestsNoIndexer", "bin"); //$NON-NLS-1$ //$NON-NLS-2$ + cPrj = CProjectHelper.createCCProject("CPPSelectionTestsNoIndexer", "bin", IPDOMManager.ID_NO_INDEXER); //$NON-NLS-1$ //$NON-NLS-2$ project = cPrj.getProject(); @@ -132,6 +133,8 @@ public class CPPSelectionTestsNoIndexer extends TestCase { for( int i = 0; i < members.length; i++ ){ if( members[i].getName().equals( ".project" ) || members[i].getName().equals( ".cdtproject" ) ) //$NON-NLS-1$ //$NON-NLS-2$ continue; + if (members[i].getName().equals(".settings")) + continue; try{ members[i].delete( false, monitor ); } catch( Throwable e ){ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsCTagsIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsCTagsIndexer.java index 58499da0417..0a54cbcaae9 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsCTagsIndexer.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsCTagsIndexer.java @@ -16,15 +16,6 @@ import java.io.File; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.ast.IASTName; -import org.eclipse.cdt.core.dom.ast.IASTNode; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.internal.core.dom.parser.ASTNode; -import org.eclipse.cdt.make.core.MakeProjectNature; -import org.eclipse.cdt.make.core.scannerconfig.ScannerConfigNature; -import org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; @@ -35,6 +26,18 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.text.TextSelection; import org.eclipse.jface.viewers.ISelection; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.dom.ast.IASTName; +import org.eclipse.cdt.core.dom.ast.IASTNode; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.make.core.MakeProjectNature; +import org.eclipse.cdt.make.core.scannerconfig.ScannerConfigNature; +import org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector; + +import org.eclipse.cdt.internal.core.dom.parser.ASTNode; + /** * Test Ctrl_F3/F3 with the CTags Indexer for a C project. * @@ -116,7 +119,7 @@ public class CSelectionTestsCTagsIndexer extends BaseSelectionTestsIndexer { } private IProject createProject(String projectName) throws CoreException { - ICProject cPrj = CProjectHelper.createCCProject(projectName, "bin"); //$NON-NLS-1$ + ICProject cPrj = CProjectHelper.createCCProject(projectName, "bin", IPDOMManager.ID_NO_INDEXER); //$NON-NLS-1$ return cPrj.getProject(); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsDOMIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsDOMIndexer.java index 5f83419876d..ad78e8d8544 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsDOMIndexer.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsDOMIndexer.java @@ -115,7 +115,7 @@ public class CSelectionTestsDOMIndexer extends BaseSelectionTestsIndexer { } private IProject createProject(String projectName) throws CoreException { - ICProject cPrj = CProjectHelper.createCCProject(projectName, "bin"); //$NON-NLS-1$ + ICProject cPrj = CProjectHelper.createCCProject(projectName, "bin", IPDOMManager.ID_NO_INDEXER); //$NON-NLS-1$ return cPrj.getProject(); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsNoIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsNoIndexer.java index 0317b3fbc87..240924d0686 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsNoIndexer.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsNoIndexer.java @@ -40,6 +40,7 @@ import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.texteditor.AbstractTextEditor; import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; @@ -78,7 +79,7 @@ public class CSelectionTestsNoIndexer extends TestCase { workspace = ResourcesPlugin.getWorkspace(); try { - cPrj = CProjectHelper.createCProject("CSelectionTestsNoIndexerProject", "bin"); //$NON-NLS-1$ //$NON-NLS-2$ + cPrj = CProjectHelper.createCProject("CSelectionTestsNoIndexerProject", "bin", IPDOMManager.ID_NO_INDEXER); //$NON-NLS-1$ //$NON-NLS-2$ project = cPrj.getProject(); @@ -130,6 +131,8 @@ public class CSelectionTestsNoIndexer extends TestCase { for( int i = 0; i < members.length; i++ ){ if( members[i].getName().equals( ".project" ) || members[i].getName().equals( ".cdtproject" ) ) //$NON-NLS-1$ //$NON-NLS-2$ continue; + if (members[i].getName().equals(".settings")) + continue; try{ members[i].delete( false, monitor ); } catch( Throwable e ){ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/ResolveBindingTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/ResolveBindingTests.java index 23dd9625b10..6416d26676c 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/ResolveBindingTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/ResolveBindingTests.java @@ -49,8 +49,7 @@ public class ResolveBindingTests extends BaseUITestCase { protected void setUp() throws Exception { super.setUp(); - fCProject= CProjectHelper.createCProject("ResolveBindingTests", "bin"); - CCorePlugin.getPDOMManager().setIndexerId(fCProject, IPDOMManager.ID_FAST_INDEXER); + fCProject= CProjectHelper.createCProject("ResolveBindingTests", "bin", IPDOMManager.ID_NO_INDEXER); IPDOMIndexer indexer = CCorePlugin.getPDOMManager().getIndexer(fCProject); try { indexer.reindex();