diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests/src/org')
8 files changed, 48 insertions, 56 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ant/MirrorTaskTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ant/MirrorTaskTest.java index 1f4146d07..a97ca935a 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ant/MirrorTaskTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ant/MirrorTaskTest.java @@ -24,7 +24,6 @@ import java.net.URISyntaxException; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import java.util.Properties; import java.util.zip.ZipEntry; @@ -854,8 +853,8 @@ public class MirrorTaskTest extends AbstractAntProvisioningTest { */ protected int getArtifactKeyCount(IQueryResult<IInstallableUnit> ius) { int count = 0; - for (Iterator<IInstallableUnit> iter = ius.iterator(); iter.hasNext();) - count += iter.next().getArtifacts().size(); + for (IInstallableUnit iu : ius) + count += iu.getArtifacts().size(); return count; } @@ -877,8 +876,7 @@ public class MirrorTaskTest extends AbstractAntProvisioningTest { protected void addAllIUs(AntTaskElement parent, IMetadataRepository repo) { IQueryResult<IInstallableUnit> queryResult = repo.query(QueryUtil.createIUAnyQuery(), null); - for (Iterator<IInstallableUnit> iter = queryResult.iterator(); iter.hasNext();) { - IInstallableUnit iu = iter.next(); + for (IInstallableUnit iu : queryResult) { parent.addElement(createIUElement(iu)); } } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/MD5Tests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/MD5Tests.java index 1e8808a8f..44d7a1e6a 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/MD5Tests.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/MD5Tests.java @@ -15,7 +15,6 @@ package org.eclipse.equinox.p2.tests.artifact.repository; import java.io.ByteArrayOutputStream; import java.io.File; -import java.util.Iterator; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; @@ -40,8 +39,7 @@ public class MD5Tests extends AbstractProvisioningTest { public void DISABLE_testCheckMD5() { IQueryResult<IArtifactDescriptor> descriptors = repo.descriptorQueryable().query(ArtifactDescriptorQuery.ALL_DESCRIPTORS, null); - for (Iterator<IArtifactDescriptor> iterator = descriptors.iterator(); iterator.hasNext();) { - IArtifactDescriptor desc = iterator.next(); + for (IArtifactDescriptor desc : descriptors) { IStatus status = repo.getArtifact(desc, new ByteArrayOutputStream(500), new NullProgressMonitor()); //All artifacts that are expected to fail MD5 check are those whose id starts with bogus if (desc.getArtifactKey().getId().startsWith("bogus")) { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java index 84d30c9fb..a8c5524cc 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java @@ -246,9 +246,9 @@ public class OperationGenerationTest extends AbstractProvisioningTest { new OperationGenerator(plan).generateOperation(from, to); List<Operand> operands = Arrays.asList(plan.getOperands()); //We are uninstalling myBundle 1.0 and 2.0. 3.0 stays unchanged. - for (int i = 0; i < operands.size(); i++) { - assertNotSame("3.0", three, ((InstallableUnitOperand) operands.get(i)).first()); - assertNotSame("3.0.1", three, ((InstallableUnitOperand) operands.get(i)).second()); + for (Operand operand : operands) { + assertNotSame("3.0", three, ((InstallableUnitOperand) operand).first()); + assertNotSame("3.0.1", three, ((InstallableUnitOperand) operand).second()); } assertEquals("3.1", one, ((InstallableUnitOperand) operands.get(0)).first()); assertNull("3.2", ((InstallableUnitOperand) operands.get(0)).second()); @@ -278,9 +278,9 @@ public class OperationGenerationTest extends AbstractProvisioningTest { new OperationGenerator(plan).generateOperation(from, to); List<Operand> operands = Arrays.asList(plan.getOperands()); //Two is already in the system therefore it will not be in the operands - for (int i = 0; i < operands.size(); i++) { - assertNotSame("2.0", two, ((InstallableUnitOperand) operands.get(i)).first()); - assertNotSame("2.1", two, ((InstallableUnitOperand) operands.get(i)).second()); + for (Operand operand : operands) { + assertNotSame("2.0", two, ((InstallableUnitOperand) operand).first()); + assertNotSame("2.1", two, ((InstallableUnitOperand) operand).second()); } //three is an update of one assertEquals("2.2", 1, operands.size()); @@ -311,9 +311,9 @@ public class OperationGenerationTest extends AbstractProvisioningTest { new OperationGenerator(plan).generateOperation(from, to); List<Operand> operands = Arrays.asList(plan.getOperands()); //Two is already in the system therefore it will not be in the operands - for (int i = 0; i < operands.size(); i++) { - assertNotSame("2.0", two, ((InstallableUnitOperand) operands.get(i)).first()); - assertNotSame("2.1", two, ((InstallableUnitOperand) operands.get(i)).second()); + for (Operand operand : operands) { + assertNotSame("2.0", two, ((InstallableUnitOperand) operand).first()); + assertNotSame("2.1", two, ((InstallableUnitOperand) operand).second()); } //We install three and uninstall one assertEquals("2.2", 2, operands.size()); @@ -374,10 +374,10 @@ public class OperationGenerationTest extends AbstractProvisioningTest { } private void assertContainsInstallableUnitOperand(String message, List<Operand> operands, InstallableUnitOperand operand) { - for (int i = 0; i < operands.size(); i++) { - if (!(operands.get(i) instanceof InstallableUnitOperand)) + for (Operand op : operands) { + if (!(op instanceof InstallableUnitOperand)) continue; - InstallableUnitOperand cmp = (InstallableUnitOperand) operands.get(i); + InstallableUnitOperand cmp = (InstallableUnitOperand) op; if (cmp.first() != null && cmp.first().equals(operand.first()) && cmp.second() != null && cmp.second().equals(operand.second())) return; } @@ -505,10 +505,10 @@ public class OperationGenerationTest extends AbstractProvisioningTest { } public void assertContainsConfigurationChange(String message, List<Operand> operands) { - for (int i = 0; i < operands.size(); i++) { - if (!(operands.get(i) instanceof InstallableUnitOperand)) + for (Operand operand : operands) { + if (!(operand instanceof InstallableUnitOperand)) continue; - InstallableUnitOperand op = (InstallableUnitOperand) operands.get(i); + InstallableUnitOperand op = (InstallableUnitOperand) operand; if (op.first() != null && op.first().equals(op.second())) { return; } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/IUPersistenceTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/IUPersistenceTest.java index c777ddccb..718fd3c1c 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/IUPersistenceTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/IUPersistenceTest.java @@ -19,7 +19,6 @@ import java.io.StringReader; import java.net.URI; import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -271,23 +270,23 @@ public class IUPersistenceTest extends AbstractProvisioningTest { } private static String[][] extractRequires(IInstallableUnit iu) { - Collection<IRequirement> requyres = iu.getRequirements(); - String[][] tuples = new String[requyres.size()][4]; + Collection<IRequirement> requirements = iu.getRequirements(); + String[][] tuples = new String[requirements.size()][4]; int i = 0; - for (Iterator<IRequirement> iterator = requyres.iterator(); iterator.hasNext();) { - IRequiredCapability next = (IRequiredCapability) iterator.next(); - tuples[i++] = new String[] {next.getNamespace(), next.getName(), next.getRange().toString(), Boolean.valueOf(next.getMin() == 0).toString()}; + for (IRequirement requirement : requirements) { + IRequiredCapability capability = (IRequiredCapability) requirement; + tuples[i++] = new String[] {capability.getNamespace(), capability.getName(), capability.getRange().toString(), Boolean.valueOf(capability.getMin() == 0).toString()}; } return tuples; } private static String[][] extractMetaRequires(IInstallableUnit iu) { - Collection<IRequirement> requyres = iu.getMetaRequirements(); - String[][] tuples = new String[requyres.size()][4]; + Collection<IRequirement> requirements = iu.getMetaRequirements(); + String[][] tuples = new String[requirements.size()][4]; int i = 0; - for (IRequirement iRequirement : requyres) { - IRequiredCapability next = (IRequiredCapability) iRequirement; - tuples[i++] = new String[] {next.getNamespace(), next.getName(), next.getRange().toString(), Boolean.valueOf(next.getMin() == 0).toString()}; + for (IRequirement requirement : requirements) { + IRequiredCapability capability = (IRequiredCapability) requirement; + tuples[i++] = new String[] {capability.getNamespace(), capability.getName(), capability.getRange().toString(), Boolean.valueOf(capability.getMin() == 0).toString()}; } return tuples; } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerExceptionsTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerExceptionsTest.java index 5184b2e32..74722e340 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerExceptionsTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerExceptionsTest.java @@ -17,7 +17,6 @@ import java.io.File; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; @@ -52,8 +51,9 @@ public class MetadataRepositoryManagerExceptionsTest extends AbstractProvisionin @Override protected void tearDown() throws Exception { super.tearDown(); - for (Iterator<File> it = toDelete.iterator(); it.hasNext();) - delete(it.next()); + for (File file : toDelete) { + delete(file); + } toDelete.clear(); } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java index 1aaa7a533..2b4ebef6a 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java @@ -21,7 +21,6 @@ import java.lang.reflect.Field; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; @@ -78,8 +77,9 @@ public class MetadataRepositoryManagerTest extends AbstractProvisioningTest { @Override protected void tearDown() throws Exception { super.tearDown(); - for (Iterator<File> it = toDelete.iterator(); it.hasNext();) - delete(it.next()); + for (File file : toDelete) { + delete(file); + } toDelete.clear(); FailingMetadataRepositoryFactory.FAIL = false; } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationArtifactTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationArtifactTest.java index 4a9719f50..37d2b4927 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationArtifactTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationArtifactTest.java @@ -954,12 +954,8 @@ public class NewMirrorApplicationArtifactTest extends AbstractProvisioningTest { fail(""); } - IQueryResult<IArtifactKey> keys = packedRepo.query(ArtifactKeyQuery.ALL_KEYS, null); - for (Iterator<IArtifactKey> iterator = keys.iterator(); iterator.hasNext();) { - IArtifactKey key = iterator.next(); - IArtifactDescriptor[] srcDescriptors = packedRepo.getArtifactDescriptors(key); - - for (IArtifactDescriptor srcDescriptor : srcDescriptors) { + for (IArtifactKey key : packedRepo.query(ArtifactKeyQuery.ALL_KEYS, null)) { + for (IArtifactDescriptor srcDescriptor : packedRepo.getArtifactDescriptors(key)) { if (!(srcDescriptor.getProperty(IArtifactDescriptor.FORMAT) == null) && srcDescriptor.getProperty(IArtifactDescriptor.FORMAT).equals(IArtifactDescriptor.FORMAT_PACKED)) { //if we have a packed artifact IArtifactDescriptor newDescriptor = new ArtifactDescriptor(key); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/NonMinimalState.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/NonMinimalState.java index 3d021e50e..e24f54d0d 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/NonMinimalState.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/NonMinimalState.java @@ -15,13 +15,18 @@ package org.eclipse.equinox.p2.tests.planner; import java.io.File; import java.net.URI; -import java.util.*; +import java.util.HashSet; +import java.util.Set; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.director.ProfileChangeRequest; import org.eclipse.equinox.internal.p2.engine.SimpleProfileRegistry; -import org.eclipse.equinox.p2.engine.*; +import org.eclipse.equinox.p2.engine.IProfile; +import org.eclipse.equinox.p2.engine.IProvisioningPlan; +import org.eclipse.equinox.p2.engine.ProvisioningContext; import org.eclipse.equinox.p2.engine.query.IUProfilePropertyQuery; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.p2.metadata.IInstallableUnitFragment; +import org.eclipse.equinox.p2.metadata.IRequirement; import org.eclipse.equinox.p2.planner.IPlanner; import org.eclipse.equinox.p2.query.IQueryResult; import org.eclipse.equinox.p2.query.QueryUtil; @@ -76,8 +81,7 @@ public class NonMinimalState extends AbstractProvisioningTest { visited = new HashSet<>(); IQueryResult<IInstallableUnit> roots = profile.query(new IUProfilePropertyQuery("org.eclipse.equinox.p2.type.root", "true"), null); searchedId = id; - for (Iterator<IInstallableUnit> iterator = roots.iterator(); iterator.hasNext();) { - IInstallableUnit type = iterator.next(); + for (IInstallableUnit type : roots) { if (type instanceof IInstallableUnitFragment) { visited.add(type); continue; @@ -93,8 +97,7 @@ public class NonMinimalState extends AbstractProvisioningTest { visited.add(iu); return false; } - Collection<IRequirement> reqs = iu.getRequirements(); - for (IRequirement req : reqs) { + for (IRequirement req : iu.getRequirements()) { boolean result = expandRequirement(iu, req); if (result) { System.out.println(iu + " because " + req.toString()); @@ -105,9 +108,7 @@ public class NonMinimalState extends AbstractProvisioningTest { } private boolean expandRequirement(IInstallableUnit iu, IRequirement req) { - IQueryResult<IInstallableUnit> matches = profile.query(QueryUtil.createMatchQuery(req.getMatches()), null); - for (Iterator<IInstallableUnit> iterator = matches.iterator(); iterator.hasNext();) { - IInstallableUnit match = iterator.next(); + for (IInstallableUnit match : profile.query(QueryUtil.createMatchQuery(req.getMatches()), null)) { if (match.getId().equals(searchedId)) return true; if (!visited.contains(match)) { |