1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00

fixed junit test to work without the deprecated CDT stuff

This commit is contained in:
David Inglis 2004-01-15 14:18:37 +00:00
parent 192a8293ce
commit e69bf2d4b5
3 changed files with 6 additions and 3 deletions

View file

@ -34,6 +34,7 @@ import org.eclipse.cdt.internal.core.search.PatternSearchJob;
import org.eclipse.cdt.internal.core.search.indexing.IndexManager; import org.eclipse.cdt.internal.core.search.indexing.IndexManager;
import org.eclipse.cdt.internal.core.search.matching.CSearchPattern; import org.eclipse.cdt.internal.core.search.matching.CSearchPattern;
import org.eclipse.cdt.internal.core.sourcedependency.DependencyQueryJob; import org.eclipse.cdt.internal.core.sourcedependency.DependencyQueryJob;
import org.eclipse.cdt.make.core.MakeCorePlugin;
import org.eclipse.core.internal.resources.ResourceException; import org.eclipse.core.internal.resources.ResourceException;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
@ -667,7 +668,7 @@ import org.eclipse.core.runtime.Platform;
IProjectDescription description = workspace.newProjectDescription(project.getName()); IProjectDescription description = workspace.newProjectDescription(project.getName());
description.setLocation(newPath); description.setLocation(newPath);
//Create the project //Create the project
cproject = CCorePlugin.getDefault().createCProject(description,project,monitor,CCorePlugin.PLUGIN_ID + ".make"); //.getCoreModel().create(project); cproject = CCorePlugin.getDefault().createCProject(description,project,monitor,MakeCorePlugin.MAKE_PROJECT_ID); //.getCoreModel().create(project);
if( !cproject.hasNature(CCProjectNature.CC_NATURE_ID) ){ if( !cproject.hasNature(CCProjectNature.CC_NATURE_ID) ){
addNatureToProject(cproject, CCProjectNature.CC_NATURE_ID, null); addNatureToProject(cproject, CCProjectNature.CC_NATURE_ID, null);

View file

@ -27,6 +27,7 @@ import org.eclipse.cdt.internal.core.index.IQueryResult;
import org.eclipse.cdt.internal.core.index.impl.IFileDocument; import org.eclipse.cdt.internal.core.index.impl.IFileDocument;
import org.eclipse.cdt.internal.core.search.indexing.IIndexConstants; import org.eclipse.cdt.internal.core.search.indexing.IIndexConstants;
import org.eclipse.cdt.internal.core.search.indexing.IndexManager; import org.eclipse.cdt.internal.core.search.indexing.IndexManager;
import org.eclipse.cdt.make.core.MakeCorePlugin;
import org.eclipse.core.internal.resources.ResourceException; import org.eclipse.core.internal.resources.ResourceException;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
@ -140,7 +141,7 @@ public class IndexManagerTests extends TestCase {
IProjectDescription description = workspace.newProjectDescription(project.getName()); IProjectDescription description = workspace.newProjectDescription(project.getName());
description.setLocation(newPath); description.setLocation(newPath);
//Create the project //Create the project
cproject = CCorePlugin.getDefault().createCProject(description,project,monitor,CCorePlugin.PLUGIN_ID + ".make"); //.getCoreModel().create(project); cproject = CCorePlugin.getDefault().createCProject(description,project,monitor,MakeCorePlugin.MAKE_PROJECT_ID); //.getCoreModel().create(project);
if( !cproject.hasNature(CCProjectNature.CC_NATURE_ID) ){ if( !cproject.hasNature(CCProjectNature.CC_NATURE_ID) ){
addNatureToProject(cproject, CCProjectNature.CC_NATURE_ID, null); addNatureToProject(cproject, CCProjectNature.CC_NATURE_ID, null);

View file

@ -25,6 +25,7 @@ import org.eclipse.cdt.core.search.ICSearchPattern;
import org.eclipse.cdt.core.search.ICSearchResultCollector; import org.eclipse.cdt.core.search.ICSearchResultCollector;
import org.eclipse.cdt.core.search.ICSearchScope; import org.eclipse.cdt.core.search.ICSearchScope;
import org.eclipse.cdt.core.search.SearchEngine; import org.eclipse.cdt.core.search.SearchEngine;
import org.eclipse.cdt.make.core.MakeCorePlugin;
import org.eclipse.cdt.testplugin.FileManager; import org.eclipse.cdt.testplugin.FileManager;
import org.eclipse.core.internal.resources.ResourceException; import org.eclipse.core.internal.resources.ResourceException;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
@ -137,7 +138,7 @@ public class BaseSearchTest extends TestCase implements ICSearchConstants {
cproject = CCorePlugin.getDefault().createCProject( description, cproject = CCorePlugin.getDefault().createCProject( description,
project, project,
monitor, monitor,
CCorePlugin.PLUGIN_ID + ".make"); MakeCorePlugin.MAKE_PROJECT_ID);
if( !project.hasNature(CCProjectNature.CC_NATURE_ID) ){ if( !project.hasNature(CCProjectNature.CC_NATURE_ID) ){
addNatureToProject(project, CCProjectNature.CC_NATURE_ID, null); addNatureToProject(project, CCProjectNature.CC_NATURE_ID, null);