diff options
author | Thomas Watson | 2018-01-22 17:45:31 +0000 |
---|---|---|
committer | Thomas Watson | 2018-01-22 17:45:31 +0000 |
commit | 0e3caa9359428dcb20c1dc3a2c580fff64777d3d (patch) | |
tree | 491a0aa61382ad685c708f7c5c3943af043f5738 /bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine | |
parent | 81563662fc363e85f9311289f2e9026ecfacd390 (diff) | |
download | rt.equinox.p2-0e3caa9359428dcb20c1dc3a2c580fff64777d3d.tar.gz rt.equinox.p2-0e3caa9359428dcb20c1dc3a2c580fff64777d3d.tar.xz rt.equinox.p2-0e3caa9359428dcb20c1dc3a2c580fff64777d3d.zip |
Revert "Bug 528387 - Dedicated xml elements for generic requirements"
This reverts commit a7a99e1fa49938a8f62d44d5c443d38981afeace.
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine')
-rw-r--r-- | bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseSetTest.java | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseSetTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseSetTest.java index 609d1d69a..f085f9415 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseSetTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseSetTest.java @@ -12,42 +12,21 @@ package org.eclipse.equinox.p2.tests.engine; import java.io.File; import java.net.URI; -import java.util.EventObject; -import java.util.HashMap; -import java.util.Map; +import java.util.*; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.equinox.internal.p2.director.ProfileChangeRequest; -import org.eclipse.equinox.internal.p2.engine.BeginOperationEvent; -import org.eclipse.equinox.internal.p2.engine.CommitOperationEvent; -import org.eclipse.equinox.internal.p2.engine.EngineSession; -import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand; -import org.eclipse.equinox.internal.p2.engine.Phase; -import org.eclipse.equinox.internal.p2.engine.PhaseEvent; -import org.eclipse.equinox.internal.p2.engine.PhaseSet; -import org.eclipse.equinox.internal.p2.engine.ProfileEvent; -import org.eclipse.equinox.internal.p2.engine.RollbackOperationEvent; +import org.eclipse.equinox.internal.p2.engine.*; import org.eclipse.equinox.internal.p2.repository.DownloadProgressEvent; import org.eclipse.equinox.internal.p2.touchpoint.natives.Util; import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningListener; import org.eclipse.equinox.internal.provisional.p2.repository.RepositoryEvent; import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.engine.IEngine; -import org.eclipse.equinox.p2.engine.IPhaseSet; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.IProvisioningPlan; -import org.eclipse.equinox.p2.engine.PhaseSetFactory; -import org.eclipse.equinox.p2.engine.ProvisioningContext; +import org.eclipse.equinox.p2.engine.*; import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.IQuery; -import org.eclipse.equinox.p2.query.IQueryResult; -import org.eclipse.equinox.p2.query.QueryUtil; +import org.eclipse.equinox.p2.query.*; import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; @@ -197,7 +176,7 @@ public class PhaseSetTest extends AbstractProvisioningTest { getArtifactRepositoryManager().loadRepository(repoURI, null); doProvisioning(repoURI, phaseSet, query, expectedCode, monitor); // make sure the listener handles all event already that are dispatched asynchronously - listener.latch.await(15, TimeUnit.SECONDS); + listener.latch.await(10, TimeUnit.SECONDS); assertFalse("Engine still do provisioning after pausing.", listener.hasProvisioningEventAfterPaused); pauseJob.join(); } finally { |