Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSusan Franklin2010-01-24 16:10:47 -0500
committerSusan Franklin2010-01-24 16:10:47 -0500
commitec27e97695c97b2e1a144eb0290037551fc21462 (patch)
tree69577636f007c3f682a2a5ad53b09dd70765df13 /bundles/org.eclipse.equinox.p2.tests.ui
parent181e7a277f61fa63880621241a2971f2ceaf1365 (diff)
downloadrt.equinox.p2-ec27e97695c97b2e1a144eb0290037551fc21462.tar.gz
rt.equinox.p2-ec27e97695c97b2e1a144eb0290037551fc21462.tar.xz
rt.equinox.p2-ec27e97695c97b2e1a144eb0290037551fc21462.zip
Bug 300561 - [ui] Prov Admin Metadata repos tab does not show repositoriesv20100124-1705
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests.ui')
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableArtifactRepositoryManagerTest.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableMetadataRepositoryManagerTest.java11
2 files changed, 6 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableArtifactRepositoryManagerTest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableArtifactRepositoryManagerTest.java
index 4f2fd7e7e..a5d45e9f4 100644
--- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableArtifactRepositoryManagerTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableArtifactRepositoryManagerTest.java
@@ -43,7 +43,7 @@ public class QueryableArtifactRepositoryManagerTest extends AbstractQueryTest {
public void testQuery() {
QueryableArtifactRepositoryManager manager = getQueryableManager();
- IQueryResult result = manager.locationsQueriable().query(new RepositoryLocationQuery(), getMonitor());
+ IQueryResult result = manager.query(new RepositoryLocationQuery(), getMonitor());
assertTrue(queryResultSize(result) == repoCount);
}
diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableMetadataRepositoryManagerTest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableMetadataRepositoryManagerTest.java
index 7d9d033f5..8dbf8bf76 100644
--- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableMetadataRepositoryManagerTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableMetadataRepositoryManagerTest.java
@@ -10,10 +10,6 @@
*******************************************************************************/
package org.eclipse.equinox.p2.tests.ui.query;
-import org.eclipse.equinox.p2.metadata.Version;
-
-import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery;
-
import java.io.File;
import java.net.URI;
import java.util.Collection;
@@ -25,6 +21,8 @@ import org.eclipse.equinox.internal.p2.ui.model.MetadataRepositories;
import org.eclipse.equinox.internal.p2.ui.query.IUViewQueryContext;
import org.eclipse.equinox.p2.core.ProvisionException;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.Version;
+import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery;
import org.eclipse.equinox.p2.operations.ProvisioningJob;
import org.eclipse.equinox.p2.operations.ProvisioningSession;
import org.eclipse.equinox.p2.query.IQueryResult;
@@ -184,8 +182,9 @@ public class QueryableMetadataRepositoryManagerTest extends AbstractQueryTest {
IInstallableUnit iu = (IInstallableUnit) result.iterator().next();
assertEquals("1.1", "test.bundle", iu.getId());
- //RepoLocationQuery collects repository URLs
- result = manager.locationsQueriable().query(new RepositoryLocationQuery(), getMonitor());
+ // RepoLocationQuery must cause repository URI's to be collected and no repository
+ // loading should occur.
+ result = manager.query(new RepositoryLocationQuery(), getMonitor());
assertEquals("2.0", 3, queryResultSize(result));
assertContains("2.1", result, existing);
assertContains("2.1", result, nonExisting);

Back to the top