diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/PatchTest6.java')
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/PatchTest6.java | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/PatchTest6.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/PatchTest6.java index e53a8f741..17b87a579 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/PatchTest6.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/PatchTest6.java @@ -10,16 +10,17 @@ *******************************************************************************/ 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 org.eclipse.equinox.p2.metadata.Version; +import org.eclipse.equinox.p2.metadata.VersionRange; import java.util.Set; import org.eclipse.core.runtime.IStatus; import org.eclipse.equinox.internal.p2.director.Explanation; +import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability; import org.eclipse.equinox.internal.provisional.p2.director.*; -import org.eclipse.equinox.internal.provisional.p2.engine.IEngine; -import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.p2.engine.*; +import org.eclipse.equinox.p2.metadata.*; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; public class PatchTest6 extends AbstractProvisioningTest { @@ -37,20 +38,20 @@ public class PatchTest6 extends AbstractProvisioningTest { protected void setUp() throws Exception { super.setUp(); - a1 = createIU("A", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.1.0)"), null, false, true)}); - b1 = createIU("B", new Version(1, 2, 0), true); + a1 = createIU("A", Version.create("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.1.0)"), null, false, true)}); + b1 = createIU("B", Version.createOSGi(1, 2, 0), true); - c1 = createIU("C", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "D", new VersionRange("[1.0.0, 1.1.0)"), null, false, true)}); - d1 = createIU("D", new Version(1, 2, 0), true); + c1 = createIU("C", Version.create("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "D", new VersionRange("[1.0.0, 1.1.0)"), null, false, true)}); + d1 = createIU("D", Version.createOSGi(1, 2, 0), true); IRequirementChange changeA = MetadataFactory.createRequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.1.0, 1.3.0)"), null, false, false, true)); IRequiredCapability[][] scopeP1 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false, false)}}; IRequiredCapability[] reqOnPP = new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "PP", new VersionRange("[1.0.0, 2.0.0)"), null, false, false, true)}; - p1 = createIUPatch("P", new Version("1.0.0"), null, reqOnPP, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, new IRequirementChange[] {changeA}, scopeP1, null, new IRequiredCapability[0]); + p1 = createIUPatch("P", Version.create("1.0.0"), null, reqOnPP, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, new IRequirementChange[] {changeA}, scopeP1, null, new IRequiredCapability[0]); IRequirementChange changeC = MetadataFactory.createRequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "D", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "D", new VersionRange("[1.1.0, 1.3.0)"), null, false, false, true)); IRequiredCapability[][] scopePP1 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", VersionRange.emptyRange, null, false, false, false)}}; - pp1 = createIUPatch("PP", new Version("1.0.0"), true, new IRequirementChange[] {changeC}, scopePP1, null); + pp1 = createIUPatch("PP", Version.create("1.0.0"), true, new IRequirementChange[] {changeC}, scopePP1, null); createTestMetdataRepository(new IInstallableUnit[] {a1, b1, c1, d1, p1, pp1}); profile1 = createProfile("TestProfile." + getName()); @@ -62,25 +63,25 @@ public class PatchTest6 extends AbstractProvisioningTest { //Confirm that a1 and c1 can't be installed ProfileChangeRequest req1 = new ProfileChangeRequest(profile1); req1.addInstallableUnits(new IInstallableUnit[] {a1, c1}); - ProvisioningPlan plan1 = planner.getProvisioningPlan(req1, null, null); + IProvisioningPlan plan1 = planner.getProvisioningPlan(req1, null, null); assertEquals(IStatus.ERROR, plan1.getStatus().getSeverity()); //Verify that the installation of c1 and pp1 succeed ProfileChangeRequest req2 = new ProfileChangeRequest(profile1); req2.addInstallableUnits(new IInstallableUnit[] {c1, pp1}); - ProvisioningPlan plan2 = planner.getProvisioningPlan(req2, null, null); + IProvisioningPlan plan2 = planner.getProvisioningPlan(req2, null, null); assertEquals(IStatus.OK, plan2.getStatus().getSeverity()); //Verify that p1 can be installed alone (kind of meaningless) ProfileChangeRequest req3 = new ProfileChangeRequest(profile1); req3.addInstallableUnits(new IInstallableUnit[] {p1}); - ProvisioningPlan plan3 = planner.getProvisioningPlan(req3, null, null); + IProvisioningPlan plan3 = planner.getProvisioningPlan(req3, null, null); assertEquals(IStatus.OK, plan3.getStatus().getSeverity()); //Install a1 and p1. ProfileChangeRequest req4 = new ProfileChangeRequest(profile1); req4.addInstallableUnits(new IInstallableUnit[] {a1, p1}); - ProvisioningPlan plan4 = planner.getProvisioningPlan(req4, null, null); + IProvisioningPlan plan4 = planner.getProvisioningPlan(req4, null, null); assertEquals(IStatus.OK, plan4.getStatus().getSeverity()); assertInstallOperand(plan4, a1); assertInstallOperand(plan4, p1); @@ -90,7 +91,7 @@ public class PatchTest6 extends AbstractProvisioningTest { //Install a1, c1 and p1. ProfileChangeRequest req5 = new ProfileChangeRequest(profile1); req5.addInstallableUnits(new IInstallableUnit[] {a1, c1, p1}); - ProvisioningPlan plan5 = planner.getProvisioningPlan(req5, null, null); + IProvisioningPlan plan5 = planner.getProvisioningPlan(req5, null, null); assertEquals(IStatus.OK, plan5.getStatus().getSeverity()); assertInstallOperand(plan4, a1); assertInstallOperand(plan4, p1); @@ -104,10 +105,11 @@ public class PatchTest6 extends AbstractProvisioningTest { //Confirm that a1 and c1 can't be installed ProfileChangeRequest req1 = new ProfileChangeRequest(profile1); req1.addInstallableUnits(new IInstallableUnit[] {a1, c1}); - ProvisioningPlan plan1 = planner.getProvisioningPlan(req1, null, null); + ProvisioningPlan plan1 = (ProvisioningPlan) planner.getProvisioningPlan(req1, null, null); assertEquals(IStatus.ERROR, plan1.getStatus().getSeverity()); - assertEquals(Explanation.MISSING_REQUIREMENT, plan1.getRequestStatus().getShortExplanation()); - Set conflictingRoots = plan1.getRequestStatus().getConflictsWithInstalledRoots(); + final RequestStatus requestStatus = (RequestStatus) plan1.getRequestStatus(); + assertEquals(Explanation.MISSING_REQUIREMENT, requestStatus.getShortExplanation()); + Set conflictingRoots = requestStatus.getConflictsWithInstalledRoots(); assertEquals(1, conflictingRoots.size()); assertTrue(conflictingRoots.contains(a1) || conflictingRoots.contains(c1)); } |