Bug 302183 - [operations] ProvisioningSession is weirdv20100307-1300

3 files changed, 15 insertions, 19 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/AbstractProvisioningUITest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/AbstractProvisioningUITest.java
index 0cdf00266..0a8cdf778 100644
--- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/AbstractProvisioningUITest.java
+++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/AbstractProvisioningUITest.java
@@ -10,11 +10,6 @@
  *******************************************************************************/
 package org.eclipse.equinox.p2.tests.ui;
 
-import org.eclipse.equinox.p2.engine.PhaseSetFactory;
-
-import org.eclipse.equinox.p2.metadata.MetadataFactory;
-import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;
-
 import java.io.File;
 import java.net.URI;
 import java.util.Dictionary;
@@ -27,6 +22,7 @@ import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest
 import org.eclipse.equinox.p2.core.ProvisionException;
 import org.eclipse.equinox.p2.engine.*;
 import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;
 import org.eclipse.equinox.p2.operations.*;
 import org.eclipse.equinox.p2.repository.IRepositoryManager;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager;
@@ -143,7 +139,7 @@ public abstract class AbstractProvisioningUITest extends AbstractProvisioningTes
 			req.setInstallableUnitProfileProperty(iu, IProfile.PROP_PROFILE_LOCKED_IU, new Integer(IProfile.LOCK_UNINSTALL | IProfile.LOCK_UPDATE).toString());
 		}
 		// Use an empty provisioning context to prevent repo access
-		IProvisioningPlan plan = getSession().getPlanner().getProvisioningPlan(req, new ProvisioningContext(new URI[] {}), getMonitor());
+		IProvisioningPlan plan = getPlanner(getSession().getProvisioningAgent()).getProvisioningPlan(req, new ProvisioningContext(new URI[] {}), getMonitor());
 		if (plan.getStatus().getSeverity() == IStatus.ERROR || plan.getStatus().getSeverity() == IStatus.CANCEL)
 			return plan.getStatus();
 		return getSession().performProvisioningPlan(plan, PhaseSetFactory.createDefaultPhaseSet(), new ProvisioningContext(), getMonitor());
diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/ElementUtilsTest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/ElementUtilsTest.java
index f895ccd5e..9c021e5ab 100644
--- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/ElementUtilsTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/ElementUtilsTest.java
@@ -63,7 +63,7 @@ public class ElementUtilsTest extends ProfileModificationActionTest {
 		// Two visible repos, one is added, the other is not
 		URI known1 = new URI("http://example.com/known1");
 		URI known2 = new URI("http://example.com/known2");
-		IMetadataRepositoryManager manager = session.getMetadataRepositoryManager();
+		IMetadataRepositoryManager manager = getMetadataRepositoryManager();
 		manager.addRepository(known1);
 
 		// Add system repos that should not be known or affected by ElementUtils
@@ -73,10 +73,10 @@ public class ElementUtilsTest extends ProfileModificationActionTest {
 		manager.addRepository(uri);
 		manager.setRepositoryProperty(uri, IRepository.PROP_SYSTEM, Boolean.toString(true));
 		manager.addRepository(uri2);
-		session.getArtifactRepositoryManager().addRepository(uri2);
+		getArtifactRepositoryManager().addRepository(uri2);
 		manager.setRepositoryProperty(uri2, IRepository.PROP_SYSTEM, Boolean.toString(true));
 		manager.setEnabled(uri2, false);
-		session.getArtifactRepositoryManager().setEnabled(uri2, false);
+		getArtifactRepositoryManager().setEnabled(uri2, false);
 
 		List children = new ArrayList();
 		children.add(new MetadataRepositoryElement(null, known1, true));
@@ -140,8 +140,8 @@ public class ElementUtilsTest extends ProfileModificationActionTest {
 				display.sleep();
 		}
 
-		URI[] enabled = session.getMetadataRepositoryManager().getKnownRepositories(IRepositoryManager.REPOSITORIES_ALL);
-		URI[] disabled = session.getMetadataRepositoryManager().getKnownRepositories(IRepositoryManager.REPOSITORIES_DISABLED);
+		URI[] enabled = getMetadataRepositoryManager().getKnownRepositories(IRepositoryManager.REPOSITORIES_ALL);
+		URI[] disabled = getMetadataRepositoryManager().getKnownRepositories(IRepositoryManager.REPOSITORIES_DISABLED);
 
 		boolean foundKnown1 = false;
 		boolean foundKnown2 = false;
@@ -184,7 +184,7 @@ public class ElementUtilsTest extends ProfileModificationActionTest {
 		manager.removeRepository(known2);
 		manager.removeRepository(uri);
 		manager.removeRepository(uri2);
-		session.getArtifactRepositoryManager().removeRepository(uri2);
+		getArtifactRepositoryManager().removeRepository(uri2);
 		manager.removeRepository(uri3);
 	}
 }
diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/operations/SizingTest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/operations/SizingTest.java
index a740e891e..efefd7c00 100644
--- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/operations/SizingTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/operations/SizingTest.java
@@ -10,10 +10,10 @@
  *******************************************************************************/
 package org.eclipse.equinox.p2.tests.ui.operations;
 
+import org.eclipse.equinox.internal.p2.ui.ProvUI;
 import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;
 import org.eclipse.equinox.p2.engine.*;
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-import org.eclipse.equinox.p2.operations.ProvisioningSession;
 import org.eclipse.equinox.p2.tests.ui.AbstractProvisioningUITest;
 
 /**
@@ -25,9 +25,9 @@ public class SizingTest extends AbstractProvisioningUITest {
 		IProfile testProfile = createProfile(profileId);
 		ProfileChangeRequest request = new ProfileChangeRequest(testProfile);
 		IProvisioningPlan plan = null;
-		plan = getSession().getPlanner().getProvisioningPlan(request, new ProvisioningContext(), getMonitor());
-		long size = ProvisioningSession.SIZE_NOTAPPLICABLE;
-		size = getSession().getSize(plan, new ProvisioningContext(), getMonitor());
+		plan = getPlanner(getSession().getProvisioningAgent()).getProvisioningPlan(request, new ProvisioningContext(), getMonitor());
+		long size = ProvUI.SIZE_NOTAPPLICABLE;
+		size = ProvUI.getSize(getEngine(), plan, new ProvisioningContext(), getMonitor());
 		assertEquals("1.0", 0, size);
 	}
 
@@ -41,9 +41,9 @@ public class SizingTest extends AbstractProvisioningUITest {
 		ProfileChangeRequest request = new ProfileChangeRequest(testProfile);
 		request.add(f1);
 		IProvisioningPlan plan = null;
-		plan = getSession().getPlanner().getProvisioningPlan(request, new ProvisioningContext(), getMonitor());
-		long size = ProvisioningSession.SIZE_NOTAPPLICABLE;
-		size = getSession().getSize(plan, new ProvisioningContext(), getMonitor());
+		plan = getPlanner(getSession().getProvisioningAgent()).getProvisioningPlan(request, new ProvisioningContext(), getMonitor());
+		long size = ProvUI.SIZE_NOTAPPLICABLE;
+		size = ProvUI.getSize(getEngine(), plan, new ProvisioningContext(), getMonitor());
 		assertEquals("1.0", 0, size);
 	}
 }