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/planner/ExplanationForOptionalDependencies.java')
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/ExplanationForOptionalDependencies.java21
1 files changed, 12 insertions, 9 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/ExplanationForOptionalDependencies.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/ExplanationForOptionalDependencies.java
index c87a9b46b..a7aa0e159 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/ExplanationForOptionalDependencies.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/ExplanationForOptionalDependencies.java
@@ -10,12 +10,14 @@
*******************************************************************************/
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 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.*;
+import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
public class ExplanationForOptionalDependencies extends AbstractProvisioningTest {
@@ -27,7 +29,7 @@ public class ExplanationForOptionalDependencies extends AbstractProvisioningTest
@Override
protected void setUp() throws Exception {
super.setUp();
- sdk = createIU("SDK", Version.fromOSGiVersion(new org.osgi.framework.Version("1.0.0")), createRequiredCapabilities(IInstallableUnit.NAMESPACE_IU_ID, "SDKPart", new VersionRange("[1.0.0, 1.0.0]"), null));
+ sdk = createIU("SDK", Version.fromOSGiVersion(new org.osgi.framework.Version("1.0.0")), createRequiredCapabilities(IInstallableUnit.NAMESPACE_IU_ID, "SDKPart", new VersionRange("[1.0.0, 1.0.0]")));
IInstallableUnit sdkPart = createIU("SDKPart", Version.fromOSGiVersion(new org.osgi.framework.Version("1.0.0")), true);
IInstallableUnit sdkPart2 = createIU("SDKPart", Version.fromOSGiVersion(new org.osgi.framework.Version("2.0.0")), true);
@@ -39,7 +41,7 @@ public class ExplanationForOptionalDependencies extends AbstractProvisioningTest
ProfileChangeRequest pcr = new ProfileChangeRequest(profile);
pcr.addInstallableUnits(new IInstallableUnit[] {sdk});
- engine.perform(profile, new DefaultPhaseSet(), planner.getProvisioningPlan(pcr, null, null).getOperands(), null, null);
+ engine.perform(planner.getProvisioningPlan(pcr, null, null), null);
}
@@ -55,10 +57,11 @@ public class ExplanationForOptionalDependencies extends AbstractProvisioningTest
createTestMetdataRepository(new IInstallableUnit[] {cdt, emf});
ProfileChangeRequest pcr = new ProfileChangeRequest(profile);
pcr.addInstallableUnits(new IInstallableUnit[] {cdt, emf});
- ProvisioningPlan plan = planner.getProvisioningPlan(pcr, null, null);
- assertTrue(plan.getRequestStatus().getConflictsWithInstalledRoots().contains(emf));
- assertFalse(plan.getRequestStatus().getConflictsWithInstalledRoots().contains(cdt));
- assertFalse(plan.getRequestStatus().getConflictsWithInstalledRoots().contains(sdk));
+ ProvisioningPlan plan = (ProvisioningPlan) planner.getProvisioningPlan(pcr, null, null);
+ RequestStatus requestStatus = (RequestStatus) plan.getRequestStatus();
+ assertTrue(requestStatus.getConflictsWithInstalledRoots().contains(emf));
+ assertFalse(requestStatus.getConflictsWithInstalledRoots().contains(cdt));
+ assertFalse(requestStatus.getConflictsWithInstalledRoots().contains(sdk));
// assertTrue(plan.getRequestStatus(cdt).getSeverity() != IStatus.ERROR);
//

Back to the top