diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/ExplanationLargeConflict.java')
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/ExplanationLargeConflict.java | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/ExplanationLargeConflict.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/ExplanationLargeConflict.java index 3ab52200b..4d4fa7477 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/ExplanationLargeConflict.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/ExplanationLargeConflict.java @@ -10,19 +10,18 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.planner; -import org.eclipse.equinox.internal.provisional.p2.metadata.Version; -import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange; - import java.io.File; import org.eclipse.equinox.internal.p2.core.helpers.LogHelper; import org.eclipse.equinox.internal.p2.engine.SimpleProfileRegistry; -import org.eclipse.equinox.internal.provisional.p2.director.*; -import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; -import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability; -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.repository.IMetadataRepository; +import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability; +import org.eclipse.equinox.internal.provisional.p2.director.IPlanner; +import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest; +import org.eclipse.equinox.p2.engine.IProfile; +import org.eclipse.equinox.p2.engine.IProvisioningPlan; +import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.p2.query.IQueryResult; +import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; public class ExplanationLargeConflict extends AbstractProvisioningTest { @@ -50,19 +49,19 @@ public class ExplanationLargeConflict extends AbstractProvisioningTest { long sTime = System.currentTimeMillis(); //Here we verify that two version of JDT can't be installed together. The SDKProfile is not used IProfile profile = createProfile("TestProfile." + getName()); - Collector c = repo1.query(new InstallableUnitQuery("org.eclipse.jdt.feature.group"), new Collector(), null); - assertEquals(1, c.size()); + IQueryResult c = repo1.query(new InstallableUnitQuery("org.eclipse.jdt.feature.group"), null); + assertEquals(1, queryResultSize(c)); IInstallableUnit jdt1 = (IInstallableUnit) c.iterator().next(); - Collector c2 = repo2.query(new InstallableUnitQuery("org.eclipse.jdt.feature.group"), new Collector(), null); - assertEquals(1, c2.size()); + IQueryResult c2 = repo2.query(new InstallableUnitQuery("org.eclipse.jdt.feature.group"), null); + assertEquals(1, queryResultSize(c2)); IInstallableUnit jdt2 = (IInstallableUnit) c2.iterator().next(); assertNotSame(jdt1, jdt2); ProfileChangeRequest pcr = new ProfileChangeRequest(profile); pcr.addInstallableUnits(new IInstallableUnit[] {jdt1, jdt2}); - ProvisioningPlan plan = planner.getProvisioningPlan(pcr, null, null); + IProvisioningPlan plan = planner.getProvisioningPlan(pcr, null, null); assertNotOK(plan.getStatus()); LogHelper.log(plan.getStatus()); // System.out.println(plan.getRequestStatus().getExplanations()); @@ -73,11 +72,11 @@ public class ExplanationLargeConflict extends AbstractProvisioningTest { public void testMissingRequirement() { long sTime = System.currentTimeMillis(); //Test the case of a missing requirement in the IU being installed - IRequiredCapability[] cap = createRequiredCapabilities("missing", "missing", new VersionRange("[0.0.0, 1.0.0)"), null); - IInstallableUnit otherIU2 = createIU("foo", new Version("0.9.0"), null, cap, BUNDLE_CAPABILITY, NO_PROPERTIES, TOUCHPOINT_OSGI, NO_TP_DATA, true); + IRequiredCapability[] cap = createRequiredCapabilities("missing", "missing", new VersionRange("[0.0.0, 1.0.0)")); + IInstallableUnit otherIU2 = createIU("foo", Version.create("0.9.0"), null, cap, BUNDLE_CAPABILITY, NO_PROPERTIES, TOUCHPOINT_OSGI, NO_TP_DATA, true); ProfileChangeRequest pcr3 = new ProfileChangeRequest(SDKprofile); pcr3.addInstallableUnits(new IInstallableUnit[] {otherIU2}); - ProvisioningPlan plan3 = planner.getProvisioningPlan(pcr3, null, null); + IProvisioningPlan plan3 = planner.getProvisioningPlan(pcr3, null, null); assertNotOK(plan3.getStatus()); LogHelper.log(plan3.getStatus()); // System.out.println(plan3.getRequestStatus().getExplanations()); @@ -88,10 +87,10 @@ public class ExplanationLargeConflict extends AbstractProvisioningTest { public void testSingletonConflict() { long sTime = System.currentTimeMillis(); //The IU being installed conflict with something already installed because of a singleton - IInstallableUnit otherIU = createIU("org.eclipse.equinox.p2.director", new Version("0.9.0"), null, NO_REQUIRES, BUNDLE_CAPABILITY, NO_PROPERTIES, TOUCHPOINT_OSGI, NO_TP_DATA, true); + IInstallableUnit otherIU = createIU("org.eclipse.equinox.p2.director", Version.create("0.9.0"), null, NO_REQUIRES, BUNDLE_CAPABILITY, NO_PROPERTIES, TOUCHPOINT_OSGI, NO_TP_DATA, true); ProfileChangeRequest pcr2 = new ProfileChangeRequest(SDKprofile); pcr2.addInstallableUnits(new IInstallableUnit[] {otherIU}); - ProvisioningPlan plan2 = planner.getProvisioningPlan(pcr2, null, null); + IProvisioningPlan plan2 = planner.getProvisioningPlan(pcr2, null, null); assertNotOK(plan2.getStatus()); LogHelper.log(plan2.getStatus()); // System.out.println(plan2.getRequestStatus().getExplanations()); @@ -102,13 +101,13 @@ public class ExplanationLargeConflict extends AbstractProvisioningTest { public void testExplanationLargeConflictInSDK() { long sTime = System.currentTimeMillis(); //Test large conflict. We are trying to install an inappropriate version of CVS over the already installed SDK - Collector c = repo2.query(new InstallableUnitQuery("org.eclipse.cvs.feature.group"), new Collector(), null); - assertEquals(1, c.size()); + IQueryResult c = repo2.query(new InstallableUnitQuery("org.eclipse.cvs.feature.group"), null); + assertEquals(1, queryResultSize(c)); IInstallableUnit cvs = (IInstallableUnit) c.iterator().next(); ProfileChangeRequest pcr = new ProfileChangeRequest(SDKprofile); pcr.addInstallableUnits(new IInstallableUnit[] {cvs}); - ProvisioningPlan plan = planner.getProvisioningPlan(pcr, null, null); + IProvisioningPlan plan = planner.getProvisioningPlan(pcr, null, null); assertNotOK(plan.getStatus()); LogHelper.log(plan.getStatus()); // System.out.println(plan.getRequestStatus().getExplanations()); |