1 files changed, 7 insertions, 7 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/LocalUpdatesiteTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/LocalUpdatesiteTest.java
index 0075da28c..ea5a1a9ed 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/LocalUpdatesiteTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/LocalUpdatesiteTest.java
@@ -14,10 +14,11 @@ import java.io.IOException;
 import java.util.Iterator;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.equinox.internal.p2.updatesite.UpdateSitePublisherApplication;
-import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
-import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
-import org.eclipse.equinox.internal.provisional.p2.metadata.query.*;
-import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.query.CategoryQuery;
+import org.eclipse.equinox.p2.query.IQueryResult;
+import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
 import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
 import org.eclipse.equinox.p2.tests.TestData;
 
@@ -39,7 +40,6 @@ public class LocalUpdatesiteTest extends AbstractProvisioningTest {
 	}
 
 	public void testCategoryQualifier() throws IOException, ProvisionException {
-		Query categoryQuery = new IUPropertyQuery(IInstallableUnit.PROP_TYPE_CATEGORY, Boolean.toString(true));
 		File siteSource = TestData.getFile("updatesite", "SiteXMLActionTest");
 		UpdateSitePublisherApplication application = new UpdateSitePublisherApplication();
 		try {
@@ -48,8 +48,8 @@ public class LocalUpdatesiteTest extends AbstractProvisioningTest {
 			fail("0.99");
 		}
 		IMetadataRepository repository = getMetadataRepositoryManager().loadRepository(repoLocation.toURI(), new NullProgressMonitor());
-		Collector results = repository.query(categoryQuery, new Collector(), new NullProgressMonitor());
-		assertEquals("1.0", 1, results.size());
+		IQueryResult results = repository.query(new CategoryQuery(), new NullProgressMonitor());
+		assertEquals("1.0", 1, queryResultSize(results));
 		Iterator iter = results.iterator();
 		while (iter.hasNext()) {
 			IInstallableUnit unit = (IInstallableUnit) iter.next();