diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/MultipleSingleton.java')
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/MultipleSingleton.java | 68 |
1 files changed, 35 insertions, 33 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/MultipleSingleton.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/MultipleSingleton.java index 66e338422..081cc6f78 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/MultipleSingleton.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/MultipleSingleton.java @@ -10,17 +10,16 @@ *******************************************************************************/ 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.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.IProfile; -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.engine.IProfile; +import org.eclipse.equinox.p2.engine.ProvisioningPlan; +import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; public class MultipleSingleton extends AbstractProvisioningTest { @@ -35,32 +34,32 @@ public class MultipleSingleton extends AbstractProvisioningTest { protected void setUp() throws Exception { super.setUp(); - a1 = createIU("A", new Version("1.0.0"), true); + a1 = createIU("A", Version.create("1.0.0"), true); - a2 = createIU("A", new Version("2.0.0"), true); + a2 = createIU("A", Version.create("2.0.0"), true); - a3 = createIU("A", new Version("3.0.0"), false); + a3 = createIU("A", Version.create("3.0.0"), false); - a4 = createIU("A", new Version("4.0.0"), false); + a4 = createIU("A", Version.create("4.0.0"), false); - x = createIU("X", new Version(2, 0, 0), createRequiredCapabilities(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 4.1.0)"), null)); + x = createIU("X", Version.createOSGi(2, 0, 0), createRequiredCapabilities(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 4.1.0)"))); IRequiredCapability c1 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 1.0.0]"), null, false, false); IRequiredCapability c2 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[2.0.0, 2.0.0]"), null, false, false); - y = createIU("Y", new Version(2, 0, 0), new IRequiredCapability[] {c1, c2}); + y = createIU("Y", Version.createOSGi(2, 0, 0), new IRequiredCapability[] {c1, c2}); IRequiredCapability c3 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[3.0.0, 3.0.0]"), null, false, false); IRequiredCapability c4 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[4.0.0, 4.0.0]"), null, false, false); - z = createIU("Z", new Version(2, 0, 0), new IRequiredCapability[] {c3, c4}); + z = createIU("Z", Version.createOSGi(2, 0, 0), new IRequiredCapability[] {c3, c4}); IRequiredCapability c5 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 1.0.0]"), null, false, false); IRequiredCapability c6 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[3.0.0, 3.0.0]"), null, false, false); - w = createIU("W", new Version(2, 0, 0), new IRequiredCapability[] {c5, c6}); + w = createIU("W", Version.createOSGi(2, 0, 0), new IRequiredCapability[] {c5, c6}); IRequiredCapability c7 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 2.0.0]"), null, false, false); IRequiredCapability c8 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[3.0.0, 4.0.0]"), null, false, false); - v = createIU("V", new Version(2, 0, 0), new IRequiredCapability[] {c7}); - u = createIU("U", new Version(2, 0, 0), new IRequiredCapability[] {c8}); + v = createIU("V", Version.createOSGi(2, 0, 0), new IRequiredCapability[] {c7}); + u = createIU("U", Version.createOSGi(2, 0, 0), new IRequiredCapability[] {c8}); createTestMetdataRepository(new IInstallableUnit[] {a1, a2, a3, a4, w, x, y, z}); @@ -72,8 +71,8 @@ public class MultipleSingleton extends AbstractProvisioningTest { public void test1() { ProfileChangeRequest req = new ProfileChangeRequest(profile); req.addInstallableUnits(new IInstallableUnit[] {x}); - ProvisioningPlan plan = planner.getProvisioningPlan(req, null, null); - assertEquals(1, plan.getCompleteState().query(new InstallableUnitQuery("X"), new Collector(), null).size()); + ProvisioningPlan plan = (ProvisioningPlan) planner.getProvisioningPlan(req, null, null); + assertEquals(1, queryResultSize(plan.getCompleteState().query(new InstallableUnitQuery("X"), null))); assertEquals(IStatus.OK, plan.getStatus().getSeverity()); } @@ -87,14 +86,15 @@ public class MultipleSingleton extends AbstractProvisioningTest { public void testExplanation2() { ProfileChangeRequest req = new ProfileChangeRequest(profile); req.addInstallableUnits(new IInstallableUnit[] {y}); - ProvisioningPlan plan = planner.getProvisioningPlan(req, null, null); + ProvisioningPlan plan = (ProvisioningPlan) planner.getProvisioningPlan(req, null, null); assertEquals(IStatus.ERROR, plan.getStatus().getSeverity()); - Set explanation = plan.getRequestStatus().getExplanations(); + final RequestStatus requestStatus = (RequestStatus) plan.getRequestStatus(); + Set explanation = requestStatus.getExplanations(); // System.out.println(explanation); assertFalse(explanation.isEmpty()); - assertEquals(Explanation.VIOLATED_SINGLETON_CONSTRAINT, plan.getRequestStatus().getShortExplanation()); - assertTrue(plan.getRequestStatus().getConflictsWithInstalledRoots().contains(y)); - assertEquals(1, plan.getRequestStatus().getConflictsWithInstalledRoots().size()); + assertEquals(Explanation.VIOLATED_SINGLETON_CONSTRAINT, requestStatus.getShortExplanation()); + assertTrue(requestStatus.getConflictsWithInstalledRoots().contains(y)); + assertEquals(1, requestStatus.getConflictsWithInstalledRoots().size()); } @@ -115,13 +115,14 @@ public class MultipleSingleton extends AbstractProvisioningTest { public void testExplanation4() { ProfileChangeRequest req = new ProfileChangeRequest(profile); req.addInstallableUnits(new IInstallableUnit[] {w}); - ProvisioningPlan plan = planner.getProvisioningPlan(req, null, null); + ProvisioningPlan plan = (ProvisioningPlan) planner.getProvisioningPlan(req, null, null); assertEquals(IStatus.ERROR, plan.getStatus().getSeverity()); - Set explanation = plan.getRequestStatus().getExplanations(); + final RequestStatus requestStatus = (RequestStatus) plan.getRequestStatus(); + Set explanation = requestStatus.getExplanations(); // System.out.println(explanation); assertFalse(explanation.isEmpty()); - assertEquals(Explanation.VIOLATED_SINGLETON_CONSTRAINT, plan.getRequestStatus().getShortExplanation()); - assertTrue(plan.getRequestStatus().getConflictsWithInstalledRoots().contains(w)); + assertEquals(Explanation.VIOLATED_SINGLETON_CONSTRAINT, requestStatus.getShortExplanation()); + assertTrue(requestStatus.getConflictsWithInstalledRoots().contains(w)); } @@ -149,13 +150,14 @@ public class MultipleSingleton extends AbstractProvisioningTest { public void testExplanation5() { ProfileChangeRequest req = new ProfileChangeRequest(profile); req.addInstallableUnits(new IInstallableUnit[] {u, v}); - ProvisioningPlan plan = planner.getProvisioningPlan(req, null, null); + ProvisioningPlan plan = (ProvisioningPlan) planner.getProvisioningPlan(req, null, null); assertEquals(IStatus.ERROR, plan.getStatus().getSeverity()); - Set explanation = plan.getRequestStatus().getExplanations(); + final RequestStatus requestStatus = (RequestStatus) plan.getRequestStatus(); + Set explanation = requestStatus.getExplanations(); assertFalse(explanation.isEmpty()); - assertEquals(Explanation.VIOLATED_SINGLETON_CONSTRAINT, plan.getRequestStatus().getShortExplanation()); - assertTrue(plan.getRequestStatus().getConflictsWithInstalledRoots().contains(u)); - assertTrue(plan.getRequestStatus().getConflictsWithInstalledRoots().contains(v)); + assertEquals(Explanation.VIOLATED_SINGLETON_CONSTRAINT, requestStatus.getShortExplanation()); + assertTrue(requestStatus.getConflictsWithInstalledRoots().contains(u)); + assertTrue(requestStatus.getConflictsWithInstalledRoots().contains(v)); // System.out.println(explanation); } |