Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/AddProgramArgumentActionTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/AddProgramArgumentActionTest.java')
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/AddProgramArgumentActionTest.java35
1 files changed, 20 insertions, 15 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/AddProgramArgumentActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/AddProgramArgumentActionTest.java
index 3653f7553..e3d0d6465 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/AddProgramArgumentActionTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/AddProgramArgumentActionTest.java
@@ -17,13 +17,13 @@ import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.AddProgramArgumentAction;
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IFileArtifactRepository;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
-import org.eclipse.equinox.internal.provisional.p2.engine.InstallableUnitOperand;
-import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
-import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.engine.IProfile;
+import org.eclipse.equinox.p2.engine.InstallableUnitOperand;
+import org.eclipse.equinox.p2.metadata.IArtifactKey;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
+import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
+import org.eclipse.equinox.p2.repository.artifact.IFileArtifactRepository;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.eclipse.equinox.spi.p2.publisher.PublisherHelper;
import org.eclipse.osgi.service.resolver.BundleDescription;
@@ -40,10 +40,11 @@ public class AddProgramArgumentActionTest extends AbstractProvisioningTest {
public void testExecuteUndo() {
Map parameters = new HashMap();
+ parameters.put(ActionConstants.PARM_AGENT, getAgent());
EclipseTouchpoint touchpoint = new EclipseTouchpoint();
Properties profileProperties = new Properties();
profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, getTempFolder().toString());
- IProfile profile = createProfile("test", null, profileProperties);
+ IProfile profile = createProfile("test", profileProperties);
InstallableUnitOperand operand = new InstallableUnitOperand(null, createIU("test"));
touchpoint.initializePhase(null, profile, "test", parameters);
parameters.put("iu", operand.second());
@@ -68,9 +69,9 @@ public class AddProgramArgumentActionTest extends AbstractProvisioningTest {
File installFolder = getTempFolder();
profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, installFolder.toString());
profileProperties.setProperty(IProfile.PROP_CACHE, installFolder.toString());
- IProfile profile = createProfile("test", null, profileProperties);
+ IProfile profile = createProfile("test", profileProperties);
- IFileArtifactRepository bundlePool = Util.getBundlePoolRepository(profile);
+ IFileArtifactRepository bundlePool = Util.getBundlePoolRepository(getAgent(), profile);
File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar");
File targetPlugins = new File(installFolder, "plugins");
assertTrue(targetPlugins.mkdir());
@@ -84,6 +85,7 @@ public class AddProgramArgumentActionTest extends AbstractProvisioningTest {
bundlePool.addDescriptor(descriptor);
Map parameters = new HashMap();
+ parameters.put(ActionConstants.PARM_AGENT, getAgent());
parameters.put(ActionConstants.PARM_PROFILE, profile);
EclipseTouchpoint touchpoint = new EclipseTouchpoint();
touchpoint.initializePhase(null, profile, "test", parameters);
@@ -120,9 +122,9 @@ public class AddProgramArgumentActionTest extends AbstractProvisioningTest {
File installFolder = getTempFolder();
profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, installFolder.toString());
profileProperties.setProperty(IProfile.PROP_CACHE, installFolder.toString());
- IProfile profile = createProfile("test", null, profileProperties);
+ IProfile profile = createProfile("test", profileProperties);
- IFileArtifactRepository bundlePool = Util.getBundlePoolRepository(profile);
+ IFileArtifactRepository bundlePool = Util.getBundlePoolRepository(getAgent(), profile);
File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar");
File targetPlugins = new File(installFolder, "plugins");
assertTrue(targetPlugins.mkdir());
@@ -136,6 +138,7 @@ public class AddProgramArgumentActionTest extends AbstractProvisioningTest {
bundlePool.addDescriptor(descriptor);
Map parameters = new HashMap();
+ parameters.put(ActionConstants.PARM_AGENT, getAgent());
parameters.put(ActionConstants.PARM_PROFILE, profile);
EclipseTouchpoint touchpoint = new EclipseTouchpoint();
touchpoint.initializePhase(null, profile, "test", parameters);
@@ -178,9 +181,9 @@ public class AddProgramArgumentActionTest extends AbstractProvisioningTest {
File installFolder = getTempFolder();
profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, installFolder.toString());
profileProperties.setProperty(IProfile.PROP_CACHE, installFolder.toString());
- IProfile profile = createProfile("test", null, profileProperties);
+ IProfile profile = createProfile("test", profileProperties);
- IFileArtifactRepository bundlePool = Util.getBundlePoolRepository(profile);
+ IFileArtifactRepository bundlePool = Util.getBundlePoolRepository(getAgent(), profile);
File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar");
File targetPlugins = new File(installFolder, "plugins");
assertTrue(targetPlugins.mkdir());
@@ -194,6 +197,7 @@ public class AddProgramArgumentActionTest extends AbstractProvisioningTest {
bundlePool.addDescriptor(descriptor);
Map parameters = new HashMap();
+ parameters.put(ActionConstants.PARM_AGENT, getAgent());
parameters.put(ActionConstants.PARM_PROFILE, profile);
EclipseTouchpoint touchpoint = new EclipseTouchpoint();
touchpoint.initializePhase(null, profile, "test", parameters);
@@ -230,9 +234,9 @@ public class AddProgramArgumentActionTest extends AbstractProvisioningTest {
File installFolder = getTempFolder();
profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, installFolder.toString());
profileProperties.setProperty(IProfile.PROP_CACHE, installFolder.toString());
- IProfile profile = createProfile("test", null, profileProperties);
+ IProfile profile = createProfile("test", profileProperties);
- IFileArtifactRepository bundlePool = Util.getBundlePoolRepository(profile);
+ IFileArtifactRepository bundlePool = Util.getBundlePoolRepository(getAgent(), profile);
File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar");
File targetPlugins = new File(installFolder, "plugins");
assertTrue(targetPlugins.mkdir());
@@ -246,6 +250,7 @@ public class AddProgramArgumentActionTest extends AbstractProvisioningTest {
bundlePool.addDescriptor(descriptor);
Map parameters = new HashMap();
+ parameters.put(ActionConstants.PARM_AGENT, getAgent());
parameters.put(ActionConstants.PARM_PROFILE, profile);
EclipseTouchpoint touchpoint = new EclipseTouchpoint();
touchpoint.initializePhase(null, profile, "test", parameters);

Back to the top