Add new test case and revert other changes
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/NeedsMigration.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/NeedsMigration.java
index 82f5878..a70b9df 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/NeedsMigration.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/NeedsMigration.java
@@ -97,7 +97,7 @@
IProfile previousUserProfile = createProfile("previous" + getName());
IProfile currentBaseProfile = createProfile("current" + getName());
assertOK(installAsRoots(previousUserProfile, new IInstallableUnit[] {sdk1, egit1}, true, planner, engine));
- assertOK(installAsRoots(currentBaseProfile, new IInstallableUnit[] {eppPackage, sdk1, egit1}, true, planner, engine));
+ assertOK(installAsRoots(currentBaseProfile, new IInstallableUnit[] {eppPackage}, true, planner, engine));
//All the elements that are in the user profile are included in the base
assertFalse(needsMigration(previousUserProfile, currentBaseProfile));
@@ -107,7 +107,17 @@
IProfile previousUserProfile = createProfile("previous" + getName());
IProfile currentBaseProfile = createProfile("current" + getName());
assertOK(installAsRoots(previousUserProfile, new IInstallableUnit[] {sdk1, egit1, cdt1}, true, planner, engine));
- assertOK(installAsRoots(currentBaseProfile, new IInstallableUnit[] {eppPackage, egit1}, true, planner, engine));
+ assertOK(installAsRoots(currentBaseProfile, new IInstallableUnit[] {eppPackage}, true, planner, engine));
+
+ //Not all the elements that are in the user profile are included in the base
+ assertTrue(needsMigration(previousUserProfile, currentBaseProfile));
+ }
+
+ public void testBaseEncompassSomePartsOfWhatUserHas2() {
+ IProfile previousUserProfile = createProfile("previous" + getName());
+ IProfile currentBaseProfile = createProfile("current" + getName());
+ assertOK(installAsRoots(previousUserProfile, new IInstallableUnit[] {sdk1, egit1, cdt1}, true, planner, engine));
+ assertOK(installAsRoots(currentBaseProfile, new IInstallableUnit[] {sdk1, egit1}, true, planner, engine));
//Not all the elements that are in the user profile are included in the base
assertTrue(needsMigration(previousUserProfile, currentBaseProfile));
