diff options
author | John Arthorne | 2010-02-09 18:37:41 +0000 |
---|---|---|
committer | John Arthorne | 2010-02-09 18:37:41 +0000 |
commit | eeffd866d4fef7269d57d354e78a7d8ef58510e5 (patch) | |
tree | e361324d8e485dc9950a694f3c7b7f85341a171e /bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2 | |
parent | bab299b8f8ad7fd3ca3e6e9d5942faf35b42aabd (diff) | |
download | rt.equinox.p2-eeffd866d4fef7269d57d354e78a7d8ef58510e5.tar.gz rt.equinox.p2-eeffd866d4fef7269d57d354e78a7d8ef58510e5.tar.xz rt.equinox.p2-eeffd866d4fef7269d57d354e78a7d8ef58510e5.zip |
Bug 300450 - Agent service lifecycle problems
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2')
2 files changed, 6 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryManagerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryManagerTest.java index 52ebf6782..5b8835b3a 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryManagerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryManagerTest.java @@ -116,7 +116,7 @@ public class ArtifactRepositoryManagerTest extends AbstractProvisioningTest { IPreferencesService prefService = (IPreferencesService) ServiceHelper.getService(TestActivator.getContext(), IPreferencesService.class.getName()); IAgentLocation agentLocation = (IAgentLocation) getAgent().getService(IAgentLocation.SERVICE_NAME); String locationString = EncodingUtils.encodeSlashes(agentLocation.getRootLocation().toString()); - Preferences prefs = prefService.getRootNode().node("/profile/" + locationString + "_SELF_/" + REPO_BUNDLE + "/repositories"); //$NON-NLS-1$ //$NON-NLS-2$ + Preferences prefs = prefService.getRootNode().node("/profile/" + locationString + "/_SELF_/" + REPO_BUNDLE + "/repositories"); //$NON-NLS-1$ //$NON-NLS-2$ try { String[] children = prefs.childrenNames(); for (int i = 0; i < children.length; i++) diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/LocalMetadataRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/LocalMetadataRepositoryTest.java index c87edf31d..562fd31de 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/LocalMetadataRepositoryTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/LocalMetadataRepositoryTest.java @@ -11,6 +11,8 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.metadata.repository; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus; + import org.eclipse.equinox.p2.metadata.Version; import java.io.File; @@ -206,7 +208,8 @@ public class LocalMetadataRepositoryTest extends AbstractProvisioningTest { callCount[0]++; } }; - getEventBus().addListener(listener); + final IProvisioningEventBus eventBus = getEventBus(); + eventBus.addListener(listener); try { //now remove and reload the repository manager.removeRepository(repoURI); @@ -215,7 +218,7 @@ public class LocalMetadataRepositoryTest extends AbstractProvisioningTest { assertTrue("1.1", wasEnabled[0]); assertEquals("1.2", 1, callCount[0]); } finally { - getEventBus().removeListener(listener); + eventBus.removeListener(listener); } } |