mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 18:26:01 +02:00
Code Issues Wiki Activity

bug 212596: JUnit failures in cdt.managedbuilder.test.suite

Browse source 
cleanup: java generics etc.
This commit is contained in:
Andrew Gvozdev 2009-10-10 03:20:55 +00:00
parent bc1f0e9f10
commit a6da33292e
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java
View file

@ -20,8 +20,6 @@ import junit.framework.TestSuite;
import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo; import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
import org.eclipse.cdt.managedbuilder.internal.core.ManagedMakeMessages;
import org.eclipse.cdt.managedbuilder.projectconverter.UpdateManagedProjectManager; import org.eclipse.cdt.managedbuilder.projectconverter.UpdateManagedProjectManager;
import org.eclipse.cdt.managedbuilder.testplugin.CTestPlugin; import org.eclipse.cdt.managedbuilder.testplugin.CTestPlugin;
import org.eclipse.cdt.managedbuilder.testplugin.ManagedBuildTestHelper; import org.eclipse.cdt.managedbuilder.testplugin.ManagedBuildTestHelper;
@ -81,7 +79,7 @@ public class ManagedProjectUpdateTests extends TestCase {
} }
}); });
ArrayList projectList = new ArrayList(projectZips.length); ArrayList<IProject> 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();
@ -102,7 +100,7 @@ public class ManagedProjectUpdateTests extends TestCase {
fail("No projects found in test project directory " + file.getName() + ". The .zip file may be missing or corrupt."); fail("No projects found in test project directory " + file.getName() + ". The .zip file may be missing or corrupt.");
return null; return null;
} }
return (IProject[])projectList.toArray(new IProject[projectList.size()]); return projectList.toArray(new IProject[projectList.size()]);
} }
private void doTestProjectUpdate(String version, boolean updateProject, boolean overwriteBackupFiles, private void doTestProjectUpdate(String version, boolean updateProject, boolean overwriteBackupFiles,
@ -151,6 +149,7 @@ public class ManagedProjectUpdateTests extends TestCase {
IWorkspace wsp = ResourcesPlugin.getWorkspace(); IWorkspace wsp = ResourcesPlugin.getWorkspace();
ISchedulingRule rule = wsp.getRuleFactory().buildRule(); ISchedulingRule rule = wsp.getRuleFactory().buildRule();
Job buildJob = new Job("project build job"){ //$NON-NLS-1$ Job buildJob = new Job("project build job"){ //$NON-NLS-1$
@Override
protected IStatus run(IProgressMonitor monitor) { protected IStatus run(IProgressMonitor monitor) {
try { try {
curProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD,null); curProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD,null);