diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests')
6 files changed, 19 insertions, 27 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ReducedCUDFParser.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ReducedCUDFParser.java index 4d0d6a5d3..298ab4517 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ReducedCUDFParser.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ReducedCUDFParser.java @@ -150,8 +150,8 @@ public class ReducedCUDFParser { if (TIMING) // Log.println("Time to parse:" + (System.currentTimeMillis() - start)); if (DEBUG) - for (Iterator<IInstallableUnit> iter = allIUs.iterator(); iter.hasNext();) - debug((InstallableUnit) iter.next()); + for (IInstallableUnit iu : allIUs) + debug((InstallableUnit) iu); // if (FORCE_QUERY) { // if (query == null) // initializeQueryableArray(); @@ -540,8 +540,8 @@ public class ReducedCUDFParser { List<Tuple> pkgs = createPackageList(line); IProvidedCapability[] providedCapabilities = new ProvidedCapability[pkgs.size() + 2]; int i = 0; - for (Iterator<Tuple> iter = pkgs.iterator(); iter.hasNext();) { - providedCapabilities[i++] = createProvidedCapability(iter.next()); + for (Tuple tuple : pkgs) { + providedCapabilities[i++] = createProvidedCapability(tuple); } providedCapabilities[i++] = MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_IU_ID, currentIU.getId(), currentIU.getVersion()); providedCapabilities[i++] = MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_IU_ID, currentIU.getId(), currentIU.getVersion()); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ant/Repo2RunnableTaskTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ant/Repo2RunnableTaskTests.java index b372c211e..75d7732c1 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ant/Repo2RunnableTaskTests.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ant/Repo2RunnableTaskTests.java @@ -16,7 +16,6 @@ package org.eclipse.equinox.p2.tests.ant; import java.io.*; import java.net.URI; -import java.util.Iterator; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.p2.core.ProvisionException; import org.eclipse.equinox.p2.metadata.IArtifactKey; @@ -139,8 +138,7 @@ public class Repo2RunnableTaskTests extends AbstractAntProvisioningTest { fail("Failed to load repository", e); } IQueryResult<IArtifactKey> keys = repo.query(ArtifactKeyQuery.ALL_KEYS, null); - for (Iterator<IArtifactKey> iterator = keys.iterator(); iterator.hasNext();) { - IArtifactKey key = iterator.next(); + for (IArtifactKey key : keys) { IArtifactDescriptor[] descriptors = repo.getArtifactDescriptors(key); for (IArtifactDescriptor desc : descriptors) { // Features should be unzipped, others should not be. diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java index 1cf77c6a7..ac8cd521a 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java @@ -677,9 +677,9 @@ public class ProfileRegistryTest extends AbstractProvisioningTest { assertEquals(3, timestamps.length); int fail = 0; - for (int i = 0; i < timestamps.length; i++) { + for (long timestamp : timestamps) { try { - registry.removeProfile(PROFILE_NAME, timestamps[i]); + registry.removeProfile(PROFILE_NAME, timestamp); } catch (ProvisionException e) { fail++; } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java index 4114955c9..b2ba3a29b 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java @@ -17,7 +17,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.StringReader; import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; @@ -191,8 +190,8 @@ public class ProfileTest extends AbstractProvisioningTest { if (profiles.length > 0) { start(PROFILES_ELEMENT); attribute(COLLECTION_SIZE_ATTRIBUTE, profiles.length); - for (int i = 0; i < profiles.length; i++) { - writeProfile(profiles[i]); + for (IProfile profile : profiles) { + writeProfile(profile); } end(PROFILES_ELEMENT); } @@ -289,8 +288,7 @@ public class ProfileTest extends AbstractProvisioningTest { return new IProfile[0]; Map<String, IProfile> profileMap = new LinkedHashMap<>(); - for (Iterator<String> it = profileHandlers.keySet().iterator(); it.hasNext();) { - String profileId = it.next(); + for (String profileId : profileHandlers.keySet()) { addProfile(profileId, profileMap); } @@ -314,13 +312,11 @@ public class ProfileTest extends AbstractProvisioningTest { profile.setTimestamp(profileHandler.getTimestamp()); IInstallableUnit[] ius = profileHandler.getInstallableUnits(); if (ius != null) { - for (int i = 0; i < ius.length; i++) { - IInstallableUnit iu = ius[i]; + for (IInstallableUnit iu : ius) { profile.addInstallableUnit(iu); Map<String, String> iuProperties = profileHandler.getIUProperties(iu); if (iuProperties != null) { - for (Iterator<Entry<String, String>> it = iuProperties.entrySet().iterator(); it.hasNext();) { - Entry<String, String> entry = it.next(); + for (Entry<String, String> entry : iuProperties.entrySet()) { String key = entry.getKey(); String value = entry.getValue(); profile.setInstallableUnitProperty(iu, key, value); @@ -367,8 +363,8 @@ public class ProfileTest extends AbstractProvisioningTest { @Override protected Object getRootObject() { Map<String, IProfile> result = new HashMap<>(); - for (int i = 0; i < profiles.length; i++) { - result.put(profiles[i].getProfileId(), profiles[i]); + for (IProfile profile : profiles) { + result.put(profile.getProfileId(), profile); } return result; } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionTest.java index f94021124..f59711b2f 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionTest.java @@ -31,7 +31,6 @@ import java.io.IOException; import java.net.URI; import java.util.Arrays; import java.util.Collection; -import java.util.Iterator; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability; @@ -289,8 +288,8 @@ public class ProductActionTest extends ActionTest { Collection<IRequirement> requiredCapabilities = unit.getRequirements(); IRequiredCapability capability = null; - for (Iterator<IRequirement> iterator = requiredCapabilities.iterator(); iterator.hasNext();) { - IRequiredCapability req = (IRequiredCapability) iterator.next(); + for (IRequirement iRequirement : requiredCapabilities) { + IRequiredCapability req = (IRequiredCapability) iRequirement; if (req.getName().equals("org.eclipse.platform.feature.group")) { capability = req; break; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ql/PerformanceTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ql/PerformanceTest.java index c98cdff73..3713365f3 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ql/PerformanceTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ql/PerformanceTest.java @@ -198,8 +198,7 @@ public class PerformanceTest extends AbstractProvisioningTest { start = System.currentTimeMillis(); for (int idx = 0; idx < 80; ++idx) { int sz = 0; - for (Iterator<IInstallableUnit> iter = repo.query(QueryUtil.createIUAnyQuery(), new NullProgressMonitor()).iterator(); iter.hasNext();) { - IInstallableUnit candidate = iter.next(); + for (IInstallableUnit candidate : repo.query(QueryUtil.createIUAnyQuery(), new NullProgressMonitor())) { if (candidate.getId().startsWith("org.eclipse.")) sz++; } @@ -445,8 +444,8 @@ public class PerformanceTest extends AbstractProvisioningTest { private IInstallableUnit[] gatherAvailableInstallableUnits(IQueryable<IInstallableUnit> queryable) { ArrayList<IInstallableUnit> list = new ArrayList<>(); IQueryResult<IInstallableUnit> matches = queryable.query(QueryUtil.createIUAnyQuery(), null); - for (Iterator<IInstallableUnit> it = matches.iterator(); it.hasNext();) - list.add(it.next()); + for (IInstallableUnit iInstallableUnit : matches) + list.add(iInstallableUnit); return list.toArray(new IInstallableUnit[list.size()]); } } |