diff options
| author | Pascal Rapicault (Ericsson) | 2013-03-04 20:41:23 +0000 |
|---|---|---|
| committer | Pascal Rapicault | 2013-03-04 20:41:23 +0000 |
| commit | ac784291476b51702dcb643b48377b2dd69da4ae (patch) | |
| tree | c142e930ac5602a3ef608762ac6de95e88bb58a7 | |
| parent | 3ad2f7c875e59e5f32ee3b537ae53a12a44091fe (diff) | |
| download | rt.equinox.p2-ac784291476b51702dcb643b48377b2dd69da4ae.tar.gz rt.equinox.p2-ac784291476b51702dcb643b48377b2dd69da4ae.tar.xz rt.equinox.p2-ac784291476b51702dcb643b48377b2dd69da4ae.zip | |
Add new test case and revert other changesv20130304-204123I20130305-0912I20130305-0800I20130304-2000
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/NeedsMigration.java | 14 |
1 files 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)); |