1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-01 05:15:43 +02:00

Fixed a typo.

This commit is contained in:
Sergey Prigogin 2015-01-08 16:08:12 -08:00
parent 2dbdd831ec
commit a44b1c9ba8
10 changed files with 28 additions and 28 deletions

View file

@ -72,7 +72,7 @@ public class RefreshScopeTests extends TestCase {
CTestPlugin.getWorkspace().run(new IWorkspaceRunnable() { CTestPlugin.getWorkspace().run(new IWorkspaceRunnable() {
@Override @Override
public void run(IProgressMonitor monitor) throws CoreException { public void run(IProgressMonitor monitor) throws CoreException {
ICProject cProject = CProjectHelper.createNewStileCProject("testRefreshScope", IPDOMManager.ID_NO_INDEXER, false); ICProject cProject = CProjectHelper.createNewStyleCProject("testRefreshScope", IPDOMManager.ID_NO_INDEXER, false);
fProject = cProject.getProject(); fProject = cProject.getProject();
IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();

View file

@ -63,7 +63,7 @@ public class BackwardCompatibilityTests extends BaseTestCase {
} }
public void testPathEntriesForNewStyle() throws Exception { public void testPathEntriesForNewStyle() throws Exception {
p1 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "a", TestUserAndDiscoveredEntriesCfgDataProvider.PROVIDER_ID, IPDOMManager.ID_NO_INDEXER); p1 = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "a", TestUserAndDiscoveredEntriesCfgDataProvider.PROVIDER_ID, IPDOMManager.ID_NO_INDEXER);
IProject project = p1.getProject(); IProject project = p1.getProject();
IPathEntry[] entries = CoreModel.getRawPathEntries(p1); IPathEntry[] entries = CoreModel.getRawPathEntries(p1);

View file

@ -65,7 +65,7 @@ public class CProjectDescriptionBasicTests extends BaseTestCase{
} }
public void testModulesCopiedOnCreateNewConfig() throws Exception { public void testModulesCopiedOnCreateNewConfig() throws Exception {
ICProject p = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "c", IPDOMManager.ID_NO_INDEXER); ICProject p = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "c", IPDOMManager.ID_NO_INDEXER);
p3 = p.getProject(); p3 = p.getProject();
ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager(); ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager();
@ -186,7 +186,7 @@ public class CProjectDescriptionBasicTests extends BaseTestCase{
} }
public void testSetDescriptionWithRootIncompatibleRuleAquired() throws Exception { public void testSetDescriptionWithRootIncompatibleRuleAquired() throws Exception {
ICProject p = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "4", IPDOMManager.ID_NO_INDEXER); ICProject p = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "4", IPDOMManager.ID_NO_INDEXER);
p4 = p.getProject(); p4 = p.getProject();
ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager(); ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager();
@ -225,7 +225,7 @@ public class CProjectDescriptionBasicTests extends BaseTestCase{
// Emulate entering Eclipse first time // Emulate entering Eclipse first time
{ {
// Create model project and accompanied descriptions // Create model project and accompanied descriptions
ICProject cproject = CProjectHelper.createNewStileCProject(projectName, IPDOMManager.ID_NO_INDEXER); ICProject cproject = CProjectHelper.createNewStyleCProject(projectName, IPDOMManager.ID_NO_INDEXER);
IProject project = cproject.getProject(); IProject project = cproject.getProject();
// Initial project description after opening a project // Initial project description after opening a project

View file

@ -62,7 +62,7 @@ public class CProjectDescriptionStorageTests extends BaseTestCase {
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
cProj = CProjectHelper.createNewStileCProject("CProjDescStorage", IPDOMManager.ID_FAST_INDEXER); cProj = CProjectHelper.createNewStyleCProject("CProjDescStorage", IPDOMManager.ID_FAST_INDEXER);
resListener = new OurResourceChangeListener(); resListener = new OurResourceChangeListener();
ResourcesPlugin.getWorkspace().addResourceChangeListener(resListener); ResourcesPlugin.getWorkspace().addResourceChangeListener(resListener);
} }

View file

@ -39,7 +39,7 @@ public class CfgSettingsTests extends BaseTestCase {
int wspRel = prefs.getConfigurationRelations(); int wspRel = prefs.getConfigurationRelations();
CoreModel model = CoreModel.getDefault(); CoreModel model = CoreModel.getDefault();
p1 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "a", IPDOMManager.ID_NO_INDEXER); p1 = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "a", IPDOMManager.ID_NO_INDEXER);
IProject project = p1.getProject(); IProject project = p1.getProject();
ICProjectDescription des = model.getProjectDescription(project, false); ICProjectDescription des = model.getProjectDescription(project, false);
assertEquals(wspRel, des.getConfigurationRelations()); assertEquals(wspRel, des.getConfigurationRelations());

View file

@ -41,12 +41,12 @@ public class ExternalSettingsProviderTests extends BaseTestCase{
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
p1 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "a", IPDOMManager.ID_NO_INDEXER); p1 = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "a", IPDOMManager.ID_NO_INDEXER);
p2 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "b", IPDOMManager.ID_NO_INDEXER); p2 = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "b", IPDOMManager.ID_NO_INDEXER);
p3 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "c", IPDOMManager.ID_NO_INDEXER); p3 = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "c", IPDOMManager.ID_NO_INDEXER);
p4 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "d", IPDOMManager.ID_NO_INDEXER); p4 = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "d", IPDOMManager.ID_NO_INDEXER);
p5 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "e", IPDOMManager.ID_NO_INDEXER); p5 = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "e", IPDOMManager.ID_NO_INDEXER);
p6 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "f", IPDOMManager.ID_NO_INDEXER); p6 = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "f", IPDOMManager.ID_NO_INDEXER);
} }
/** /**

View file

@ -115,7 +115,7 @@ public class ProjectCreationStateTests extends BaseTestCase{
initListener(projName); initListener(projName);
ICProject cp1 = CProjectHelper.createNewStileCProject(projName, IPDOMManager.ID_NO_INDEXER, true); ICProject cp1 = CProjectHelper.createNewStyleCProject(projName, IPDOMManager.ID_NO_INDEXER, true);
IProject project = cp1.getProject(); IProject project = cp1.getProject();
p1 = project; p1 = project;
assertTrue(listener.isNotified()); assertTrue(listener.isNotified());
@ -246,7 +246,7 @@ public class ProjectCreationStateTests extends BaseTestCase{
initListener(projName); initListener(projName);
ICProject cp3 = CProjectHelper.createNewStileCProject(projName, IPDOMManager.ID_NO_INDEXER, true); ICProject cp3 = CProjectHelper.createNewStyleCProject(projName, IPDOMManager.ID_NO_INDEXER, true);
IProject project = cp3.getProject(); IProject project = cp3.getProject();
p3 = project; p3 = project;
@ -308,7 +308,7 @@ public class ProjectCreationStateTests extends BaseTestCase{
initListener(projName); initListener(projName);
ICProject cp4 = CProjectHelper.createNewStileCProject(projName, IPDOMManager.ID_NO_INDEXER, false); ICProject cp4 = CProjectHelper.createNewStyleCProject(projName, IPDOMManager.ID_NO_INDEXER, false);
IProject project = cp4.getProject(); IProject project = cp4.getProject();
p4 = project; p4 = project;

View file

@ -73,7 +73,7 @@ public class ChangeConfigurationTests extends PDOMTestBase {
//#endif //#endif
public void testRepeatedlyChangeConfig_bug375226() throws Exception { public void testRepeatedlyChangeConfig_bug375226() throws Exception {
ModelJoiner mj = new ModelJoiner(); ModelJoiner mj = new ModelJoiner();
ICProject cProject = CProjectHelper.createNewStileCProject("testChangeConfiguration", IPDOMManager.ID_FAST_INDEXER); ICProject cProject = CProjectHelper.createNewStyleCProject("testChangeConfiguration", IPDOMManager.ID_FAST_INDEXER);
IProject project = cProject.getProject(); IProject project = cProject.getProject();
StringBuilder[] contents= TestSourceReader.getContentsForTest(CTestPlugin.getDefault().getBundle(), "parser", getClass(), getName(), 1); StringBuilder[] contents= TestSourceReader.getContentsForTest(CTestPlugin.getDefault().getBundle(), "parser", getClass(), getName(), 1);
IFile file= TestSourceReader.createFile(cProject.getProject(), new Path("test.c"), contents[0].toString()); IFile file= TestSourceReader.createFile(cProject.getProject(), new Path("test.c"), contents[0].toString());

View file

@ -137,28 +137,28 @@ public class CProjectHelper {
/** /**
* Creates a ICProject. * Creates a ICProject.
*/ */
public static ICProject createNewStileCProject(final String projectName, final String indexerID) throws CoreException { public static ICProject createNewStyleCProject(final String projectName, final String indexerID) throws CoreException {
return createNewStileCProject(projectName, indexerID, false); return createNewStyleCProject(projectName, indexerID, false);
} }
/** /**
* Creates a ICProject. * Creates a ICProject.
*/ */
public static ICProject createNewStileCProject(final String projectName, String providerId, final String indexerID) throws CoreException { public static ICProject createNewStyleCProject(final String projectName, String providerId, final String indexerID) throws CoreException {
return createNewStileCProject(projectName, providerId, indexerID, false); return createNewStyleCProject(projectName, providerId, indexerID, false);
} }
/** /**
* Creates a ICProject. * Creates a ICProject.
*/ */
public static ICProject createNewStileCProject(final String projectName, final String indexerID, boolean markCreating) throws CoreException { public static ICProject createNewStyleCProject(final String projectName, final String indexerID, boolean markCreating) throws CoreException {
return createNewStileCProject(projectName, null, indexerID, markCreating); return createNewStyleCProject(projectName, null, indexerID, markCreating);
} }
/** /**
* Creates a ICProject. * Creates a ICProject.
*/ */
public static ICProject createNewStileCProject(final String projectName, String cfgProviderId, final String indexerID, final boolean markCreating) throws CoreException { public static ICProject createNewStyleCProject(final String projectName, String cfgProviderId, final String indexerID, final boolean markCreating) throws CoreException {
final IWorkspace ws = ResourcesPlugin.getWorkspace(); final IWorkspace ws = ResourcesPlugin.getWorkspace();
final ICProject newProject[] = new ICProject[1]; final ICProject newProject[] = new ICProject[1];
if(cfgProviderId == null) if(cfgProviderId == null)
@ -260,7 +260,7 @@ public class CProjectHelper {
public static ICContainer addCContainer(ICProject cproject, String containerName) throws CoreException { public static ICContainer addCContainer(ICProject cproject, String containerName) throws CoreException {
IProject project = cproject.getProject(); IProject project = cproject.getProject();
ICContainer container = null; ICContainer container = null;
if (containerName == null || containerName.length() == 0) { if (containerName == null || containerName.isEmpty()) {
ICContainer[] conts = cproject.getSourceRoots(); ICContainer[] conts = cproject.getSourceRoots();
if (conts.length > 0) { if (conts.length > 0) {
container = conts[0]; container = conts[0];

View file

@ -102,8 +102,8 @@ public class SettingsImportExportTest extends BaseUITestCase {
public void testNormalExportImport() throws Exception { public void testNormalExportImport() throws Exception {
ICProject exportProject = CProjectHelper.createNewStileCProject("TempProject1", IPDOMManager.ID_NO_INDEXER); ICProject exportProject = CProjectHelper.createNewStyleCProject("TempProject1", IPDOMManager.ID_NO_INDEXER);
ICProject importProject = CProjectHelper.createNewStileCProject("TempProject2", IPDOMManager.ID_NO_INDEXER); ICProject importProject = CProjectHelper.createNewStyleCProject("TempProject2", IPDOMManager.ID_NO_INDEXER);
setUpProjectSettings(exportProject); setUpProjectSettings(exportProject);
ProjectSettingsWizardPageMock page = new ProjectSettingsWizardPageMock() { ProjectSettingsWizardPageMock page = new ProjectSettingsWizardPageMock() {
@ -165,7 +165,7 @@ public class SettingsImportExportTest extends BaseUITestCase {
String filePath = getFilePath("test.txt"); String filePath = getFilePath("test.txt");
createFile(xmlContent, filePath); createFile(xmlContent, filePath);
ICProject project = CProjectHelper.createNewStileCProject("VaidateProject", IPDOMManager.ID_NO_INDEXER); ICProject project = CProjectHelper.createNewStyleCProject("VaidateProject", IPDOMManager.ID_NO_INDEXER);
ICProjectDescription desc = CoreModel.getDefault().getProjectDescription(project.getProject(), false); ICProjectDescription desc = CoreModel.getDefault().getProjectDescription(project.getProject(), false);
ICConfigurationDescription config = desc.getActiveConfiguration(); ICConfigurationDescription config = desc.getActiveConfiguration();