diff options
| author | Simon Kaegi | 2009-11-23 19:50:12 +0000 |
|---|---|---|
| committer | Simon Kaegi | 2009-11-23 19:50:12 +0000 |
| commit | 4a8bf666517b22e0a1ed0c8ecfd19e3aa536875a (patch) | |
| tree | 1e6cdb6b0b29586af0f0f2df8f6c27b508da3517 | |
| parent | ec8715b23e1f6a9446370850e8a1d1d8ea1a40de (diff) | |
| download | rt.equinox.p2-4a8bf666517b22e0a1ed0c8ecfd19e3aa536875a.tar.gz rt.equinox.p2-4a8bf666517b22e0a1ed0c8ecfd19e3aa536875a.tar.xz rt.equinox.p2-4a8bf666517b22e0a1ed0c8ecfd19e3aa536875a.zip | |
Bug 293344 [api][engine] review of the engine package
Removing profile parenting support and fixing up associated tests
48 files changed, 98 insertions, 452 deletions
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java index d9e84f64b..aaed5f47f 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java @@ -725,18 +725,6 @@ public class SimplePlanner implements IPlanner { return profile.getInstallableUnitProperty(iu, key); } - public Map getLocalProperties() { - return profile.getLocalProperties(); - } - - public String getLocalProperty(String key) { - return profile.getLocalProperty(key); - } - - public IProfile getParentProfile() { - return profile.getParentProfile(); - } - public String getProfileId() { return profile.getProfileId(); } @@ -749,22 +737,10 @@ public class SimplePlanner implements IPlanner { return profile.getProperty(key); } - public String[] getSubProfileIds() { - return profile.getSubProfileIds(); - } - public long getTimestamp() { return profile.getTimestamp(); } - public boolean hasSubProfiles() { - return profile.hasSubProfiles(); - } - - public boolean isRootProfile() { - return profile.isRootProfile(); - } - public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) { return profile.query(query, collector, monitor); } diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfileWriter.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfileWriter.java index 01d1d1e47..caceab9c6 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfileWriter.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfileWriter.java @@ -29,10 +29,7 @@ public class ProfileWriter extends MetadataWriter implements ProfileXMLConstants start(PROFILE_ELEMENT); attribute(ID_ATTRIBUTE, profile.getProfileId()); attribute(TIMESTAMP_ATTRIBUTE, Long.toString(profile.getTimestamp())); - IProfile parentProfile = profile.getParentProfile(); - if (parentProfile != null) - attribute(PARENT_ID_ATTRIBUTE, parentProfile.getProfileId()); - writeProperties(profile.getLocalProperties()); + writeProperties(profile.getProperties()); Collector collector = profile.query(InstallableUnitQuery.ANY, new Collector(), null); ArrayList ius = new ArrayList(collector.toCollection()); Collections.sort(ius, new Comparator() { diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java index de7a4e6ba..b74bf83ae 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java @@ -748,21 +748,7 @@ public class SimpleProfileRegistry implements IProfileRegistry { lock = new ProfileLock(this, new File(store, escape(profile.getProfileId()) + PROFILE_EXT)); profileLocks.put(profile.getProfileId(), lock); } - if (!lock.lock()) - return false; - - if (profile.getParentProfile() == null) - return true; - - boolean locked = false; - try { - locked = internalLockProfile(profile.getParentProfile()); - } finally { - // this check is done here to ensure we unlock even if a runtime exception is thrown - if (!locked) - lock.unlock(); - } - return locked; + return lock.lock(); } private boolean checkTimestamps(IProfile profile, IProfile internalProfile) { @@ -783,9 +769,6 @@ public class SimpleProfileRegistry implements IProfileRegistry { return false; } - if (profile.getParentProfile() != null) - return checkTimestamps(profile.getParentProfile(), internalProfile.getParentProfile()); - return true; } @@ -827,9 +810,6 @@ public class SimpleProfileRegistry implements IProfileRegistry { } private void internalUnlockProfile(IProfile profile) { - if (profile.getParentProfile() != null) - internalUnlockProfile(profile.getParentProfile()); - ProfileLock lock = (ProfileLock) profileLocks.get(profile.getProfileId()); lock.unlock(); } diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/IProfile.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/IProfile.java index fd0714572..b68b2bf2d 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/IProfile.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/IProfile.java @@ -112,46 +112,15 @@ public interface IProfile extends IQueryable { public String getProfileId(); - public IProfile getParentProfile(); - - /* - * A profile is a root profile if it is not a sub-profile - * of another profile. - */ - public boolean isRootProfile(); - - public boolean hasSubProfiles(); - - public String[] getSubProfileIds(); - /** * Get the stored value associated with the given key. - * If the profile is a sub-profile and there is no value - * locally associated with the key, then the chain - * of parent profiles will be traversed to get an associated - * value from the nearest ancestor. * - * <code>null</code> is return if none of this profile - * or its ancestors associates a value with the key. + * <code>null</code> is returned if this property is not present */ public String getProperty(String key); - /** - * Get the stored value associated with the given key in this profile. - * No traversal of the ancestor hierarchy is done for sub-profiles. - */ - public String getLocalProperty(String key); - public String getInstallableUnitProperty(IInstallableUnit iu, String key); - /** - * Get an <i>unmodifiable copy</i> of the local properties - * associated with the profile. - * - * @return an <i>unmodifiable copy</i> of the Profile properties. - */ - public Map getLocalProperties(); - public Map getProperties(); public Map getInstallableUnitProperties(IInstallableUnit iu); diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/IProfileRegistry.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/IProfileRegistry.java index 2b7cace00..792a3fb85 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/IProfileRegistry.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/IProfileRegistry.java @@ -82,18 +82,6 @@ public interface IProfileRegistry { IProfile addProfile(String id, Map properties) throws ProvisionException; /** - * Add the given profile to this profile registry. - * - * @param id the profile id - * @param properties the profile properties - * @param parentId the id of a parent profile - * - * @throws ProvisionException if a profile - * with the same id is already present in the registry or the parentId is not a registered Profile. - */ - IProfile addProfile(String id, Map properties, String parentId) throws ProvisionException; - - /** * Returns whether this profile registry contains a profile with the given id. * * @param profileId The id of the profile to search for diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java index e02297ade..ad8528d07 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java @@ -700,7 +700,7 @@ public abstract class AbstractProvisioningTest extends TestCase { * in the tearDown method. */ protected IProfile createProfile(String name) { - return createProfile(name, null, null); + return createProfile(name, null); } /** @@ -708,18 +708,14 @@ public abstract class AbstractProvisioningTest extends TestCase { * already exists. The returned profile will be removed automatically * in the tearDown method. */ - protected IProfile createProfile(String name, String parentId) { - return createProfile(name, parentId, null); - } - - protected IProfile createProfile(String name, String parentId, Map properties) { + protected IProfile createProfile(String name, Map properties) { //remove any existing profile with the same name IProfileRegistry profileRegistry = getProfileRegistry(); profileRegistry.removeProfile(name); profilesToRemove.add(name); //create and return a new profile try { - return profileRegistry.addProfile(name, properties, parentId); + return profileRegistry.addProfile(name, properties); } catch (ProvisionException e) { throw new IllegalArgumentException(e.getMessage()); } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/AutomatedDirectorTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/AutomatedDirectorTest.java index 64ee43cda..33ee9ce3d 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/AutomatedDirectorTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/AutomatedDirectorTest.java @@ -61,7 +61,7 @@ public class AutomatedDirectorTest extends AbstractProvisioningTest { //Install into a profile in which the filter is satisfied Map properties = new HashMap(); properties.put(IProfile.PROP_ENVIRONMENTS, "FilterKey=true"); - IProfile satisfied = createProfile("Satisfied." + getName(), null, properties); + IProfile satisfied = createProfile("Satisfied." + getName(), properties); ProfileChangeRequest request = new ProfileChangeRequest(satisfied); request.addInstallableUnits(toInstallArray); IStatus result = director.provision(request, null, null); @@ -145,7 +145,7 @@ public class AutomatedDirectorTest extends AbstractProvisioningTest { //try again with the filter satisfied Map properties = new HashMap(); properties.put(IProfile.PROP_ENVIRONMENTS, "osgi.os=blort"); - IProfile profile2 = createProfile("TestProfile2." + getName(), null, properties); + IProfile profile2 = createProfile("TestProfile2." + getName(), properties); request = new ProfileChangeRequest(profile2); request.addInstallableUnits(toInstallArray); result = director.provision(request, null, null); @@ -172,7 +172,7 @@ public class AutomatedDirectorTest extends AbstractProvisioningTest { //try again with the filter satisfied Map properties = new HashMap(); properties.put(IProfile.PROP_ENVIRONMENTS, "osgi.os=blort"); - IProfile profile2 = createProfile("TestProfile2." + getName(), null, properties); + IProfile profile2 = createProfile("TestProfile2." + getName(), properties); request = new ProfileChangeRequest(profile2); request.addInstallableUnits(toInstallArray); result = director.provision(request, null, null); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/EngineTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/EngineTest.java index 945abf3cf..05590fd50 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/EngineTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/EngineTest.java @@ -264,7 +264,7 @@ public class EngineTest extends AbstractProvisioningTest { Map properties = new HashMap(); properties.put(IProfile.PROP_INSTALL_FOLDER, testProvisioning.getAbsolutePath()); - IProfile profile = createProfile("testPerformSizing", null, properties); + IProfile profile = createProfile("testPerformSizing", properties); for (Iterator it = getInstallableUnits(profile); it.hasNext();) { PhaseSet phaseSet = new DefaultPhaseSet(); IInstallableUnit doomed = (IInstallableUnit) it.next(); @@ -285,7 +285,7 @@ public class EngineTest extends AbstractProvisioningTest { Map properties = new HashMap(); properties.put(IProfile.PROP_INSTALL_FOLDER, testProvisioning.getAbsolutePath()); - IProfile profile = createProfile("testPerformInstallOSGiFramework", null, properties); + IProfile profile = createProfile("testPerformInstallOSGiFramework", properties); for (Iterator it = getInstallableUnits(profile); it.hasNext();) { PhaseSet phaseSet = new DefaultPhaseSet(); IInstallableUnit doomed = (IInstallableUnit) it.next(); @@ -303,7 +303,7 @@ public class EngineTest extends AbstractProvisioningTest { Map properties = new HashMap(); properties.put(IProfile.PROP_INSTALL_FOLDER, testProvisioning.getAbsolutePath()); - IProfile profile = createProfile("testPerformInstallOSGiFramework", null, properties); + IProfile profile = createProfile("testPerformInstallOSGiFramework", properties); for (Iterator it = getInstallableUnits(profile); it.hasNext();) { PhaseSet phaseSet = new DefaultPhaseSet(); IInstallableUnit doomed = (IInstallableUnit) it.next(); @@ -322,7 +322,7 @@ public class EngineTest extends AbstractProvisioningTest { public void testPerformUpdateOSGiFramework() { Map properties = new HashMap(); properties.put(IProfile.PROP_INSTALL_FOLDER, testProvisioning.getAbsolutePath()); - IProfile profile = createProfile("testPerformUpdateOSGiFramework", null, properties); + IProfile profile = createProfile("testPerformUpdateOSGiFramework", properties); PhaseSet phaseSet = new DefaultPhaseSet(); IInstallableUnit iu33 = createOSGiIU("3.3"); @@ -346,7 +346,7 @@ public class EngineTest extends AbstractProvisioningTest { Map properties = new HashMap(); properties.put(IProfile.PROP_INSTALL_FOLDER, testProvisioning.getAbsolutePath()); - IProfile profile = createProfile("testPerformUninstallOSGiFramework", null, properties); + IProfile profile = createProfile("testPerformUninstallOSGiFramework", properties); PhaseSet phaseSet = new DefaultPhaseSet(); InstallableUnitOperand[] operands = new InstallableUnitOperand[] {new InstallableUnitOperand(createOSGiIU(), null)}; IStatus result = engine.perform(profile, phaseSet, operands, null, new NullProgressMonitor()); @@ -358,7 +358,7 @@ public class EngineTest extends AbstractProvisioningTest { Map properties = new HashMap(); properties.put(IProfile.PROP_INSTALL_FOLDER, testProvisioning.getAbsolutePath()); - IProfile profile = createProfile("testPerformRollback", null, properties); + IProfile profile = createProfile("testPerformRollback", properties); PhaseSet phaseSet = new DefaultPhaseSet(); Iterator ius = getInstallableUnits(profile); @@ -376,7 +376,7 @@ public class EngineTest extends AbstractProvisioningTest { Map properties = new HashMap(); properties.put(IProfile.PROP_INSTALL_FOLDER, testProvisioning.getAbsolutePath()); - IProfile profile = createProfile("testPerformRollback", null, properties); + IProfile profile = createProfile("testPerformRollback", properties); PhaseSet phaseSet = new DefaultPhaseSet(); Iterator ius = getInstallableUnits(profile); @@ -396,7 +396,7 @@ public class EngineTest extends AbstractProvisioningTest { Map properties = new HashMap(); properties.put(IProfile.PROP_INSTALL_FOLDER, testProvisioning.getAbsolutePath()); - IProfile profile = createProfile("testPerformMissingAction", null, properties); + IProfile profile = createProfile("testPerformMissingAction", properties); PhaseSet phaseSet = new DefaultPhaseSet(); Iterator ius = getInstallableUnits(profile); @@ -413,7 +413,7 @@ public class EngineTest extends AbstractProvisioningTest { Map properties = new HashMap(); properties.put(IProfile.PROP_INSTALL_FOLDER, testProvisioning.getAbsolutePath()); - IProfile profile = createProfile("testPerformRollbackOnError", null, properties); + IProfile profile = createProfile("testPerformRollbackOnError", properties); NPEPhase phase = new NPEPhase(); PhaseSet phaseSet = new TestPhaseSet(phase); @@ -432,7 +432,7 @@ public class EngineTest extends AbstractProvisioningTest { Map properties = new HashMap(); properties.put(IProfile.PROP_INSTALL_FOLDER, testProvisioning.getAbsolutePath()); - IProfile profile = createProfile("testPerformRollbackOnError", null, properties); + IProfile profile = createProfile("testPerformRollbackOnError", properties); ActionNPEPhase phase = new ActionNPEPhase(); PhaseSet phaseSet = new TestPhaseSet(phase); @@ -450,7 +450,7 @@ public class EngineTest extends AbstractProvisioningTest { public void testPerformForcedPhaseWithActionError() { Map properties = new HashMap(); properties.put(IProfile.PROP_INSTALL_FOLDER, testProvisioning.getAbsolutePath()); - IProfile profile = createProfile("testPerformForceWithActionError", null, properties); + IProfile profile = createProfile("testPerformForceWithActionError", properties); ActionNPEPhase phase = new ActionNPEPhase(true); PhaseSet phaseSet = new TestPhaseSet(phase); @@ -468,7 +468,7 @@ public class EngineTest extends AbstractProvisioningTest { public void testPerformForcedUninstallWithBadUninstallIUActionThrowsException() { Map properties = new HashMap(); properties.put(IProfile.PROP_INSTALL_FOLDER, testProvisioning.getAbsolutePath()); - IProfile profile = createProfile("testPerformForcedUninstallWithBadUninstallIUActionThrowsException", null, properties); + IProfile profile = createProfile("testPerformForcedUninstallWithBadUninstallIUActionThrowsException", properties); // forcedUninstall is false by default PhaseSet phaseSet = new DefaultPhaseSet(); @@ -500,7 +500,7 @@ public class EngineTest extends AbstractProvisioningTest { public void testPerformForcedUninstallWithBadUninstallIUActionReturnsError() { Map properties = new HashMap(); properties.put(IProfile.PROP_INSTALL_FOLDER, testProvisioning.getAbsolutePath()); - IProfile profile = createProfile("testPerformForcedUninstallWithBadUninstallIUActionReturnsError", null, properties); + IProfile profile = createProfile("testPerformForcedUninstallWithBadUninstallIUActionReturnsError", properties); // forcedUninstall is false by default PhaseSet phaseSet = new DefaultPhaseSet(); @@ -696,18 +696,6 @@ public class EngineTest extends AbstractProvisioningTest { return null; } - public Map getLocalProperties() { - return null; - } - - public String getLocalProperty(String key) { - return null; - } - - public IProfile getParentProfile() { - return null; - } - public String getProfileId() { return null; } @@ -720,22 +708,10 @@ public class EngineTest extends AbstractProvisioningTest { return null; } - public String[] getSubProfileIds() { - return null; - } - public long getTimestamp() { return 0; } - public boolean hasSubProfiles() { - return false; - } - - public boolean isRootProfile() { - return false; - } - public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) { return null; } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java index 3fa9b6359..6a95284d2 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java @@ -24,7 +24,6 @@ import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector; import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; import org.eclipse.equinox.p2.metadata.query.IQuery; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; -import org.eclipse.equinox.p2.tests.TestActivator; import org.osgi.framework.BundleContext; import org.xml.sax.*; @@ -154,184 +153,6 @@ public class ProfileTest extends AbstractProvisioningTest { assertNull(registry.getProfile(PROFILE_NAME)); } - public void testNestedProfileStructure() { - Properties properties = new Properties(); - properties.put("test", "test"); - IProfile parent = createProfile("parent", null, properties); - IProfile child = createProfile("child", "parent"); - parent = getProfile("parent"); - assertTrue(parent.hasSubProfiles()); - assertFalse(child.hasSubProfiles()); - assertNotNull(parent.getLocalProperty("test")); - assertNotNull(child.getProperty("test")); - assertNotNull(child.getProperties().get("test")); - assertNull(child.getLocalProperty("test")); - assertNull(child.getLocalProperties().get("test")); - - assertTrue("Parentless profile should be a root.", parent.isRootProfile()); - assertFalse("Child profile should not be a root.", child.isRootProfile()); - assertTrue("Parent should be parent of child", child.getParentProfile().getProfileId().equals(parent.getProfileId())); - assertTrue("Parent should have one child.", parent.getSubProfileIds().length == 1); - assertTrue("Child should have no children.", child.getSubProfileIds().length == 0); - - IProfile grandchild = createProfile("grand", "child"); - child = getProfile("child"); - assertFalse("Grandchild profile should not be a root.", grandchild.isRootProfile()); - assertTrue("Parent should have one child.", parent.getSubProfileIds().length == 1); - assertTrue("Child should have one child.", child.getSubProfileIds().length == 1); - assertTrue("Grandparent of grandchild should be parent of child.", grandchild.getParentProfile().getParentProfile().getProfileId().equals(parent.getProfileId())); - } - - /* The test profile has the following structure and properties where - * id{x,y} indicates a profile with id "id" and properties defined - * with keys "x" and "y" - * - * grandchild00{foo} - * / - * / - * child0{foo} | --- grandchild01{} - * / \ - * / \ - * / grandchild01{bar} - * parent{foo,bar} | - * \ grandchild10{foo} - * \ / - * child1{} | - * \ - * grandchild11{} - * - */ - private static String parentId = "parent"; - private static String child0Id = "child0"; - private static String grandchild00Id = "grand00"; - private static String grandchild01Id = "grand01"; - private static String grandchild02Id = "grand02"; - private static String child1Id = "child1"; - private static String grandchild10Id = "grand10"; - private static String grandchild11Id = "grand11"; - - private static String key = "org.eclipse.p2.foo"; - private static String parentValue = "parent"; - private static String child0Value = "child0"; - private static String grandchild00Value = "grandchild00"; - private static String grandchild02Value = "grandchild02"; - private static String grandchild10Value = "grandchild10"; - private static String otherKey = "org.eclipse.p2.bar"; - private static String otherValue = "other"; - - // Create the profiles and test get after set - // for associated properties. - private IProfile[] createTestProfiles() { - - Map properties = new HashMap(); - - properties.put(key, parentValue); - properties.put(otherKey, otherValue); - IProfile parent = createProfile(parentId, null, properties); - properties.clear(); - assertTrue(parentValue.equals(parent.getProperty(key))); - assertTrue(otherValue.equals(parent.getProperty(otherKey))); - - properties.put(key, child0Value); - IProfile child0 = createProfile(child0Id, parentId, properties); - properties.clear(); - assertTrue(child0Value.equals(child0.getProperty(key))); - - IProfile child1 = createProfile(child1Id, parentId, properties); - // no value in child1 - - properties.put(key, grandchild00Value); - IProfile grandchild00 = createProfile(grandchild00Id, child0Id, properties); - properties.clear(); - assertTrue(grandchild00Value.equals(grandchild00.getProperty(key))); - - IProfile grandchild01 = createProfile(grandchild01Id, child0Id); - // no value in grandchild01 - - properties.put(otherKey, grandchild02Value); - IProfile grandchild02 = createProfile(grandchild02Id, child0Id, properties); - properties.clear(); - assertTrue(grandchild02Value.equals(grandchild02.getProperty(otherKey))); - - properties.put(key, grandchild10Value); - IProfile grandchild10 = createProfile(grandchild10Id, child1Id, properties); - properties.clear(); - assertTrue(grandchild10Value.equals(grandchild10.getProperty(key))); - - IProfile grandchild11 = createProfile(grandchild11Id, child1Id); - // no value in grandchild11 - - parent = getProfile(parentId); - child0 = getProfile(child0Id); - child1 = getProfile(child1Id); - grandchild00 = getProfile(grandchild00Id); - grandchild01 = getProfile(grandchild01Id); - grandchild02 = getProfile(grandchild02Id); - grandchild10 = getProfile(grandchild10Id); - grandchild11 = getProfile(grandchild11Id); - - IProfile[] profiles = {parent, child0, child1, grandchild00, grandchild01, grandchild02, grandchild10, grandchild11}; - return profiles; - } - - public void testNestedProfileProperties() { - validateProfiles(createTestProfiles()); - } - - public void validateProfiles(IProfile[] profiles) { - IProfile parent = profiles[0]; - IProfile child0 = profiles[1]; - IProfile child1 = profiles[2]; - IProfile grandchild00 = profiles[3]; - IProfile grandchild01 = profiles[4]; - IProfile grandchild02 = profiles[5]; - IProfile grandchild10 = profiles[6]; - IProfile grandchild11 = profiles[7]; - - assertTrue(parentId.equals(parent.getProfileId())); - assertTrue("Profile should have 3 local properties", parent.getLocalProperties().size() == 2); - assertTrue(parentValue.equals(parent.getProperty(key))); - assertTrue(otherValue.equals(parent.getProperty(otherKey))); - assertTrue("Parent should have 2 children.", parent.getSubProfileIds().length == 2); - - assertTrue(child0Id.equals(child0.getProfileId())); - assertTrue("First Child should have 1 local properties.", child0.getLocalProperties().size() == 1); - assertTrue(child0Value.equals(child0.getProperty(key))); - assertTrue(otherValue.equals(child0.getProperty(otherKey))); - assertTrue("First Child should have 3 children.", child0.getSubProfileIds().length == 3); - - assertTrue(child1Id.equals(child1.getProfileId())); - assertTrue("Second Child should have 0 local properties.", child1.getLocalProperties().size() == 0); - assertTrue(parentValue.equals(child1.getProperty(key))); - assertTrue(otherValue.equals(child1.getProperty(otherKey))); - assertTrue("Second Child should have 2 children.", child1.getSubProfileIds().length == 2); - - assertTrue(grandchild00Id.equals(grandchild00.getProfileId())); - assertTrue("First Grandchild of first Child should have 1 property.", grandchild00.getLocalProperties().size() == 1); - assertTrue(grandchild00Value.equals(grandchild00.getProperty(key))); - assertTrue(otherValue.equals(grandchild00.getProperty(otherKey))); - - assertTrue(grandchild01Id.equals(grandchild01.getProfileId())); - assertTrue("Second Grandchild of first Child should have 0 properties.", grandchild01.getLocalProperties().size() == 0); - assertTrue(child0Value.equals(grandchild01.getProperty(key))); - assertTrue(otherValue.equals(grandchild01.getProperty(otherKey))); - - assertTrue(grandchild02Id.equals(grandchild02.getProfileId())); - assertTrue("Third Grandchild of first Child should have 1 property.", grandchild02.getLocalProperties().size() == 1); - assertTrue(child0Value.equals(grandchild02.getProperty(key))); - assertTrue(grandchild02Value.equals(grandchild02.getProperty(otherKey))); - - assertTrue(grandchild10Id.equals(grandchild10.getProfileId())); - assertTrue("First Grandchild of second Child should have 1 property.", grandchild10.getLocalProperties().size() == 1); - assertTrue(grandchild10Value.equals(grandchild10.getProperty(key))); - assertTrue(otherValue.equals(grandchild10.getProperty(otherKey))); - - assertTrue(grandchild11Id.equals(grandchild11.getProfileId())); - assertTrue("Second Grandchild of second Child should have 0 properties.", grandchild11.getLocalProperties().size() == 0); - assertTrue(parentValue.equals(grandchild11.getProperty(key))); - assertTrue(otherValue.equals(grandchild11.getProperty(otherKey))); - } - private static String PROFILE_TEST_TARGET = "profileTest"; private static Version PROFILE_TEST_VERSION = Version.create("0.0.1"); @@ -529,35 +350,4 @@ public class ProfileTest extends AbstractProvisioningTest { return result; } } - - public void testProfilePersistence() throws IOException { - IProfile[] testProfiles = createTestProfiles(); - ByteArrayOutputStream output0 = new ByteArrayOutputStream(1492); - ProfileStringWriter writer0 = new ProfileStringWriter(output0); - writer0.writeTest(testProfiles); - String profileText0 = output0.toString(); - output0.close(); - - ProfileStringParser parser = new ProfileStringParser(TestActivator.context, TestActivator.PI_PROV_TESTS); - parser.parse(profileText0); - assertTrue("Error parsing test profile: " + parser.getStatus().getMessage(), parser.getStatus().isOK()); - Map profileMap = (Map) parser.getRootObject(); - IProfile parent = (IProfile) profileMap.get(parentId); - IProfile child0 = (IProfile) profileMap.get(child0Id); - IProfile child1 = (IProfile) profileMap.get(child1Id); - IProfile grandchild00 = (IProfile) profileMap.get(grandchild00Id); - IProfile grandchild01 = (IProfile) profileMap.get(grandchild01Id); - IProfile grandchild02 = (IProfile) profileMap.get(grandchild02Id); - IProfile grandchild10 = (IProfile) profileMap.get(grandchild10Id); - IProfile grandchild11 = (IProfile) profileMap.get(grandchild11Id); - IProfile[] profiles = {parent, child0, child1, grandchild00, grandchild01, grandchild02, grandchild10, grandchild11}; - validateProfiles(profiles); - ByteArrayOutputStream output1 = new ByteArrayOutputStream(1492); - ProfileStringWriter writer = new ProfileStringWriter(output1); - - writer.writeTest(profiles); - String profileText1 = output1.toString(); - output1.close(); - assertTrue("Profile write after read after write produced different XML", profileText1.equals(profileText0)); - } } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/DirectorTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/DirectorTest.java index 5ea39186e..555a79808 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/DirectorTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/DirectorTest.java @@ -75,7 +75,7 @@ public class DirectorTest extends AbstractProvisioningTest { if (info != null) properties.put(IProfile.PROP_ENVIRONMENTS, "osgi.os=" + info.getOS() + ",osgi.ws=" + info.getWS() + ",osgi.arch=" + info.getOSArch()); - p = createProfile(installFolder, null, properties); + p = createProfile(installFolder, properties); } IInstallableUnit[] allRoots = new IInstallableUnit[1]; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest.java index 83aadc528..2375bb98e 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest.java @@ -77,7 +77,7 @@ public class End2EndTest extends AbstractProvisioningTest { properties.put(IProfile.PROP_ENVIRONMENTS, "osgi.os=" + info.getOS() + ",osgi.ws=" + info.getWS() + ",osgi.arch=" + info.getOSArch()); properties.put("org.eclipse.update.install.features", "true"); properties.put(IProfile.PROP_CACHE, installFolder); - return createProfile(profileId, null, properties); + return createProfile(profileId, properties); } public void testInstallSDK35() { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/RepoValidator.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/RepoValidator.java index 8ec83bf4a..1f3b519a8 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/RepoValidator.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/RepoValidator.java @@ -52,7 +52,7 @@ public class RepoValidator extends AbstractProvisioningTest { properties.put("osgi.os", "win32"); properties.put("osgi.ws", "win32"); properties.put("osgi.arch", "x86"); - IProfile p = createProfile("repoValidator", null, properties); + IProfile p = createProfile("repoValidator", properties); IQuery q; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AgentPlanTestInExternalInstance.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AgentPlanTestInExternalInstance.java index 1e119c16b..a1f78bd24 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AgentPlanTestInExternalInstance.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AgentPlanTestInExternalInstance.java @@ -8,18 +8,18 @@ ******************************************************************************/ package org.eclipse.equinox.p2.tests.planner; -import org.eclipse.equinox.p2.engine.IProvisioningPlan; - import java.lang.reflect.Field; import java.net.URI; import java.util.Properties; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.engine.SimpleProfileRegistry; -import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.director.IPlanner; +import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest; import org.eclipse.equinox.internal.provisional.p2.engine.*; 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.p2.engine.IProvisioningPlan; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; public class AgentPlanTestInExternalInstance extends AbstractProvisioningTest { @@ -41,7 +41,7 @@ public class AgentPlanTestInExternalInstance extends AbstractProvisioningTest { createProfile("agent"); Properties p = new Properties(); p.setProperty("org.eclipse.equinox.p2.planner.resolveMetaRequirements", "false"); - createProfile("installation", null, p); + createProfile("installation", p); } public void tearDown() throws Exception { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AgentPlanTestInExternalInstanceForCohostedMode.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AgentPlanTestInExternalInstanceForCohostedMode.java index 029f7cd81..11c37afe6 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AgentPlanTestInExternalInstanceForCohostedMode.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AgentPlanTestInExternalInstanceForCohostedMode.java @@ -8,18 +8,18 @@ ******************************************************************************/ package org.eclipse.equinox.p2.tests.planner; -import org.eclipse.equinox.p2.engine.IProvisioningPlan; - import java.lang.reflect.Field; import java.net.URI; import java.util.Properties; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.engine.SimpleProfileRegistry; -import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.director.IPlanner; +import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest; import org.eclipse.equinox.internal.provisional.p2.engine.*; 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.p2.engine.IProvisioningPlan; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; public class AgentPlanTestInExternalInstanceForCohostedMode extends AbstractProvisioningTest { @@ -41,7 +41,7 @@ public class AgentPlanTestInExternalInstanceForCohostedMode extends AbstractProv createProfile("agent"); Properties p = new Properties(); p.setProperty("org.eclipse.equinox.p2.planner.resolveMetaRequirements", "true"); - createProfile("installation", null, p); + createProfile("installation", p); } public void tearDown() throws Exception { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/SimulatedSharedInstallTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/SimulatedSharedInstallTest.java index 6644f3d9d..324466114 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/SimulatedSharedInstallTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/SimulatedSharedInstallTest.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.planner; -import org.eclipse.equinox.p2.engine.IProvisioningPlan; - import java.net.URI; import java.util.*; import org.eclipse.core.runtime.*; @@ -20,6 +18,7 @@ import org.eclipse.equinox.internal.provisional.p2.engine.*; 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.p2.engine.IProvisioningPlan; import org.eclipse.equinox.p2.metadata.query.IQuery; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; @@ -78,18 +77,6 @@ public class SimulatedSharedInstallTest extends AbstractProvisioningTest { return profile.getInstallableUnitProperty(iu, key); } - public Map getLocalProperties() { - return profile.getLocalProperties(); - } - - public String getLocalProperty(String key) { - return profile.getLocalProperty(key); - } - - public IProfile getParentProfile() { - return profile.getParentProfile(); - } - public String getProfileId() { return profile.getProfileId(); } @@ -102,22 +89,10 @@ public class SimulatedSharedInstallTest extends AbstractProvisioningTest { return profile.getProperty(key); } - public String[] getSubProfileIds() { - return profile.getSubProfileIds(); - } - public long getTimestamp() { return profile.getTimestamp(); } - public boolean hasSubProfiles() { - return profile.hasSubProfiles(); - } - - public boolean isRootProfile() { - return profile.isRootProfile(); - } - public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) { return profile.query(query, collector, monitor); } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/AddJVMArgumentActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/AddJVMArgumentActionTest.java index 4b620deaa..11e07a923 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/AddJVMArgumentActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/AddJVMArgumentActionTest.java @@ -42,7 +42,7 @@ public class AddJVMArgumentActionTest extends AbstractProvisioningTest { 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()); 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..bb7211d7a 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 @@ -43,7 +43,7 @@ public class AddProgramArgumentActionTest extends AbstractProvisioningTest { 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,7 +68,7 @@ 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar"); @@ -120,7 +120,7 @@ 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar"); @@ -178,7 +178,7 @@ 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar"); @@ -230,7 +230,7 @@ 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/AddSourceBundleActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/AddSourceBundleActionTest.java index 45915d137..f04bdd954 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/AddSourceBundleActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/AddSourceBundleActionTest.java @@ -44,7 +44,7 @@ public class AddSourceBundleActionTest 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi.source_3.4.2.R34x_v20080826-1230.jar"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/CheckTrustActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/CheckTrustActionTest.java index 2047afed0..1463ddab7 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/CheckTrustActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/CheckTrustActionTest.java @@ -43,7 +43,7 @@ public class CheckTrustActionTest 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/ChmodActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/ChmodActionTest.java index 2674d9c46..b1d0b12e3 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/ChmodActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/ChmodActionTest.java @@ -43,7 +43,7 @@ public class ChmodActionTest extends AbstractProvisioningTest { Properties profileProperties = new Properties(); File installFolder = getTempFolder(); profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, installFolder.toString()); - IProfile profile = createProfile("testExecuteUndo", null, profileProperties); + IProfile profile = createProfile("testExecuteUndo", profileProperties); File zipSource = getTestData("1.0", "/testData/nativeTouchpoint/a.zip"); File zipTarget = new File(installFolder, "a.zip"); @@ -108,7 +108,7 @@ public class ChmodActionTest 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); File dirBundleSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/directoryBased_1.0.0"); @@ -185,7 +185,7 @@ public class ChmodActionTest 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); File dirBundleSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/directoryBased_1.0.0"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/CollectActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/CollectActionTest.java index 46ff1201b..68bac71ac 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/CollectActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/CollectActionTest.java @@ -41,7 +41,7 @@ public class CollectActionTest 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); // still want side-effect Util.getBundlePoolRepository(profile); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/EclipseTouchpointTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/EclipseTouchpointTest.java index b46a0fb97..c44133786 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/EclipseTouchpointTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/EclipseTouchpointTest.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.touchpoint.eclipse; -import org.eclipse.equinox.p2.engine.IProvisioningPlan; - import java.io.File; import java.net.*; import java.util.*; @@ -21,13 +19,15 @@ import org.eclipse.equinox.internal.p2.touchpoint.eclipse.*; 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.core.ProvisionException; -import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.director.IPlanner; +import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest; import org.eclipse.equinox.internal.provisional.p2.engine.*; import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; 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.repository.IMetadataRepository; +import org.eclipse.equinox.p2.engine.IProvisioningPlan; import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; @@ -98,7 +98,7 @@ public class EclipseTouchpointTest extends AbstractProvisioningTest { URL location = site.toURL(); properties.put("org.eclipse.equinox.p2.cache.extensions", location.toString() + "|" + spacesLocation.toString()); - IProfile profile = createProfile("testBug262073", null, properties); + IProfile profile = createProfile("testBug262073", properties); AggregatedBundleRepository repo = (AggregatedBundleRepository) Util.getAggregatedBundleRepository(profile); Collection repos = repo.testGetBundleRepositories(); assertEquals("1.0", 3, repos.size()); @@ -120,7 +120,7 @@ public class EclipseTouchpointTest 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar"); @@ -158,7 +158,7 @@ public class EclipseTouchpointTest 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar"); @@ -215,7 +215,7 @@ public class EclipseTouchpointTest extends AbstractProvisioningTest { Properties profileProperties = new Properties(); 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); URI site = getTestData("0.1", "/testData/updatesite/site").toURI(); getMetadataRepositoryManager().addRepository(site); @@ -224,7 +224,7 @@ public class EclipseTouchpointTest extends AbstractProvisioningTest { IMetadataRepository repo = getMetadataRepositoryManager().loadRepository(site, getMonitor()); IInstallableUnit iu = (IInstallableUnit) repo.query(new InstallableUnitQuery("test.bundle"), new Collector(), getMonitor()).iterator().next(); assertNotNull(iu); - profile = createProfile("test", null, profileProperties); + profile = createProfile("test", profileProperties); ProfileChangeRequest request = new ProfileChangeRequest(profile); final IInstallableUnit[] newIUs = new IInstallableUnit[] {iu}; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/InstallBundleActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/InstallBundleActionTest.java index 4feb061ce..98b4b1a18 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/InstallBundleActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/InstallBundleActionTest.java @@ -45,7 +45,7 @@ public class InstallBundleActionTest 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/InstallFeatureActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/InstallFeatureActionTest.java index 292d7e681..9c3690701 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/InstallFeatureActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/InstallFeatureActionTest.java @@ -44,7 +44,7 @@ public class InstallFeatureActionTest 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); File featureSource = getTestData("1.0", "/testData/eclipseTouchpoint/features/org.eclipse.rcp_3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"); @@ -94,7 +94,7 @@ public class InstallFeatureActionTest extends AbstractProvisioningTest { File installFolder = new File(getTempFolder(), "with space"); 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); File featureSource = getTestData("1.0", "/testData/eclipseTouchpoint/features/org.eclipse.rcp_3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/JVMArgumentActionLogicTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/JVMArgumentActionLogicTest.java index 0128758d4..25a3e762f 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/JVMArgumentActionLogicTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/JVMArgumentActionLogicTest.java @@ -36,7 +36,7 @@ public class JVMArgumentActionLogicTest extends AbstractProvisioningTest { 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()); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/LinkActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/LinkActionTest.java index a500d0949..5988c8439 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/LinkActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/LinkActionTest.java @@ -41,7 +41,7 @@ public class LinkActionTest extends AbstractProvisioningTest { Properties profileProperties = new Properties(); File installFolder = getTempFolder(); profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, installFolder.toString()); - IProfile profile = createProfile("test", null, profileProperties); + IProfile profile = createProfile("test", profileProperties); File zipSource = getTestData("1.0", "/testData/nativeTouchpoint/a.zip"); File zipTarget = new File(installFolder, "a.zip"); @@ -71,7 +71,7 @@ public class LinkActionTest 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); File dirBundleSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/directoryBased_1.0.0"); @@ -115,7 +115,7 @@ public class LinkActionTest 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); File dirBundleSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/directoryBased_1.0.0"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/MarkStartedActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/MarkStartedActionTest.java index 3e9393493..d7c1060f2 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/MarkStartedActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/MarkStartedActionTest.java @@ -45,7 +45,7 @@ public class MarkStartedActionTest 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar"); @@ -90,7 +90,7 @@ public class MarkStartedActionTest 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar"); @@ -138,7 +138,7 @@ public class MarkStartedActionTest 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi.fragment_1.0.0.jar"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/RemoveJVMArgumentActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/RemoveJVMArgumentActionTest.java index b6fc1813d..fa397178d 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/RemoveJVMArgumentActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/RemoveJVMArgumentActionTest.java @@ -32,7 +32,7 @@ public class RemoveJVMArgumentActionTest extends AbstractProvisioningTest { 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()); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/RemoveProgramArgumentActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/RemoveProgramArgumentActionTest.java index 61fe448be..c7d5bd6a8 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/RemoveProgramArgumentActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/RemoveProgramArgumentActionTest.java @@ -43,7 +43,7 @@ public class RemoveProgramArgumentActionTest extends AbstractProvisioningTest { 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()); @@ -70,7 +70,7 @@ public class RemoveProgramArgumentActionTest 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar"); @@ -119,13 +119,13 @@ public class RemoveProgramArgumentActionTest extends AbstractProvisioningTest { keyAction.undo(keyParameters); assertTrue(Arrays.asList(manipulator.getLauncherData().getProgramArgs()).contains(resolvedArtifact)); } - + public void testExecuteUndoWithArtifactLocation() { Properties profileProperties = new Properties(); 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/RemoveSourceBundleActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/RemoveSourceBundleActionTest.java index c21322a94..f3461ebff 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/RemoveSourceBundleActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/RemoveSourceBundleActionTest.java @@ -44,7 +44,7 @@ public class RemoveSourceBundleActionTest 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi.source_3.4.2.R34x_v20080826-1230.jar"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetFrameworkDependentPropertyActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetFrameworkDependentPropertyActionTest.java index bb6413cc4..cff1f6cfe 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetFrameworkDependentPropertyActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetFrameworkDependentPropertyActionTest.java @@ -34,7 +34,7 @@ public class SetFrameworkDependentPropertyActionTest extends AbstractProvisionin 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()); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetFrameworkIndependentPropertyActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetFrameworkIndependentPropertyActionTest.java index 0e6035650..7481e19c3 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetFrameworkIndependentPropertyActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetFrameworkIndependentPropertyActionTest.java @@ -34,7 +34,7 @@ public class SetFrameworkIndependentPropertyActionTest extends AbstractProvision 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()); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetLauncherNameActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetLauncherNameActionTest.java index e441465cb..451f12629 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetLauncherNameActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetLauncherNameActionTest.java @@ -34,7 +34,7 @@ public class SetLauncherNameActionTest extends AbstractProvisioningTest { 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(ActionConstants.PARM_PROFILE, profile); @@ -63,7 +63,7 @@ public class SetLauncherNameActionTest extends AbstractProvisioningTest { Properties profileProperties = new Properties(); profileProperties.put(IProfile.PROP_INSTALL_FOLDER, tempFolder.toString()); profileProperties.put(IProfile.PROP_ENVIRONMENTS, "osgi.ws=cocoa,osgi.os=macosx,osgi.arch=x86"); - IProfile profile = createProfile("launcherNameProfile", null, profileProperties); + IProfile profile = createProfile("launcherNameProfile", profileProperties); InstallableUnitOperand operand = new InstallableUnitOperand(null, createIU("test")); touchpoint.initializePhase(null, profile, "test", parameters); @@ -87,7 +87,7 @@ public class SetLauncherNameActionTest extends AbstractProvisioningTest { Properties profileProperties = new Properties(); profileProperties.put(IProfile.PROP_INSTALL_FOLDER, tempFolder.toString()); profileProperties.put(IProfile.PROP_ENVIRONMENTS, "osgi.ws=win32,osgi.os=win32,osgi.arch=x86"); - IProfile profile = createProfile("changeNameProfile", null, profileProperties); + IProfile profile = createProfile("changeNameProfile", profileProperties); //profile will start using "eclipse" by default, give it some content and see if it //survives a name change. diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetProgramPropertyActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetProgramPropertyActionTest.java index d8fe777ea..284220306 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetProgramPropertyActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetProgramPropertyActionTest.java @@ -43,7 +43,7 @@ public class SetProgramPropertyActionTest extends AbstractProvisioningTest { 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()); @@ -70,7 +70,7 @@ public class SetProgramPropertyActionTest 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar"); @@ -126,7 +126,7 @@ public class SetProgramPropertyActionTest 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetStartLevelActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetStartLevelActionTest.java index af5b7f8f5..ebc83a8d1 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetStartLevelActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetStartLevelActionTest.java @@ -45,7 +45,7 @@ public class SetStartLevelActionTest 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar"); @@ -90,7 +90,7 @@ public class SetStartLevelActionTest 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar"); @@ -138,7 +138,7 @@ public class SetStartLevelActionTest 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi.fragment_1.0.0.jar"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UninstallBundleActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UninstallBundleActionTest.java index 0f1dca7d1..2b677b135 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UninstallBundleActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UninstallBundleActionTest.java @@ -45,7 +45,7 @@ public class UninstallBundleActionTest 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); File osgiSource = getTestData("1.0", "/testData/eclipseTouchpoint/bundles/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UninstallFeatureActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UninstallFeatureActionTest.java index d74da6553..d6f0078bc 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UninstallFeatureActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UninstallFeatureActionTest.java @@ -48,7 +48,7 @@ public class UninstallFeatureActionTest 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); File featureSource = getTestData("1.0", "/testData/eclipseTouchpoint/features/org.eclipse.rcp_3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UtilTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UtilTest.java index 4e9f35eb8..7326acd35 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UtilTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UtilTest.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.touchpoint.eclipse; -import org.eclipse.equinox.p2.core.IAgentLocation; - import java.io.File; import java.net.MalformedURLException; import java.util.Collections; @@ -24,6 +22,7 @@ import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util; import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData; import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory; +import org.eclipse.equinox.p2.core.IAgentLocation; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; /** @@ -54,7 +53,7 @@ public class UtilTest extends AbstractProvisioningTest { Properties props = new Properties(); File cacheDir = new File(System.getProperty("java.io.tmpdir"), "cache"); props.put(IProfile.PROP_CACHE, cacheDir.toString()); - IProfile profile = createProfile("test", null, props); + IProfile profile = createProfile("test", props); assertEquals(cacheDir.toURL().toExternalForm(), Util.getBundlePoolLocation(profile).toString()); } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/ChmodActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/ChmodActionTest.java index a929fbc32..e8bef7364 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/ChmodActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/ChmodActionTest.java @@ -34,7 +34,7 @@ public class ChmodActionTest extends AbstractProvisioningTest { Properties profileProperties = new Properties(); File installFolder = getTempFolder(); profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, installFolder.toString()); - IProfile profile = createProfile("testExecuteUndo", null, profileProperties); + IProfile profile = createProfile("testExecuteUndo", profileProperties); File zipSource = getTestData("1.0", "/testData/nativeTouchpoint/a.zip"); File zipTarget = new File(installFolder, "a.zip"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/CleanupzipActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/CleanupzipActionTest.java index 14c1d9400..a45c1ec28 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/CleanupzipActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/CleanupzipActionTest.java @@ -45,7 +45,7 @@ public class CleanupzipActionTest extends AbstractProvisioningTest { Properties profileProperties = new Properties(); File installFolder = getTempFolder(); profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, installFolder.toString()); - IProfile profile = createProfile("testExecuteUndo", null, profileProperties); + IProfile profile = createProfile("testExecuteUndo", profileProperties); File zipSource = getTestData("1.0", "/testData/nativeTouchpoint/a.zip"); File zipTarget = new File(installFolder, "a.zip"); @@ -92,7 +92,7 @@ public class CleanupzipActionTest extends AbstractProvisioningTest { Properties profileProperties = new Properties(); File installFolder = getTempFolder(); profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, installFolder.toString()); - IProfile profile = createProfile("testExecuteUndoWhereInstallFolderIsDifferent", null, profileProperties); + IProfile profile = createProfile("testExecuteUndoWhereInstallFolderIsDifferent", profileProperties); File zipSource = getTestData("1.0", "/testData/nativeTouchpoint/a.zip"); File zipTarget = new File(installFolder, "a.zip"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/CollectActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/CollectActionTest.java index a9c30171f..d59cf2744 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/CollectActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/CollectActionTest.java @@ -38,7 +38,7 @@ public class CollectActionTest extends AbstractProvisioningTest { Properties profileProperties = new Properties(); File installFolder = getTempFolder(); profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, installFolder.toString()); - IProfile profile = createProfile("test", null, profileProperties); + IProfile profile = createProfile("test", profileProperties); // File zipSource = getTestData("1.0", "/testData/nativeTouchpoint/a.zip"); // File zipTarget = new File(installFolder, "a.zip"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/CopyActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/CopyActionTest.java index 23b6c3f89..7aa52c082 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/CopyActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/CopyActionTest.java @@ -204,7 +204,7 @@ public class CopyActionTest extends AbstractProvisioningTest { Properties profileProperties = new Properties(); File installFolder = getTempFolder(); profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, installFolder.toString()); - IProfile profile = createProfile("test", null, profileProperties); + IProfile profile = createProfile("test", profileProperties); File source = getTestData("1.0", sourceName); File target = new File(installFolder, targetName); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/LinkActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/LinkActionTest.java index 65f219657..2cb529848 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/LinkActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/LinkActionTest.java @@ -32,7 +32,7 @@ public class LinkActionTest extends AbstractProvisioningTest { Properties profileProperties = new Properties(); File installFolder = getTempFolder(); profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, installFolder.toString()); - IProfile profile = createProfile("test", null, profileProperties); + IProfile profile = createProfile("test", profileProperties); File zipSource = getTestData("1.0", "/testData/nativeTouchpoint/a.zip"); File zipTarget = new File(installFolder, "a.zip"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/MkdirActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/MkdirActionTest.java index 85a709e3a..d8970e399 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/MkdirActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/MkdirActionTest.java @@ -30,7 +30,7 @@ public class MkdirActionTest extends AbstractProvisioningTest { Properties profileProperties = new Properties(); File installFolder = getTempFolder(); profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, installFolder.toString()); - IProfile profile = createProfile("test", null, profileProperties); + IProfile profile = createProfile("test", profileProperties); Map parameters = new HashMap(); parameters.put(ActionConstants.PARM_PROFILE, profile); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/NativeTouchpointTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/NativeTouchpointTest.java index 0247557e1..ee35a9d03 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/NativeTouchpointTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/NativeTouchpointTest.java @@ -39,7 +39,7 @@ public class NativeTouchpointTest extends AbstractProvisioningTest { Properties profileProperties = new Properties(); File installFolder = getTempFolder(); profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, installFolder.toString()); - profile = createProfile("test", null, profileProperties); + profile = createProfile("test", profileProperties); touchpoint.initializePhase(null, profile, "test", parameters); touchpoint.completePhase(null, profile, "test", parameters); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/RemoveActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/RemoveActionTest.java index 1191675e9..73ad12f66 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/RemoveActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/RemoveActionTest.java @@ -34,7 +34,7 @@ public class RemoveActionTest extends AbstractProvisioningTest { Properties profileProperties = new Properties(); File installFolder = getTempFolder(); profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, installFolder.toString()); - IProfile profile = createProfile("testExecuteUndo", null, profileProperties); + IProfile profile = createProfile("testExecuteUndo", profileProperties); Map parameters = new HashMap(); parameters.put(ActionConstants.PARM_PROFILE, profile); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/RmdirActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/RmdirActionTest.java index 862fa4ef8..ccd86ebd0 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/RmdirActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/RmdirActionTest.java @@ -34,7 +34,7 @@ public class RmdirActionTest extends AbstractProvisioningTest { Properties profileProperties = new Properties(); File installFolder = getTempFolder(); profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, installFolder.toString()); - IProfile profile = createProfile("testExecuteUndo", null, profileProperties); + IProfile profile = createProfile("testExecuteUndo", profileProperties); Map parameters = new HashMap(); parameters.put(ActionConstants.PARM_PROFILE, profile); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/UnzipActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/UnzipActionTest.java index e5f8c9d1f..44be74e98 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/UnzipActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/UnzipActionTest.java @@ -44,7 +44,7 @@ public class UnzipActionTest extends AbstractProvisioningTest { Properties profileProperties = new Properties(); File installFolder = getTempFolder(); profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, installFolder.toString()); - IProfile profile = createProfile("test", null, profileProperties); + IProfile profile = createProfile("test", profileProperties); File zipSource = getTestData("1.0", "/testData/nativeTouchpoint/a.zip"); File zipTarget = new File(installFolder, "a.zip"); @@ -86,7 +86,7 @@ public class UnzipActionTest extends AbstractProvisioningTest { Properties profileProperties = new Properties(); File installFolder = getTempFolder(); profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, installFolder.toString()); - IProfile profile = createProfile("testExecuteUndoBackup", null, profileProperties); + IProfile profile = createProfile("testExecuteUndoBackup", profileProperties); File zipSource = getTestData("1.0", "/testData/nativeTouchpoint/a.zip"); File zipTarget = new File(installFolder, "a.zip"); @@ -147,7 +147,7 @@ public class UnzipActionTest extends AbstractProvisioningTest { File installFolder = getTempFolder(); profileProperties.setProperty(IProfile.PROP_INSTALL_FOLDER, installFolder.toString()); final String profileId = "Test:With\\Sym/bols"; - IProfile profile = createProfile(profileId, null, profileProperties); + IProfile profile = createProfile(profileId, profileProperties); File zipSource = getTestData("1.0", "/testData/nativeTouchpoint/a.zip"); File zipTarget = new File(installFolder, "a.zip"); |