Check is the new request is useful

2 files changed, 3 insertions, 17 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TestRequestFlexerIUProperties.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TestRequestFlexerIUProperties.java
index 598cc39d1..a3dad16d9 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TestRequestFlexerIUProperties.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TestRequestFlexerIUProperties.java
@@ -75,14 +75,6 @@ public class TestRequestFlexerIUProperties extends AbstractProvisioningTest {
 		assertNotOK(planner.getProvisioningPlan(originalRequest, null, null).getStatus());
 
 		{
-			//sdk1 is requested to be marked strict, so since sdk1 and egit can't be installed together and we don't have any flexibility, we get null
-			RequestFlexer av = new RequestFlexer(planner);
-			av.setProvisioningContext(context);
-			IProfileChangeRequest realRequest = av.getChangeRequest(originalRequest, profile, new NullProgressMonitor());
-			assertNull(realRequest);
-		}
-
-		{
 			//Verify that it is possible to install egit2 because the sdk1 is optional
 			RequestFlexer av = new RequestFlexer(planner);
 			av.setAllowInstalledElementChange(true);
@@ -134,14 +126,7 @@ public class TestRequestFlexerIUProperties extends AbstractProvisioningTest {
 
 		{
 			//Verify that it is possible to install egit2 because the sdk1 inclusion is change to optional
-			RequestFlexer av = new RequestFlexer(planner);
-			av.setProvisioningContext(context);
-			IProfileChangeRequest realRequest = av.getChangeRequest(originalRequest, profile, new NullProgressMonitor());
-			assertTrue(realRequest.getAdditions().contains(egit2));
-			assertTrue(realRequest.getRemovals().contains(sdk1));
-			assertEquals(1, realRequest.getAdditions().size());
-			assertEquals(1, realRequest.getRemovals().size());
-			assertResolve(realRequest, planner);
+			assertResolve(originalRequest, planner);
 		}
 
 		{
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TestRequestFlexerRequestWithRemoval.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TestRequestFlexerRequestWithRemoval.java
index 571d68c7a..d194c0b9f 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TestRequestFlexerRequestWithRemoval.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TestRequestFlexerRequestWithRemoval.java
@@ -76,8 +76,9 @@ public class TestRequestFlexerRequestWithRemoval extends AbstractProvisioningTes
 		{
 			RequestFlexer av = new RequestFlexer(planner);
 			av.setProvisioningContext(context);
+			av.setAllowDifferentVersion(true);
 			IProfileChangeRequest realRequest = av.getChangeRequest(originalRequest, profile, new NullProgressMonitor());
-			assertTrue(realRequest.getAdditions().contains(egit2));
+			assertTrue(realRequest.getAdditions().contains(egit1));
 			assertTrue(realRequest.getRemovals().contains(sdk1));
 			assertEquals(1, realRequest.getAdditions().size());
 			assertResolve(realRequest, planner);