diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/ReplacePlanTest.java')
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/ReplacePlanTest.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/ReplacePlanTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/ReplacePlanTest.java index ed6f1d617..9efa4f8e3 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/ReplacePlanTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/ReplacePlanTest.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.director; -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 org.eclipse.core.runtime.IStatus; +import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability; import org.eclipse.equinox.internal.provisional.p2.director.*; -import org.eclipse.equinox.internal.provisional.p2.engine.*; -import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability; +import org.eclipse.equinox.p2.engine.*; +import org.eclipse.equinox.p2.metadata.IInstallableUnit; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; /** @@ -40,8 +40,8 @@ public class ReplacePlanTest extends AbstractProvisioningTest { protected void setUp() throws Exception { //base IU that others require f1 = createIU("f1", DEFAULT_VERSION, true); - f1_1 = createIU("f1", new Version(1, 1, 0), true); - f1_4 = createIU("f1", new Version(1, 4, 0), true); + f1_1 = createIU("f1", Version.createOSGi(1, 1, 0), true); + f1_4 = createIU("f1", Version.createOSGi(1, 4, 0), true); //fragments of base IU frag1 = createIUFragment(f1, "frag1", f1.getVersion()); @@ -49,10 +49,10 @@ public class ReplacePlanTest extends AbstractProvisioningTest { frag1_4 = createIUFragment(f1, "frag1", f1_4.getVersion()); //IUs that require base IU - IRequiredCapability[] requires = createRequiredCapabilities(IInstallableUnit.NAMESPACE_IU_ID, "f1", new VersionRange("[1.0.0, 1.3.0)"), null); + IRequiredCapability[] requires = createRequiredCapabilities(IInstallableUnit.NAMESPACE_IU_ID, "f1", new VersionRange("[1.0.0, 1.3.0)")); fa = createIU("fa", requires, false); - requires = createRequiredCapabilities(IInstallableUnit.NAMESPACE_IU_ID, "f1", new VersionRange("[1.0.0, 1.4.0)"), null); - fap = createIU("fa", new Version(1, 1, 0), requires, NO_PROPERTIES, false); + requires = createRequiredCapabilities(IInstallableUnit.NAMESPACE_IU_ID, "f1", new VersionRange("[1.0.0, 1.4.0)")); + fap = createIU("fa", Version.createOSGi(1, 1, 0), requires, NO_PROPERTIES, false); createTestMetdataRepository(new IInstallableUnit[] {f1, fa, frag1}); @@ -73,10 +73,10 @@ public class ReplacePlanTest extends AbstractProvisioningTest { ProfileChangeRequest request = new ProfileChangeRequest(profile); request.removeInstallableUnits(oldUnits); request.addInstallableUnits(newUnits); - ProvisioningPlan plan = planner.getProvisioningPlan(request, new ProvisioningContext(), null); + IProvisioningPlan plan = planner.getProvisioningPlan(request, new ProvisioningContext(), null); assertTrue("1.0", plan.getStatus().isOK()); assertProfileContainsAll("1.1", profile, oldUnits); - IStatus result = createEngine().perform(profile, new DefaultPhaseSet(), plan.getOperands(), null, null); + IStatus result = createEngine().perform(plan, null); assertTrue("1.2", result.isOK()); assertProfileContainsAll("1.3", profile, newUnits); } @@ -86,7 +86,7 @@ public class ReplacePlanTest extends AbstractProvisioningTest { ProfileChangeRequest request = new ProfileChangeRequest(profile); request.removeInstallableUnits(new IInstallableUnit[] {frag1}); request.addInstallableUnits(new IInstallableUnit[] {frag1_4}); - ProvisioningPlan plan = planner.getProvisioningPlan(request, new ProvisioningContext(), null); + IProvisioningPlan plan = planner.getProvisioningPlan(request, new ProvisioningContext(), null); assertTrue("1.0", plan.getStatus().isOK()); } |