summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault (Ericsson)2013-04-26 21:11:58 (EDT)
committerPascal Rapicault2013-04-26 21:11:58 (EDT)
commit5955ca089c44e3ccf79fb801a829e4757f76b741 (patch)
tree42e83a90d0c1767e590dd081bc9d8c6c9d9190a5
parent55cada7d53efae6a965951be458b78536460a672 (diff)
downloadrt.equinox.p2-5955ca089c44e3ccf79fb801a829e4757f76b741.zip
rt.equinox.p2-5955ca089c44e3ccf79fb801a829e4757f76b741.tar.gz
rt.equinox.p2-5955ca089c44e3ccf79fb801a829e4757f76b741.tar.bz2
Fix up tests
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TestRequestFlexerOneInstalledOneBeingInstalled.java5
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TestRequestFlexerOneInstalledTwoBeingInstalled.java9
2 files changed, 8 insertions, 6 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TestRequestFlexerOneInstalledOneBeingInstalled.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TestRequestFlexerOneInstalledOneBeingInstalled.java
index 6c903a9..de3332d 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TestRequestFlexerOneInstalledOneBeingInstalled.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TestRequestFlexerOneInstalledOneBeingInstalled.java
@@ -161,8 +161,9 @@ public class TestRequestFlexerOneInstalledOneBeingInstalled extends AbstractProv
av.setProvisioningContext(context);
IProfileChangeRequest realRequest = av.getChangeRequest(originalRequest, profile, new NullProgressMonitor());
//We only sdk1 because our goal is maximize the number of installed element and minimize the number of changes
- assertTrue(realRequest.getAdditions().contains(egit1));
- assertTrue(realRequest.getRemovals().isEmpty());
+ assertTrue(realRequest.getAdditions().contains(egit2));
+ assertTrue(realRequest.getAdditions().contains(sdk2));
+ assertTrue(realRequest.getRemovals().contains(sdk1));
assertOK(install(realRequest, planner, engine));
}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TestRequestFlexerOneInstalledTwoBeingInstalled.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TestRequestFlexerOneInstalledTwoBeingInstalled.java
index 7b950d3..324bdfb 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TestRequestFlexerOneInstalledTwoBeingInstalled.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TestRequestFlexerOneInstalledTwoBeingInstalled.java
@@ -120,10 +120,11 @@ public class TestRequestFlexerOneInstalledTwoBeingInstalled extends AbstractProv
av.setAllowDifferentVersion(true);
av.setProvisioningContext(context);
IProfileChangeRequest realRequest = av.getChangeRequest(originalRequest, profile, new NullProgressMonitor());
- assertTrue(realRequest.getAdditions().contains(svn1));
- assertTrue(realRequest.getAdditions().contains(egit1));
- assertEquals(2, realRequest.getAdditions().size());
- assertTrue(realRequest.getRemovals().isEmpty());
+ assertTrue(realRequest.getAdditions().contains(svn2));
+ assertTrue(realRequest.getAdditions().contains(egit2));
+ assertTrue(realRequest.getAdditions().contains(svn2));
+ assertEquals(3, realRequest.getAdditions().size());
+ assertTrue(realRequest.getRemovals().contains(sdk1));
}
}