summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2013-05-25 11:48:28 (EDT)
committerPascal Rapicault2013-05-25 11:48:28 (EDT)
commit16a5d489bf72c47040a253c4598a9c81f0f10503 (patch)
treea419a7a345fda266cf19e1cc1bcdae18ce2b36c1
parent073f17a77e68de6bb726a143fe40d1b7000f8df5 (diff)
downloadrt.equinox.p2-16a5d489bf72c47040a253c4598a9c81f0f10503.zip
rt.equinox.p2-16a5d489bf72c47040a253c4598a9c81f0f10503.tar.gz
rt.equinox.p2-16a5d489bf72c47040a253c4598a9c81f0f10503.tar.bz2
Bug 409064 - Compile failure in p2.testsI20130525-1500
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TychoUsage.java73
1 files changed, 25 insertions, 48 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TychoUsage.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TychoUsage.java
index 2c25f1a..18daccb 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TychoUsage.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TychoUsage.java
@@ -31,58 +31,35 @@ public class TychoUsage extends AbstractProvisioningTest {
setupTopLevelIU();
}
- public void testEquivalentP2Call() {
- try {
- loadMetadataRepository(URIUtil.fromString("http://download.eclipse.org/releases/indigo"));
- profile = createProfile("TestProfile." + getName());
- IProfileChangeRequest pcr = getPlanner(getAgent()).createChangeRequest(profile);
- pcr.add(topLevelIU);
- System.out.println(System.currentTimeMillis());
- assertResolve(pcr, getPlanner(getAgent()));
- System.out.println(System.currentTimeMillis());
- } catch (ProvisionException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (OperationCanceledException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (URISyntaxException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
+ public void testEquivalentP2Call() throws ProvisionException, URISyntaxException {
+ loadMetadataRepository(URIUtil.fromString("http://download.eclipse.org/releases/indigo"));
+ profile = createProfile("TestProfile." + getName());
+ IProfileChangeRequest pcr = getPlanner(getAgent()).createChangeRequest(profile);
+ pcr.add(topLevelIU);
+ System.out.println(System.currentTimeMillis());
+ assertResolve(pcr, getPlanner(getAgent()));
+ System.out.println(System.currentTimeMillis());
}
- public void testTychoUsage() {
- try {
- IMetadataRepository repo = loadMetadataRepository(URIUtil.fromString("http://download.eclipse.org/releases/indigo"));
- IInstallableUnit newRoot1 = repo.query(QueryUtil.createIUQuery("org.eclipse.emf.sdk.feature.group", Version.create("2.7.2.v20120130-0943")), new NullProgressMonitor()).iterator().next();
- Collection<IInstallableUnit> newRoots = new ArrayList<>();
- newRoots.add(newRoot1);
+ public void testTychoUsage() throws ProvisionException, URISyntaxException {
+ IMetadataRepository repo = loadMetadataRepository(URIUtil.fromString("http://download.eclipse.org/releases/indigo"));
+ IInstallableUnit newRoot1 = repo.query(QueryUtil.createIUQuery("org.eclipse.emf.sdk.feature.group", Version.create("2.7.2.v20120130-0943")), new NullProgressMonitor()).iterator().next();
+ Collection<IInstallableUnit> newRoots = new ArrayList<IInstallableUnit>();
+ newRoots.add(newRoot1);
- Map<String, String> context = new HashMap<String, String>();
- context.put("osgi.ws", "win32");
- context.put("osgi.os", "win32");
- context.put("osgi.arch", "x86_64");
- context.put("org.eclipse.update.install.features", "true");
+ Map<String, String> context = new HashMap<String, String>();
+ context.put("osgi.ws", "win32");
+ context.put("osgi.os", "win32");
+ context.put("osgi.arch", "x86_64");
+ context.put("org.eclipse.update.install.features", "true");
- Slicer slicer = new Slicer(repo, context, false);
- IQueryable<IInstallableUnit> slice = slicer.slice(new IInstallableUnit[] {topLevelIU}, new NullProgressMonitor());
+ Slicer slicer = new Slicer(repo, context, false);
+ IQueryable<IInstallableUnit> slice = slicer.slice(new IInstallableUnit[] {topLevelIU}, new NullProgressMonitor());
- Projector p = new Projector(slice, context, new HashSet<IInstallableUnit>(), false);
- p.encode(topLevelIU, new IInstallableUnit[0], new Collector<IInstallableUnit>(), newRoots, new NullProgressMonitor());
- IStatus result = p.invokeSolver(new NullProgressMonitor());
- assertTrue(result.isOK() || result.getSeverity() == IStatus.WARNING);
- assertFalse(p.extractSolution().isEmpty());
- } catch (URISyntaxException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ProvisionException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (OperationCanceledException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ Projector p = new Projector(slice, context, new HashSet<IInstallableUnit>(), false);
+ p.encode(topLevelIU, new IInstallableUnit[0], new Collector<IInstallableUnit>(), newRoots, new NullProgressMonitor());
+ IStatus result = p.invokeSolver(new NullProgressMonitor());
+ assertTrue(result.isOK() || result.getSeverity() == IStatus.WARNING);
+ assertFalse(p.extractSolution().isEmpty());
}
}