diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableMetadataRepositoryManagerTest.java')
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableMetadataRepositoryManagerTest.java | 17 |
1 files changed, 8 insertions, 9 deletions
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 94f11bc77..7d44982f4 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 @@ -109,7 +109,7 @@ public class QueryableMetadataRepositoryManagerTest extends AbstractQueryTest { QueryableMetadataRepositoryManager manager = getQueryableManager(); IQueryResult result = manager.query(new InstallableUnitQuery("test.bundle", Version.createOSGi(1, 0, 0)), new CancelingProgressMonitor()); - assertEquals("1.0", 0, result.size()); + assertTrue("1.0", result.isEmpty()); } public void testExistingRepository() { @@ -178,23 +178,22 @@ public class QueryableMetadataRepositoryManagerTest extends AbstractQueryTest { QueryableMetadataRepositoryManager manager = getQueryableManager(); IQueryResult result = manager.query(new InstallableUnitQuery("test.bundle", Version.createOSGi(1, 0, 0)), getMonitor()); - assertEquals("1.0", 1, result.size()); + assertEquals("1.0", 1, queryResultSize(result)); IInstallableUnit iu = (IInstallableUnit) result.iterator().next(); assertEquals("1.1", "test.bundle", iu.getId()); //RepoLocationQuery collects repository URLs result = manager.query(new RepositoryLocationQuery(), getMonitor()); - assertEquals("2.0", 3, result.size()); - Collection resultCollection = result.toCollection(); - assertTrue("2.1", resultCollection.contains(existing)); - assertTrue("2.1", resultCollection.contains(nonExisting)); - assertTrue("2.1", resultCollection.contains(broken)); + assertEquals("2.0", 3, queryResultSize(result)); + assertContains("2.1", result, existing); + assertContains("2.1", result, nonExisting); + assertContains("2.1", result, broken); // null IUPropertyQuery collects all IUs result = manager.query(new InstallableUnitQuery((String) null), getMonitor()); - int iuCount = result.size(); + int iuCount = queryResultSize(result); result = manager.query(new IUPropertyQuery(null, null), getMonitor()); - assertEquals("2.2", iuCount, result.size()); + assertEquals("2.2", iuCount, queryResultSize(result)); } public void testNonLatestInMultipleRepositories() { |