From 1f365b423793ff2aad2be7043242b3ef6b6ed6a1 Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Mon, 5 Feb 2007 16:01:51 +0000 Subject: [PATCH] Fix for Bug 172312 - No difference between SKIP_ALL and SKIP_INDEXED mode (follow up) --- .../core/model/tests/CModelElementsTests.java | 3 +++ .../core/model/tests/IntegratedCModelTest.java | 16 ---------------- 2 files changed, 3 insertions(+), 16 deletions(-) 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 e32c4a9bed7..560a785e224 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.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; @@ -87,6 +88,8 @@ public class CModelElementsTests extends TestCase { e.printStackTrace(); } } + // make sure the index is up-to-date + assertTrue(CCorePlugin.getIndexManager().joinIndexer(10000, new NullProgressMonitor())); } 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 b0641fa4242..a4125bfb761 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 @@ -42,7 +42,6 @@ public abstract class IntegratedCModelTest extends TestCase { private IFile sourceFile; private NullProgressMonitor monitor; private boolean structuralParse = false; - private boolean fUseNewModelBuilder= true; /** * @@ -114,19 +113,4 @@ public abstract class IntegratedCModelTest extends TestCase { this.structuralParse = structuralParse; } - /** - * @return whether to use the new model builder or not - */ - public boolean useNewModelBuilder() { - return fUseNewModelBuilder; - } - - /** - * Set whether to use the new model builder. - * @param useNewModelBuilder - */ - public TestCase setUseNewModelBuilder(boolean useNewModelBuilder) { - fUseNewModelBuilder = useNewModelBuilder; - return this; - } }