1 files changed, 7 insertions, 7 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug255984.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug255984.java
index 447dcaf96..b96170aed 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug255984.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug255984.java
@@ -10,17 +10,17 @@
  *******************************************************************************/
 package org.eclipse.equinox.p2.tests.planner;
 
-import org.eclipse.equinox.p2.planner.IPlanner;
-
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
-import org.eclipse.equinox.internal.provisional.p2.director.*;
+import org.eclipse.equinox.internal.provisional.p2.director.PlannerHelper;
+import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;
 import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
 import org.eclipse.equinox.p2.engine.*;
 import org.eclipse.equinox.p2.engine.query.IUProfilePropertyQuery;
 import org.eclipse.equinox.p2.metadata.*;
-import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery;
+import org.eclipse.equinox.p2.planner.IPlanner;
+import org.eclipse.equinox.p2.query.QueryUtil;
 import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
 
 public class Bug255984 extends AbstractProvisioningTest {
@@ -54,7 +54,7 @@ public class Bug255984 extends AbstractProvisioningTest {
 		assertEquals(IStatus.OK, plan.getStatus().getSeverity());
 		engine.perform(plan, null);
 		assertProfileContainsAll("B is missing", profile1, new IInstallableUnit[] {b});
-		assertEquals(1, queryResultSize(profile1.query(InstallableUnitQuery.ANY, null)));
+		assertEquals(1, queryResultSize(profile1.query(QueryUtil.createIUAnyQuery(), null)));
 
 		//Install A
 		ProfileChangeRequest req2 = new ProfileChangeRequest(profile1);
@@ -65,7 +65,7 @@ public class Bug255984 extends AbstractProvisioningTest {
 		assertEquals(IStatus.OK, plan2.getStatus().getSeverity());
 		engine.perform(plan2, null);
 		assertProfileContainsAll("A is missing", profile1, new IInstallableUnit[] {a, b});
-		assertEquals(2, queryResultSize(profile1.query(InstallableUnitQuery.ANY, null)));
+		assertEquals(2, queryResultSize(profile1.query(QueryUtil.createIUAnyQuery(), null)));
 
 		//Uninstall B
 		ProfileChangeRequest req3 = new ProfileChangeRequest(profile1);
@@ -76,6 +76,6 @@ public class Bug255984 extends AbstractProvisioningTest {
 		engine.perform(plan3, null);
 		assertProfileContainsAll("A is missing", profile1, new IInstallableUnit[] {a, b});
 		assertEquals(1, queryResultSize(profile1.query(new IUProfilePropertyQuery("foo", "bar"), new NullProgressMonitor())));
-		assertEquals(2, queryResultSize(profile1.query(InstallableUnitQuery.ANY, null)));
+		assertEquals(2, queryResultSize(profile1.query(QueryUtil.createIUAnyQuery(), null)));
 	}
 }