Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java')
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java53
1 files changed, 22 insertions, 31 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java
index 7d4af1791..70014395b 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java
@@ -10,25 +10,21 @@
*******************************************************************************/
package org.eclipse.equinox.p2.tests.engine;
-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
+import org.eclipse.equinox.p2.metadata.Version;
import java.io.*;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.Properties;
+import java.util.HashMap;
+import java.util.Map;
import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
import org.eclipse.equinox.internal.p2.engine.*;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
-import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
-import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus;
-import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningListener;
-import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry;
-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.InstallableUnitQuery;
+import org.eclipse.equinox.p2.core.IAgentLocation;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.engine.IProfile;
+import org.eclipse.equinox.p2.engine.IProfileRegistry;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.eclipse.equinox.p2.tests.TestActivator;
import org.osgi.framework.ServiceReference;
@@ -50,7 +46,7 @@ public class ProfileRegistryTest extends AbstractProvisioningTest {
}
protected void getServices() {
- registryRef = TestActivator.getContext().getServiceReference(IProfileRegistry.class.getName());
+ registryRef = TestActivator.getContext().getServiceReference(IProfileRegistry.SERVICE_NAME);
registry = (IProfileRegistry) TestActivator.getContext().getService(registryRef);
}
@@ -75,12 +71,7 @@ public class ProfileRegistryTest extends AbstractProvisioningTest {
private void restart() {
try {
ungetServices();
- TestActivator.getBundle("org.eclipse.equinox.p2.exemplarysetup").stop();
- TestActivator.getBundle("org.eclipse.equinox.p2.exemplarysetup").start();
- //ensure artifact repository manager is registered with event bus. See bug 247584
- IProvisioningEventBus bus = (IProvisioningEventBus) ServiceHelper.getService(TestActivator.getContext(), IProvisioningEventBus.SERVICE_NAME);
- IArtifactRepositoryManager repoMan = (IArtifactRepositoryManager) ServiceHelper.getService(TestActivator.getContext(), IArtifactRepositoryManager.class.getName());
- bus.addListener((ProvisioningListener) repoMan);
+ restartBundle(TestActivator.getBundle("org.eclipse.equinox.p2.exemplarysetup"));
getServices();
} catch (Exception e) {
fail();
@@ -123,7 +114,7 @@ public class ProfileRegistryTest extends AbstractProvisioningTest {
public void testPropertyPeristence() throws ProvisionException {
assertNull(registry.getProfile(PROFILE_NAME));
- Properties properties = new Properties();
+ Map<String, String> properties = new HashMap<String, String>();
properties.put("test", "test");
Profile profile = (Profile) registry.addProfile(PROFILE_NAME, properties);
assertTrue(profile.getProperties().containsKey("test"));
@@ -148,28 +139,28 @@ public class ProfileRegistryTest extends AbstractProvisioningTest {
public void testIUPeristence() throws ProvisionException {
assertNull(registry.getProfile(PROFILE_NAME));
Profile profile = (Profile) registry.addProfile(PROFILE_NAME);
- assertEquals(0, profile.query(InstallableUnitQuery.ANY, new Collector(), null).size());
+ assertTrue(profile.query(InstallableUnitQuery.ANY, null).isEmpty());
profile.addInstallableUnit(createIU("test"));
- assertEquals(1, profile.query(InstallableUnitQuery.ANY, new Collector(), null).size());
+ assertEquals(1, queryResultSize(profile.query(InstallableUnitQuery.ANY, null)));
saveProfile(registry, profile);
restart();
profile = (Profile) registry.getProfile(PROFILE_NAME);
- assertEquals(1, profile.query(InstallableUnitQuery.ANY, new Collector(), null).size());
+ assertEquals(1, queryResultSize(profile.query(InstallableUnitQuery.ANY, null)));
profile.removeInstallableUnit(createIU("test"));
- assertEquals(0, profile.query(InstallableUnitQuery.ANY, new Collector(), null).size());
+ assertTrue(profile.query(InstallableUnitQuery.ANY, null).isEmpty());
saveProfile(registry, profile);
restart();
profile = (Profile) registry.getProfile(PROFILE_NAME);
- assertEquals(0, profile.query(InstallableUnitQuery.ANY, new Collector(), null).size());
+ assertTrue(profile.query(InstallableUnitQuery.ANY, null).isEmpty());
registry.removeProfile(PROFILE_NAME);
restart();
assertNull(registry.getProfile(PROFILE_NAME));
}
public void testIUPropertyPeristence() throws ProvisionException {
- Properties properties = new Properties();
+ Map<String, String> properties = new HashMap<String, String>();
properties.put("test", "test");
assertNull(registry.getProfile(PROFILE_NAME));
Profile profile = (Profile) registry.addProfile(PROFILE_NAME);
@@ -202,7 +193,7 @@ public class ProfileRegistryTest extends AbstractProvisioningTest {
public void testTimestampedProfiles() throws ProvisionException {
assertNull(registry.getProfile(PROFILE_NAME));
- Properties properties = new Properties();
+ Map<String, String> properties = new HashMap<String, String>();
properties.put("test", "test");
Profile profile = (Profile) registry.addProfile(PROFILE_NAME, properties);
long oldtimestamp = profile.getTimestamp();
@@ -229,7 +220,7 @@ public class ProfileRegistryTest extends AbstractProvisioningTest {
public void testIsCurrent() throws Exception {
assertNull(registry.getProfile(PROFILE_NAME));
- Properties properties = new Properties();
+ Map<String, String> properties = new HashMap<String, String>();
properties.put("test", "test");
Profile profile = (Profile) registry.addProfile(PROFILE_NAME, properties);
@@ -255,7 +246,7 @@ public class ProfileRegistryTest extends AbstractProvisioningTest {
profile = (Profile) registry.getProfile(PROFILE_NAME);
assertTrue(registry.isCurrent(profile));
- AgentLocation agentLocation = (AgentLocation) ServiceHelper.getService(TestActivator.getContext(), AgentLocation.SERVICE_NAME);
+ IAgentLocation agentLocation = getAgentLocation();
SimpleProfileRegistry simpleRegistry2 = new SimpleProfileRegistry(SimpleProfileRegistry.getDefaultRegistryDirectory(agentLocation));
profile2 = (Profile) simpleRegistry2.getProfile(PROFILE_NAME);
simpleRegistry2.lockProfile(profile2);
@@ -672,7 +663,7 @@ public class ProfileRegistryTest extends AbstractProvisioningTest {
public void testRemoveProfileTimestamps() throws ProvisionException {
assertNull(registry.getProfile(PROFILE_NAME));
- Properties properties = new Properties();
+ Map<String, String> properties = new HashMap<String, String>();
properties.put("test", "test");
Profile profile = (Profile) registry.addProfile(PROFILE_NAME, properties);
assertTrue(profile.getProperties().containsKey("test"));

Back to the top