Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java')
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java55
1 files changed, 27 insertions, 28 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java
index 2e8e460ce..e51f887e5 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java
@@ -10,13 +10,13 @@
*******************************************************************************/
package org.eclipse.equinox.p2.tests.metadata;
-import java.util.HashMap;
-import java.util.Iterator;
+import java.util.*;
import junit.framework.AssertionFailedError;
import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;
-import org.eclipse.equinox.internal.provisional.p2.metadata.*;
-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
-import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
+import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.metadata.query.FragmentQuery;
+import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
public class FragmentTest extends AbstractProvisioningTest {
@@ -27,7 +27,7 @@ public class FragmentTest extends AbstractProvisioningTest {
IInstallableUnit iu2 = createBundleFragment("iuFragment.test1");
ProfileChangeRequest req = new ProfileChangeRequest(createProfile(getName()));
createTestMetdataRepository(new IInstallableUnit[] {iu1, iu2});
- Iterator iterator = createPlanner().getProvisioningPlan(req, null, null).getAdditions().query(InstallableUnitQuery.ANY, new Collector(), null).iterator();
+ Iterator iterator = createPlanner().getProvisioningPlan(req, null, null).getAdditions().query(InstallableUnitQuery.ANY, null).iterator();
// ResolutionHelper rh = new ResolutionHelper(new Hashtable(), null);
// HashSet set = new HashSet();
// set.add(iu1);
@@ -36,8 +36,8 @@ public class FragmentTest extends AbstractProvisioningTest {
for (; iterator.hasNext();) {
IInstallableUnit iu = (IInstallableUnit) iterator.next();
if (iu.getId().equals(ID)) {
- assertEquals(iu.getFragments().length, 1);
- assertEquals(iu.getFragments()[0].getId(), "iuFragment.test1");
+ assertEquals(iu.getFragments().size(), 1);
+ assertEquals(iu.getFragments().get(0).getId(), "iuFragment.test1");
}
}
}
@@ -50,48 +50,48 @@ public class FragmentTest extends AbstractProvisioningTest {
IInstallableUnit iu2 = createBundleFragment("iuFragment.test1");
ProfileChangeRequest req = new ProfileChangeRequest(createProfile(getName()));
createTestMetdataRepository(new IInstallableUnit[] {iu1, iu2, iu3});
- Iterator iterator = createPlanner().getProvisioningPlan(req, null, null).getAdditions().query(InstallableUnitQuery.ANY, new Collector(), null).iterator();
+ Iterator iterator = createPlanner().getProvisioningPlan(req, null, null).getAdditions().query(InstallableUnitQuery.ANY, null).iterator();
for (; iterator.hasNext();) {
IInstallableUnit iu = (IInstallableUnit) iterator.next();
if (iu.getId().equals(ID1)) {
- assertEquals(iu.getFragments().length, 1);
- assertEquals(iu.getFragments()[0].getId(), "iuFragment.test1");
+ assertEquals(iu.getFragments().size(), 1);
+ assertEquals(iu.getFragments().get(0).getId(), "iuFragment.test1");
}
if (iu.getId().equals(ID3)) {
- assertEquals(iu.getFragments().length, 1);
- assertEquals(iu.getFragments()[0].getId(), "iuFragment.test1");
+ assertEquals(iu.getFragments().size(), 1);
+ assertEquals(iu.getFragments().get(0).getId(), "iuFragment.test1");
}
}
}
public void testTouchpointData() {
- assertEquals(createIUWithTouchpointData().getTouchpointData().length, 1);
- assertEquals(createBundleFragment("iuFragment.test1").getTouchpointData().length, 1);
+ assertEquals(createIUWithTouchpointData().getTouchpointData().size(), 1);
+ assertEquals(createBundleFragment("iuFragment.test1").getTouchpointData().size(), 1);
IInstallableUnit iu1 = createIUWithTouchpointData();
IInstallableUnit iu2 = createBundleFragment("iuFragment.test1");
ProfileChangeRequest req = new ProfileChangeRequest(createProfile(getName()));
createTestMetdataRepository(new IInstallableUnit[] {iu1, iu2});
- Iterator iterator = createPlanner().getProvisioningPlan(req, null, null).getAdditions().query(InstallableUnitQuery.ANY, new Collector(), null).iterator();
+ Iterator iterator = createPlanner().getProvisioningPlan(req, null, null).getAdditions().query(InstallableUnitQuery.ANY, null).iterator();
for (; iterator.hasNext();) {
IInstallableUnit iu = (IInstallableUnit) iterator.next();
if (iu.getId().equals(iu1.getId()))
- assertEquals(2, iu.getTouchpointData().length);
+ assertEquals(2, iu.getTouchpointData().size());
}
}
public void testFragmentCapability() {
IInstallableUnit iu = createBundleFragment("iuFragment.test1");
- assertEquals(Boolean.TRUE.toString(), iu.getProperty(IInstallableUnit.PROP_TYPE_FRAGMENT));
+ assertTrue(FragmentQuery.isFragment(iu));
}
public void testDefaultIUCapability() {
IInstallableUnit iu = createEclipseIU("ui.test1");
- IProvidedCapability[] cap = iu.getProvidedCapabilities();
- for (int i = 0; i < cap.length; i++) {
- if (cap[i].getNamespace().equals(IInstallableUnit.NAMESPACE_IU_ID)) {
- assertEquals(cap[i].getNamespace(), IInstallableUnit.NAMESPACE_IU_ID);
- assertEquals(cap[i].getName(), iu.getId());
+ Collection<IProvidedCapability> capabilities = iu.getProvidedCapabilities();
+ for (IProvidedCapability c : capabilities) {
+ if (c.getNamespace().equals(IInstallableUnit.NAMESPACE_IU_ID)) {
+ assertEquals(c.getNamespace(), IInstallableUnit.NAMESPACE_IU_ID);
+ assertEquals(c.getName(), iu.getId());
return;
}
}
@@ -106,11 +106,10 @@ public class FragmentTest extends AbstractProvisioningTest {
throw new AssertionFailedError("The array does not contain the searched element");
}
- public static void assertContainsWithEquals(Object[] objects, Object searched) {
- for (int i = 0; i < objects.length; i++) {
- if (objects[i].equals(searched))
- return;
- }
+ public static void assertContainsWithEquals(Collection<? extends Object> objects, Object searched) {
+ if (objects.contains(searched))
+ return;
+
throw new AssertionFailedError("The array does not contain the searched element");
}

Back to the top