diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java')
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java index 96070df09..5a18d7ed2 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java @@ -13,8 +13,7 @@ package org.eclipse.equinox.p2.tests.publisher.actions; import static org.easymock.EasyMock.*; import java.io.File; -import java.util.ArrayList; -import java.util.Collections; +import java.util.*; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.metadata.LDAPQuery; import org.eclipse.equinox.internal.p2.publisher.eclipse.ExecutablesDescriptor; @@ -93,12 +92,12 @@ public class EquinoxExecutableActionTest extends ActionTest { IInstallableUnit possibleEclipse = (IInstallableUnit) iuList.get(i); if (possibleEclipse.getId().equals(flavorArg + idBase + ".executable." + configSpec)) {//$NON-NLS-1$ IInstallableUnitFragment fragment = (IInstallableUnitFragment) iuList.get(i); - IProvidedCapability[] providedCapability = fragment.getProvidedCapabilities(); + List<IProvidedCapability> providedCapability = fragment.getProvidedCapabilities(); verifyProvidedCapability(providedCapability, IInstallableUnit.NAMESPACE_IU_ID, flavorArg + idBase + ".executable." + configSpec, version); //$NON-NLS-1$ - assertTrue(providedCapability.length == 1); - IRequirement[] requiredCapability = fragment.getRequiredCapabilities(); + assertTrue(providedCapability.size() == 1); + List<IRequirement> requiredCapability = fragment.getRequiredCapabilities(); verifyRequiredCapability(requiredCapability, IInstallableUnit.NAMESPACE_IU_ID, idBase + ".executable." + configSpec, new VersionRange(version, true, version, true)); //$NON-NLS-1$ - assertTrue(requiredCapability.length == 1); + assertTrue(requiredCapability.size() == 1); assertTrue(((LDAPQuery) fragment.getFilter()).getFilter().equals("(& (osgi.ws=" + ws + ")(osgi.os=" + os + ")(osgi.arch=" + arch + "))")); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ assertTrue(fragment.getProperty("org.eclipse.equinox.p2.type.fragment").equals("true")); //$NON-NLS-1$ //$NON-NLS-2$ return;//pass @@ -113,11 +112,11 @@ public class EquinoxExecutableActionTest extends ActionTest { IInstallableUnit possibleEclipse = (IInstallableUnit) iuList.get(i); if (possibleEclipse.getId().equals((idBase + ".executable." + configSpec + ".eclipse"))) { //$NON-NLS-1$//$NON-NLS-2$ assertTrue(possibleEclipse.getVersion().equals(version)); - IProvidedCapability[] providedCapability = possibleEclipse.getProvidedCapabilities(); + List<IProvidedCapability> providedCapability = possibleEclipse.getProvidedCapabilities(); verifyProvidedCapability(providedCapability, IInstallableUnit.NAMESPACE_IU_ID, idBase + ".executable." + configSpec + ".eclipse", version); //$NON-NLS-1$ //$NON-NLS-2$ - assertTrue(providedCapability.length == 1); - IRequirement[] req = possibleEclipse.getRequiredCapabilities(); - assertTrue(req.length == 0); + assertTrue(providedCapability.size() == 1); + List<IRequirement> req = possibleEclipse.getRequiredCapabilities(); + assertTrue(req.size() == 0); return;//pass } } @@ -135,18 +134,18 @@ public class EquinoxExecutableActionTest extends ActionTest { if (possibleExec.getId().equals(idBase + ".executable." + configSpec)) { //$NON-NLS-1$ //keep checking assertTrue(((LDAPQuery) possibleExec.getFilter()).getFilter().equals("(& (osgi.ws=" + ws + ")(osgi.os=" + os + ")(osgi.arch=" + arch + "))")); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ - IArtifactKey eKey = possibleExec.getArtifacts()[0]; + IArtifactKey eKey = possibleExec.getArtifacts().get(0); assertTrue(eKey.getClassifier().equals("binary")); //$NON-NLS-1$ assertTrue(eKey.getId().equals(idBase + ".executable." + configSpec)); //$NON-NLS-1$ assertTrue(eKey.getVersion().equals(version)); - IProvidedCapability[] providedCapabilities = possibleExec.getProvidedCapabilities(); + List<IProvidedCapability> providedCapabilities = possibleExec.getProvidedCapabilities(); verifyProvidedCapability(providedCapabilities, IInstallableUnit.NAMESPACE_IU_ID, idBase + ".executable." + configSpec, version); //$NON-NLS-1$ verifyProvidedCapability(providedCapabilities, flavorArg + idBase, idBase + ".executable", version); //$NON-NLS-1$ - assertTrue(providedCapabilities.length == 2); + assertTrue(providedCapabilities.size() == 2); - IRequirement[] requiredCapability = possibleExec.getRequiredCapabilities(); + List<IRequirement> requiredCapability = possibleExec.getRequiredCapabilities(); verifyRequiredCapability(requiredCapability, IInstallableUnit.NAMESPACE_IU_ID, "org.eclipse.equinox.launcher." + (idBase.equals("mac") || idBase.equals("macCocoa") ? configSpec.substring(0, configSpec.lastIndexOf(".")) : configSpec), VersionRange.emptyRange); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - assertTrue(requiredCapability.length == 1); + assertTrue(requiredCapability.size() == 1); return;//pass } } |