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

Reverted accidentally committed changes from last commit

Browse source
This commit is contained in:
Andrew Gvozdev 2013-04-29 16:42:53 -04:00
parent f2bd5750b5
commit 36f8e63fcf
3 changed files with 0 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/BackwardCompatibilityTests.java
View file

@ -21,7 +21,6 @@ import junit.framework.TestSuite;
import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.ICDescriptor; import org.eclipse.cdt.core.ICDescriptor;
import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.dom.IPDOMManager;
import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport;
import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.model.IPathEntry; import org.eclipse.cdt.core.model.IPathEntry;
@ -66,7 +65,6 @@ 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.createNewStileCProject(PROJ_NAME_PREFIX + "a", TestUserAndDiscoveredEntriesCfgDataProvider.PROVIDER_ID, IPDOMManager.ID_NO_INDEXER);
IProject project = p1.getProject(); IProject project = p1.getProject();
ScannerDiscoveryLegacySupport.setLanguageSettingsProvidersFunctionalityEnabled(project, false);
IPathEntry[] entries = CoreModel.getRawPathEntries(p1); IPathEntry[] entries = CoreModel.getRawPathEntries(p1);
IPathEntry[] resolvedentries = CoreModel.getResolvedPathEntries(p1); IPathEntry[] resolvedentries = CoreModel.getResolvedPathEntries(p1);
@ -88,7 +86,6 @@ public class BackwardCompatibilityTests extends BaseTestCase {
CoreModel.newIncludeEntry(project.getFullPath(), new Path("j"), new Path("k/l")), CoreModel.newIncludeEntry(project.getFullPath(), new Path("j"), new Path("k/l")),
}; };
checkEntriesMatch(expectedResolvedEntries, resolvedentries); checkEntriesMatch(expectedResolvedEntries, resolvedentries);
if (true) return;
IPathEntry[] newEntries = new IPathEntry[entries.length + 1]; IPathEntry[] newEntries = new IPathEntry[entries.length + 1];
System.arraycopy(entries, 0, newEntries, 0, entries.length); System.arraycopy(entries, 0, newEntries, 0, entries.length);
@ -165,34 +162,6 @@ public class BackwardCompatibilityTests extends BaseTestCase {
checkEntriesMatch(expectedResolvedEntries, resolvedentries); checkEntriesMatch(expectedResolvedEntries, resolvedentries);
} }
public void testPathEntriesForNewStyle_2() throws Exception {
p1 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "a", TestUserAndDiscoveredEntriesCfgDataProvider.PROVIDER_ID, IPDOMManager.ID_NO_INDEXER);
IProject project = p1.getProject();
// ScannerDiscoveryLegacySupport.setLanguageSettingsProvidersFunctionalityEnabled(project, false);
IPathEntry[] entries = CoreModel.getRawPathEntries(p1);
IPathEntry[] resolvedentries = CoreModel.getResolvedPathEntries(p1);
IPathEntry[] expectedRawEntries = new IPathEntry[]{
CoreModel.newContainerEntry(new Path("org.eclipse.cdt.core.CFG_BASED_CONTAINER")),
CoreModel.newSourceEntry(project.getFullPath()),
CoreModel.newOutputEntry(project.getFullPath()),
};
checkEntriesMatch(expectedRawEntries, entries);
IPathEntry[] expectedResolvedEntries = new IPathEntry[]{
CoreModel.newSourceEntry(project.getFullPath()),
CoreModel.newOutputEntry(project.getFullPath()),
CoreModel.newIncludeEntry(project.getFullPath(), null, project.getLocation().append("a/b/c")),
CoreModel.newIncludeEntry(project.getFullPath(), null, new Path("/d/e/f")),
CoreModel.newIncludeEntry(project.getFullPath(), null, project.getLocation().append("g/h/i")),
CoreModel.newIncludeEntry(project.getFullPath(), project.getFullPath().makeRelative(), new Path("g/h/i")),
CoreModel.newIncludeEntry(project.getFullPath(), new Path("j"), new Path("k/l")),
CoreModel.newMacroEntry(project.getFullPath(), "a", "b"),
CoreModel.newMacroEntry(project.getFullPath(), "c", ""),
};
checkEntriesMatch(expectedResolvedEntries, resolvedentries);
}
public void testCPathEntriesForOldStyle() throws Exception { public void testCPathEntriesForOldStyle() throws Exception {
p2 = CProjectHelper.createCCProject(PROJ_NAME_PREFIX + "b", null, IPDOMManager.ID_NO_INDEXER); p2 = CProjectHelper.createCCProject(PROJ_NAME_PREFIX + "b", null, IPDOMManager.ID_NO_INDEXER);
ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager(); ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager();

1
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ScannerDiscoveryLegacySupport.java
View file

@ -202,7 +202,6 @@ public class ScannerDiscoveryLegacySupport {
legacyProviderId = PATH_ENTRY_MANAGER_LANGUAGE_SETTINGS_PROVIDER_ID; legacyProviderId = PATH_ENTRY_MANAGER_LANGUAGE_SETTINGS_PROVIDER_ID;
} }
// legacyProviderId = MBS_LANGUAGE_SETTINGS_PROVIDER_ID;
return new String[] {USER_LANGUAGE_SETTINGS_PROVIDER_ID, legacyProviderId}; return new String[] {USER_LANGUAGE_SETTINGS_PROVIDER_ID, legacyProviderId};
} }

3
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsImportExportTest.java
View file

@ -20,7 +20,6 @@ import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Path;
import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport;
import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.settings.model.CIncludePathEntry; import org.eclipse.cdt.core.settings.model.CIncludePathEntry;
@ -103,9 +102,7 @@ public class SettingsImportExportTest extends BaseUITestCase {
public void testNormalExportImport() throws Exception { public void testNormalExportImport() throws Exception {
ICProject exportProject = CProjectHelper.createCCProject("TempProject1", "unused"); ICProject exportProject = CProjectHelper.createCCProject("TempProject1", "unused");
// ScannerDiscoveryLegacySupport.setLanguageSettingsProvidersFunctionalityEnabled(exportProject.getProject(), false);
ICProject importProject = CProjectHelper.createCCProject("TempProject2", "unused"); ICProject importProject = CProjectHelper.createCCProject("TempProject2", "unused");
// ScannerDiscoveryLegacySupport.setLanguageSettingsProvidersFunctionalityEnabled(importProject.getProject(), false);
setUpProjectSettings(exportProject); setUpProjectSettings(exportProject);
ProjectSettingsWizardPageMock page = new ProjectSettingsWizardPageMock() { ProjectSettingsWizardPageMock page = new ProjectSettingsWizardPageMock() {