diff options
Diffstat (limited to 'tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ProjectSetImporterTests.java')
-rw-r--r-- | tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ProjectSetImporterTests.java | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ProjectSetImporterTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ProjectSetImporterTests.java index 81a820ff0..1012510c3 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ProjectSetImporterTests.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ProjectSetImporterTests.java @@ -24,9 +24,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; @@ -54,6 +51,9 @@ import org.eclipse.team.ui.IScmUrlImportWizardPage; import org.eclipse.team.ui.TeamUI; import org.eclipse.ui.PlatformUI; +import junit.framework.Test; +import junit.framework.TestSuite; + public class ProjectSetImporterTests extends EclipseTest { private final static String PSF_FILENAME = "temp.psf"; @@ -82,6 +82,7 @@ public class ProjectSetImporterTests extends EclipseTest { return new CVSTestSetup(suite); } + @Override protected void tearDown() throws Exception { super.tearDown(); PSF_FILE.delete(); @@ -209,11 +210,11 @@ public class ProjectSetImporterTests extends EclipseTest { ProjectSetCapability c = new CVSTeamProviderType().getProjectSetCapability(); // this is what every bundle importer should do, should this be in PDE? - List references = new ArrayList(); - for (int i = 0; i < selection.length; i++) { - references.add(c.asReference(selection[i].getUri(), selection[i].getProject())); + List<String> references = new ArrayList<>(); + for (ScmUrlImportDescription element : selection) { + references.add(c.asReference(element.getUri(), element.getProject())); } - c.addToWorkspace((String[]) references.toArray(new String[references.size()]), new ProjectSetSerializationContext(), null); + c.addToWorkspace(references.toArray(new String[references.size()]), new ProjectSetSerializationContext(), null); assertExistsInWorkspace(project); } @@ -230,11 +231,11 @@ public class ProjectSetImporterTests extends EclipseTest { ProjectSetCapability c = new CVSTeamProviderType().getProjectSetCapability(); // this is what every bundle importer should do, should this be in PDE? - List references = new ArrayList(); - for (int i = 0; i < selection.length; i++) { - references.add(c.asReference(selection[i].getUri(), /*selection[i].getProject()*/ null)); + List<String> references = new ArrayList<>(); + for (ScmUrlImportDescription element : selection) { + references.add(c.asReference(element.getUri(), /*selection[i].getProject()*/ null)); } - c.addToWorkspace((String[]) references.toArray(new String[references.size()]), new ProjectSetSerializationContext(), null); + c.addToWorkspace(references.toArray(new String[references.size()]), new ProjectSetSerializationContext(), null); IProject project1 = ResourcesPlugin.getWorkspace().getRoot().getProject("project1"); assertExistsInWorkspace(project1); } @@ -247,13 +248,14 @@ public class ProjectSetImporterTests extends EclipseTest { final IScmUrlImportWizardPage[] pages = TeamUI.getPages("org.eclipse.team.core.cvs.importer"); assertEquals(1, pages.length); - String s = ProjectSetCapability.SCHEME_SCM + ":cvs:" + CVSTestSetup.REPOSITORY_LOCATION + ":" + project.getName() + ";tag=tag";; + String s = ProjectSetCapability.SCHEME_SCM + ":cvs:" + CVSTestSetup.REPOSITORY_LOCATION + ":" + project.getName() + ";tag=tag"; ScmUrlImportDescription d = new ScmUrlImportDescription(s, project.getName()); ScmUrlImportDescription[] selection = new ScmUrlImportDescription[] {d}; pages[0].setSelection(selection); assertTrue(pages[0] instanceof CVSScmUrlImportWizardPage); Wizard wizard = new Wizard() { + @Override public boolean performFinish() { // update SCM URLs in descriptions pages[0].finish(); @@ -282,7 +284,7 @@ public class ProjectSetImporterTests extends EclipseTest { } public void testCvsBundleImporter() throws TeamException, CoreException { - IBundleImporter cvsBundleImporter = getBundleImporter("org.eclipse.team.core.cvs.importer");; + IBundleImporter cvsBundleImporter = getBundleImporter("org.eclipse.team.core.cvs.importer"); // CVS Bundle Importer should be available assertNotNull(cvsBundleImporter); @@ -293,7 +295,7 @@ public class ProjectSetImporterTests extends EclipseTest { String s = ProjectSetCapability.SCHEME_SCM + ":cvs:" + CVSTestSetup.REPOSITORY_LOCATION + ":" + project.getName(); Map[] manifests = new Map[1]; - Map map = new HashMap(); + Map<String, String> map = new HashMap<>(); map.put(BundleImporterDelegate.ECLIPSE_SOURCE_REFERENCES, s); manifests[0] = map; @@ -306,9 +308,9 @@ public class ProjectSetImporterTests extends EclipseTest { private static IBundleImporter getBundleImporter(final String id) { IBundleImporter[] importers = Team.getBundleImporters(); - for (int i = 0; i < importers.length; i++) { - if (importers[i].getId().equals(id)) - return importers[i]; + for (IBundleImporter importer : importers) { + if (importer.getId().equals(id)) + return importer; } return null; } |