Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hallgren2010-02-25 17:31:06 +0000
committerThomas Hallgren2010-02-25 17:31:06 +0000
commiteaa7cbe6e5818394bc1673a8babc7d4ebd30ed13 (patch)
tree6bc72abf5945357db9fa97b602b8d4b1ab138243 /bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/perf
parentd3c84a2ee68e14ef740e238f90a214a9b14422e8 (diff)
downloadrt.equinox.p2-eaa7cbe6e5818394bc1673a8babc7d4ebd30ed13.tar.gz
rt.equinox.p2-eaa7cbe6e5818394bc1673a8babc7d4ebd30ed13.tar.xz
rt.equinox.p2-eaa7cbe6e5818394bc1673a8babc7d4ebd30ed13.zip
302201 : Unify the two query approaches used in p2, final step.
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/perf')
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/perf/MetadataRepositoryPerformanceTest.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/perf/PublisherPerformanceTest.java7
2 files changed, 5 insertions, 6 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/perf/MetadataRepositoryPerformanceTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/perf/MetadataRepositoryPerformanceTest.java
index 5301913b5..a98020b1a 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/perf/MetadataRepositoryPerformanceTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/perf/MetadataRepositoryPerformanceTest.java
@@ -15,8 +15,8 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.tests.harness.PerformanceTestRunner;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery;
import org.eclipse.equinox.p2.query.IQuery;
+import org.eclipse.equinox.p2.query.QueryUtil;
import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
@@ -53,7 +53,7 @@ public class MetadataRepositoryPerformanceTest extends ProvisioningPerformanceTe
List<IInstallableUnit> ius = new ArrayList(IU_COUNT);
for (int i = 0; i < IU_COUNT; i++) {
IInstallableUnit iu = generateIU(i);
- queries[i] = new InstallableUnitQuery(iu.getId(), iu.getVersion());
+ queries[i] = QueryUtil.createIUQuery(iu.getId(), iu.getVersion());
ius.add(iu);
}
repository.addInstallableUnits(ius);
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/perf/PublisherPerformanceTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/perf/PublisherPerformanceTest.java
index 5f57de535..646a1afd9 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/perf/PublisherPerformanceTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/perf/PublisherPerformanceTest.java
@@ -12,11 +12,10 @@ package org.eclipse.equinox.p2.tests.perf;
import org.eclipse.core.tests.harness.PerformanceTestRunner;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery;
import org.eclipse.equinox.p2.publisher.IPublisherResult;
import org.eclipse.equinox.p2.publisher.PublisherResult;
import org.eclipse.equinox.p2.query.IQuery;
-import org.eclipse.equinox.p2.query.LimitQuery;
+import org.eclipse.equinox.p2.query.QueryUtil;
/**
* Performance tests for the p2 publisher
@@ -36,7 +35,7 @@ public class PublisherPerformanceTest extends ProvisioningPerformanceTest {
for (int i = 0; i < ius.length; i++) {
ius[i] = generateIU(i);
result.addIU(ius[i], IPublisherResult.ROOT);
- queries[i] = new InstallableUnitQuery(ius[i].getId(), ius[i].getVersion());
+ queries[i] = QueryUtil.createIUQuery(ius[i].getId(), ius[i].getVersion());
}
}
@@ -63,7 +62,7 @@ public class PublisherPerformanceTest extends ProvisioningPerformanceTest {
for (int i = 0; i < ius.length; i++) {
ius[i] = generateIU(i);
result.addIU(ius[i], IPublisherResult.ROOT);
- queries[i] = new LimitQuery(new InstallableUnitQuery(ius[i].getId(), ius[i].getVersion()), 1);
+ queries[i] = QueryUtil.createLimitQuery(QueryUtil.createIUQuery(ius[i].getId(), ius[i].getVersion()), 1);
}
}

Back to the top