diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/LatestIUVersionElementWrapperTest.java')
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/LatestIUVersionElementWrapperTest.java | 53 |
1 files changed, 20 insertions, 33 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/LatestIUVersionElementWrapperTest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/LatestIUVersionElementWrapperTest.java index 28a540bf6..a98519434 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/LatestIUVersionElementWrapperTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/LatestIUVersionElementWrapperTest.java @@ -11,13 +11,14 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.ui.query; -import org.eclipse.equinox.internal.provisional.p2.metadata.Version; +import org.eclipse.equinox.p2.metadata.Version; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import org.eclipse.equinox.internal.p2.metadata.query.LatestIUVersionQuery; import org.eclipse.equinox.internal.p2.ui.model.IIUElement; -import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector; -import org.eclipse.equinox.internal.provisional.p2.metadata.query.LatestIUVersionQuery; +import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.p2.query.IQueryResult; /** * Tests for {@link LatestIUVersionQuery}. This has all the tests of the superclass, @@ -35,41 +36,28 @@ public class LatestIUVersionElementWrapperTest extends AvailableIUWrapperTest { } /** - * Tests collecting items that LatestIUVersionElementQuery should - * discard. - */ - public void testCollectObject() { - LatestIUVersionQuery latestIuVersionElementQuery = new LatestIUVersionQuery(); - Object object = new Object(); - List list = new ArrayList(); - list.add(object); - Collector collector = latestIuVersionElementQuery.perform(list.iterator(), new Collector()); - assertEquals("1.0", 0, collector.size()); - } - - /** * Tests that only the latest version is collected. */ public void testCollectLatestIU() { LatestIUVersionQuery latestIuVersionElementQuery = new LatestIUVersionQuery(); - IInstallableUnit unit1 = createIU("f1", new Version(1, 0, 0)); - IInstallableUnit unit2 = createIU("f1", new Version(1, 0, 1)); + IInstallableUnit unit1 = createIU("f1", Version.createOSGi(1, 0, 0)); + IInstallableUnit unit2 = createIU("f1", Version.createOSGi(1, 0, 1)); List listOfIUs = new ArrayList(); listOfIUs.add(unit1); listOfIUs.add(unit2); - Collector collector = latestIuVersionElementQuery.perform(listOfIUs.iterator(), new Collector()); - assertEquals("1.0", 1, collector.size()); + IQueryResult collector = latestIuVersionElementQuery.perform(listOfIUs.iterator()); + assertEquals("1.0", 1, queryResultSize(collector)); IInstallableUnit collectedIU = getIU(collector.iterator().next()); assertEquals("1.1", unit2, collectedIU); } public void testMultipleIUsAndVersions() { LatestIUVersionQuery latestIuVersionElementQuery = new LatestIUVersionQuery(); - IInstallableUnit unit1 = createIU("A", new Version(1, 0, 0)); - IInstallableUnit unit2 = createIU("A", new Version(1, 0, 1)); - IInstallableUnit unit3 = createIU("B", new Version(1, 0, 1)); - IInstallableUnit unit4 = createIU("B", new Version(0, 1, 1)); - IInstallableUnit unit5 = createIU("C", new Version(0, 1, 1)); + IInstallableUnit unit1 = createIU("A", Version.createOSGi(1, 0, 0)); + IInstallableUnit unit2 = createIU("A", Version.createOSGi(1, 0, 1)); + IInstallableUnit unit3 = createIU("B", Version.createOSGi(1, 0, 1)); + IInstallableUnit unit4 = createIU("B", Version.createOSGi(0, 1, 1)); + IInstallableUnit unit5 = createIU("C", Version.createOSGi(0, 1, 1)); // We should get unit 2, unit 3 and unit 5 List listOfIUs = new ArrayList(); @@ -78,14 +66,13 @@ public class LatestIUVersionElementWrapperTest extends AvailableIUWrapperTest { listOfIUs.add(unit3); listOfIUs.add(unit4); listOfIUs.add(unit5); - Collector collector = latestIuVersionElementQuery.perform(listOfIUs.iterator(), new Collector()); + IQueryResult collector = latestIuVersionElementQuery.perform(listOfIUs.iterator()); // Should be 3 units - assertEquals("1.0", 3, collector.size()); - Collection reslts = collector.toCollection(); - assertTrue("1.2", reslts.contains(unit2)); - assertTrue("1.3", reslts.contains(unit3)); - assertTrue("1.4", reslts.contains(unit5)); + assertEquals("1.0", 3, queryResultSize(collector)); + assertContains("1.2", collector, unit2); + assertContains("1.3", collector, unit3); + assertContains("1.4", collector, unit5); } } |