From a6da33292e76f239d74a4442f86baf8166a87c5f Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Sat, 10 Oct 2009 03:20:55 +0000 Subject: [PATCH] bug 212596: JUnit failures in cdt.managedbuilder.test.suite cleanup: java generics etc. --- .../core/tests/ManagedProjectUpdateTests.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java index 5e689610869..0eb893c5204 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java @@ -20,8 +20,6 @@ import junit.framework.TestSuite; import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo; 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.testplugin.CTestPlugin; import org.eclipse.cdt.managedbuilder.testplugin.ManagedBuildTestHelper; @@ -81,7 +79,7 @@ public class ManagedProjectUpdateTests extends TestCase { } }); - ArrayList projectList = new ArrayList(projectZips.length); + ArrayList projectList = new ArrayList(projectZips.length); for(int i = 0; i < projectZips.length; i++){ try{ 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."); 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, @@ -151,6 +149,7 @@ public class ManagedProjectUpdateTests extends TestCase { IWorkspace wsp = ResourcesPlugin.getWorkspace(); ISchedulingRule rule = wsp.getRuleFactory().buildRule(); Job buildJob = new Job("project build job"){ //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { try { curProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD,null);