From ac784291476b51702dcb643b48377b2dd69da4ae Mon Sep 17 00:00:00 2001
From: Pascal Rapicault (Ericsson)
Date: Mon, 4 Mar 2013 15:41:23 -0500
Subject: Add new test case and revert other changes

---
 .../equinox/p2/tests/sharedinstall/NeedsMigration.java     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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 82f5878d5..a70b9dfc9 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 @@ public class NeedsMigration extends AbstractProvisioningTest {
 		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 @@ public class NeedsMigration extends AbstractProvisioningTest {
 		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));
-- 
cgit v1.2.1