mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 14:55:41 +02:00
Code Issues Wiki Activity

cleanup: generics, dead code etc.

Browse source
This commit is contained in:
Andrew Gvozdev 2010-01-05 17:56:49 +00:00
parent bf9d9817ed
commit 87c562de11
1 changed files with 47 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildSystem40Tests.java
View file

@ -45,7 +45,6 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Path;
import org.eclipse.ui.dialogs.IOverwriteQuery;
public class BuildSystem40Tests extends TestCase { public class BuildSystem40Tests extends TestCase {
private IPath resourcesLocation = new Path(CTestPlugin.getFileInPlugin(new Path("resources/test40Projects/")).getAbsolutePath()); private IPath resourcesLocation = new Path(CTestPlugin.getFileInPlugin(new Path("resources/test40Projects/")).getAbsolutePath());
@ -70,7 +69,6 @@ public class BuildSystem40Tests extends TestCase {
"dir1/dd/excluded_c/asd/subdir.mk", "dir1/dd/excluded_c/asd/subdir.mk",
"dir1/dd/ff/subdir.mk", "dir1/dd/ff/subdir.mk",
}; };
// doTest("test_40", "dbg 2");
IProject[] projects = createProjects("test_40", null, null, true); IProject[] projects = createProjects("test_40", null, null, true);
ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager(); ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager();
ICProjectDescription des = mngr.getProjectDescription(projects[0]); ICProjectDescription des = mngr.getProjectDescription(projects[0]);
@ -119,20 +117,23 @@ public class BuildSystem40Tests extends TestCase {
OptionStringValue[] modifiedValue = option.getBasicStringListValueElements(); OptionStringValue[] modifiedValue = option.getBasicStringListValueElements();
assertTrue(Arrays.equals(modifiedValue, value)); assertTrue(Arrays.equals(modifiedValue, value));
{
List list = new ArrayList(); List<ICLanguageSettingEntry> list = new ArrayList<ICLanguageSettingEntry>();
list.addAll(Arrays.asList(entries)); list.addAll(Arrays.asList(entries));
list.add(new CIncludePathEntry("E:\\tmp\\w", 0)); list.add(new CIncludePathEntry("E:\\tmp\\w", 0));
entries = (ICLanguageSettingEntry[])list.toArray(new ICLanguageSettingEntry[0]); entries = list.toArray(new ICLanguageSettingEntry[0]);
ls.setSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH, entries); ls.setSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH, entries);
expectedEntries = entries; expectedEntries = entries;
entries = ls.getSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH); entries = ls.getSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH);
assertTrue(Arrays.equals(entries, expectedEntries)); assertTrue(Arrays.equals(entries, expectedEntries));
}
list = new ArrayList(); {
ArrayList<OptionStringValue> list = new ArrayList<OptionStringValue>();
list.addAll(Arrays.asList(value)); list.addAll(Arrays.asList(value));
list.add(new OptionStringValue("\"E:\\tmp\\w\"")); list.add(new OptionStringValue("\"E:\\tmp\\w\""));
value = (OptionStringValue[])list.toArray(new OptionStringValue[0]); value = list.toArray(new OptionStringValue[0]);
}
option = tool.getOptionsOfType(IOption.INCLUDE_PATH)[0]; option = tool.getOptionsOfType(IOption.INCLUDE_PATH)[0];
modifiedValue = option.getBasicStringListValueElements(); modifiedValue = option.getBasicStringListValueElements();
@ -189,10 +190,12 @@ public class BuildSystem40Tests extends TestCase {
BuildSystemTestHelper.checkDiff(expectedValue, value); BuildSystemTestHelper.checkDiff(expectedValue, value);
BuildSystemTestHelper.checkDiff(expectedEntries, entries); BuildSystemTestHelper.checkDiff(expectedEntries, entries);
list = new ArrayList(Arrays.asList(entries)); {
ArrayList<ICLanguageSettingEntry> list = new ArrayList<ICLanguageSettingEntry>(Arrays.asList(entries));
list.remove(6); //new CIncludePathEntry("/d1_abs/path", 0), list.remove(6); //new CIncludePathEntry("/d1_abs/path", 0),
expectedEntries = (ICLanguageSettingEntry[])list.toArray(new ICLanguageSettingEntry[0]); expectedEntries = list.toArray(new ICLanguageSettingEntry[0]);
ls.setSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH, list); ls.setSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH, list);
}
option = tool.getOptionsOfType(IOption.INCLUDE_PATH)[0]; option = tool.getOptionsOfType(IOption.INCLUDE_PATH)[0];
@ -229,12 +232,14 @@ public class BuildSystem40Tests extends TestCase {
tool = (Tool)foInfo.getToolFromInputExtension("cpp"); tool = (Tool)foInfo.getToolFromInputExtension("cpp");
option = tool.getOptionsOfType(IOption.INCLUDE_PATH)[0]; option = tool.getOptionsOfType(IOption.INCLUDE_PATH)[0];
list = new ArrayList(Arrays.asList(option.getBasicStringListValueElements())); {
ArrayList<OptionStringValue> list = new ArrayList<OptionStringValue>(Arrays.asList(option.getBasicStringListValueElements()));
assertTrue(list.remove(new OptionStringValue("${IncludeDefaults}"))); assertTrue(list.remove(new OptionStringValue("${IncludeDefaults}")));
list.add(0, new OptionStringValue("${IncludeDefaults}")); list.add(0, new OptionStringValue("${IncludeDefaults}"));
expectedValue = (OptionStringValue[])list.toArray(new OptionStringValue[0]); expectedValue = list.toArray(new OptionStringValue[0]);
option = foInfo.setOption(tool, option, (OptionStringValue[])list.toArray(new OptionStringValue[0])); option = foInfo.setOption(tool, option, list.toArray(new OptionStringValue[0]));
value = option.getBasicStringListValueElements(); value = option.getBasicStringListValueElements();
}
expectedEntries = new ICLanguageSettingEntry[] { expectedEntries = new ICLanguageSettingEntry[] {
new CIncludePathEntry("dbg 3/rel/path", 0), new CIncludePathEntry("dbg 3/rel/path", 0),
@ -263,12 +268,14 @@ public class BuildSystem40Tests extends TestCase {
BuildSystemTestHelper.checkDiff(expectedEntries, entries); BuildSystemTestHelper.checkDiff(expectedEntries, entries);
list = new ArrayList(Arrays.asList(option.getBasicStringListValueElements())); {
ArrayList<OptionStringValue> list = new ArrayList<OptionStringValue>(Arrays.asList(option.getBasicStringListValueElements()));
assertTrue(list.remove(new OptionStringValue("${IncludeDefaults}"))); assertTrue(list.remove(new OptionStringValue("${IncludeDefaults}")));
list.add(list.size(), new OptionStringValue("${IncludeDefaults}")); list.add(list.size(), new OptionStringValue("${IncludeDefaults}"));
expectedValue = (OptionStringValue[])list.toArray(new OptionStringValue[0]); expectedValue = list.toArray(new OptionStringValue[0]);
option = foInfo.setOption(tool, option, (OptionStringValue[])list.toArray(new OptionStringValue[0])); option = foInfo.setOption(tool, option, list.toArray(new OptionStringValue[0]));
value = option.getBasicStringListValueElements(); value = option.getBasicStringListValueElements();
}
expectedEntries = new ICLanguageSettingEntry[] { expectedEntries = new ICLanguageSettingEntry[] {
new CIncludePathEntry("dbg 3/rel/path", 0), new CIncludePathEntry("dbg 3/rel/path", 0),
@ -344,10 +351,10 @@ public class BuildSystem40Tests extends TestCase {
BuildSystemTestHelper.checkDiff(expectedValue, value); BuildSystemTestHelper.checkDiff(expectedValue, value);
BuildSystemTestHelper.checkDiff(expectedEntries, entries); BuildSystemTestHelper.checkDiff(expectedEntries, entries);
ArrayList list = new ArrayList(); ArrayList<ICLanguageSettingEntry> list = new ArrayList<ICLanguageSettingEntry>();
list.addAll(Arrays.asList(entries)); list.addAll(Arrays.asList(entries));
list.add(new CIncludePathEntry("/test/another/abs", 0)); list.add(new CIncludePathEntry("/test/another/abs", 0));
expectedEntries = (ICLanguageSettingEntry[])list.toArray(new ICLanguageSettingEntry[0]); expectedEntries = list.toArray(new ICLanguageSettingEntry[0]);
expectedValue = new OptionStringValue[] { expectedValue = new OptionStringValue[] {
new OptionStringValue("../rel"), new OptionStringValue("../rel"),
@ -394,7 +401,7 @@ public class BuildSystem40Tests extends TestCase {
BuildSystemTestHelper.checkDiff(expectedValue, value); BuildSystemTestHelper.checkDiff(expectedValue, value);
BuildSystemTestHelper.checkDiff(expectedEntries, entries); BuildSystemTestHelper.checkDiff(expectedEntries, entries);
list = new ArrayList(); list = new ArrayList<ICLanguageSettingEntry>();
list.addAll(Arrays.asList(entries)); list.addAll(Arrays.asList(entries));
list.add(new CIncludePathEntry("/another/abs", 0)); list.add(new CIncludePathEntry("/another/abs", 0));
@ -430,27 +437,6 @@ public class BuildSystem40Tests extends TestCase {
} }
} }
// public void test40_2() throws Exception{
// doTest("test_40", "Test 4.0 ConfigName.Dbg");
// }
private void doTest(String projName, String cfgName) throws Exception{
String[] makefiles = {
"makefile",
"objects.mk",
"sources.mk",
"subdir.mk"};
IProject[] projects = createProjects(projName, null, null, true);
ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager();
ICProjectDescription d = mngr.getProjectDescription(projects[0]);
ICConfigurationDescription cfg = d.getConfigurationByName(cfgName);
assertNotNull(cfg);
d.setActiveConfiguration(cfg);
mngr.setProjectDescription(projects[0], d);
buildProjects(projects, makefiles);
}
private void buildProjects(IProject projects[], String[] files) { private void buildProjects(IProject projects[], String[] files) {
buildProjectsWorker(projects, files, true); buildProjectsWorker(projects, files, true);
} }
@ -459,7 +445,6 @@ public class BuildSystem40Tests extends TestCase {
if(projects == null || projects.length == 0) if(projects == null || projects.length == 0)
return; return;
boolean succeeded = true;
for (int i = 0; i < projects.length; i++){ for (int i = 0; i < projects.length; i++){
IProject curProject = projects[i]; IProject curProject = projects[i];
@ -493,42 +478,21 @@ public class BuildSystem40Tests extends TestCase {
for (int ii=0;ii<files.length;ii++) { for (int ii=0;ii<files.length;ii++) {
paths[ii] = buildDir.append(files[ii]); paths[ii] = buildDir.append(files[ii]);
} }
succeeded = ManagedBuildTestHelper.compareBenchmarks(curProject, buildLocationBase, paths, benchmarkLocationBase); ManagedBuildTestHelper.compareBenchmarks(curProject, buildLocationBase, paths, benchmarkLocationBase);
} }
// else
// succeeded = ManagedBuildTestHelper.verifyFilesDoNotExist(curProject, buildDir, files);
} }
} }
} }
} }
// if (succeeded) { // Otherwise leave the projects around for comparison
// for (int i = 0; i < projects.length; i++)
// ManagedBuildTestHelper.removeProject(projects[i].getName());
// }
} }
private IProject[] createProjects(String projName, IPath location, String projectTypeId, boolean containsZip) { private IProject[] createProjects(String projName, IPath location, String projectTypeId, boolean containsZip) {
// In case the projects need to be updated...
IOverwriteQuery queryALL = new IOverwriteQuery(){
public String queryOverwrite(String file) {
return ALL;
}};
IOverwriteQuery queryNOALL = new IOverwriteQuery(){
public String queryOverwrite(String file) {
return NO_ALL;
}};
// UpdateManagedProjectManager.setBackupFileOverwriteQuery(queryALL);
// UpdateManagedProjectManager.setUpdateProjectQuery(queryALL);
IProject projects[] = createProject(projName, location, projectTypeId, containsZip); IProject projects[] = createProject(projName, location, projectTypeId, containsZip);
return projects; return projects;
} }
private IProject[] createProject(String projName, IPath location, String projectTypeId, boolean containsZip){ private IProject[] createProject(String projName, IPath location, String projectTypeId, boolean containsZip){
ArrayList projectList = null; ArrayList<IProject> projectList = null;
if (containsZip) { if (containsZip) {
File testDir = CTestPlugin.getFileInPlugin(new Path("resources/test40Projects/" + projName)); File testDir = CTestPlugin.getFileInPlugin(new Path("resources/test40Projects/" + projName));
if(testDir == null) { if(testDir == null) {
@ -544,7 +508,7 @@ public class BuildSystem40Tests extends TestCase {
} }
}); });
projectList = new ArrayList(projectZips.length); projectList = new ArrayList<IProject>(projectZips.length);
for(int i = 0; i < projectZips.length; i++){ for(int i = 0; i < projectZips.length; i++){
try{ try{
String projectName = projectZips[i].getName(); String projectName = projectZips[i].getName();
@ -569,12 +533,12 @@ public class BuildSystem40Tests extends TestCase {
try{ try{
IProject project = ManagedBuildTestHelper.createProject(projName, null, location, projectTypeId); IProject project = ManagedBuildTestHelper.createProject(projName, null, location, projectTypeId);
if(project != null) if(project != null)
projectList = new ArrayList(1); projectList = new ArrayList<IProject>(1);
projectList.add(project); projectList.add(project);
} catch(Exception e){} } catch(Exception e){}
} }
return (IProject[])projectList.toArray(new IProject[projectList.size()]); return projectList.toArray(new IProject[projectList.size()]);
} }
} }