Bug 521301 - Stop using deprecated p2 methods in p2 tests

Change-Id: I08b47ba0d4219f15b061b759c01f874747a496df
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetStartLevelActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetStartLevelActionTest.java
index 7de00e543..6559810d7 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetStartLevelActionTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetStartLevelActionTest.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
- *  Copyright (c) 2008, 2010 IBM Corporation and others.
+ *  Copyright (c) 2008, 2017 IBM Corporation and others.
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
  *  http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  *  Contributors:
  *      IBM Corporation - initial API and implementation
  *******************************************************************************/
@@ -13,6 +13,7 @@ package org.eclipse.equinox.p2.tests.touchpoint.eclipse;
 import java.io.File;
 import java.net.URI;
 import java.util.*;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.equinox.frameworkadmin.BundleInfo;
 import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;
 import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;
@@ -58,7 +59,7 @@ public class SetStartLevelActionTest extends AbstractProvisioningTest {
 		IArtifactKey key = BundlesAction.createBundleArtifactKey(bundleDescription.getSymbolicName(), bundleDescription.getVersion().toString());
 		IArtifactDescriptor descriptor = PublisherHelper.createArtifactDescriptor(key, osgiTarget);
 		IInstallableUnit iu = createBundleIU(bundleDescription, osgiTarget.isDirectory(), key);
-		bundlePool.addDescriptor(descriptor);
+		bundlePool.addDescriptor(descriptor, new NullProgressMonitor());
 
 		Map parameters = new HashMap();
 		parameters.put(ActionConstants.PARM_AGENT, getAgent());
@@ -104,7 +105,7 @@ public class SetStartLevelActionTest extends AbstractProvisioningTest {
 		IArtifactKey key = BundlesAction.createBundleArtifactKey(bundleDescription.getSymbolicName(), bundleDescription.getVersion().toString());
 		IArtifactDescriptor descriptor = PublisherHelper.createArtifactDescriptor(key, osgiTarget);
 		IInstallableUnit iu = createBundleIU(bundleDescription, osgiTarget.isDirectory(), key);
-		bundlePool.addDescriptor(descriptor);
+		bundlePool.addDescriptor(descriptor, new NullProgressMonitor());
 
 		Map parameters = new HashMap();
 		parameters.put(ActionConstants.PARM_AGENT, getAgent());
@@ -126,7 +127,7 @@ public class SetStartLevelActionTest extends AbstractProvisioningTest {
 		assertTrue(isStartLevel(manipulator, osgiTarget, -1));
 
 		// let's remove the artifact now
-		bundlePool.removeDescriptor(descriptor);
+		bundlePool.removeDescriptor(descriptor, new NullProgressMonitor());
 
 		SetStartLevelAction action = new SetStartLevelAction();
 		action.execute(parameters);
@@ -153,7 +154,7 @@ public class SetStartLevelActionTest extends AbstractProvisioningTest {
 		IArtifactKey key = BundlesAction.createBundleArtifactKey(bundleDescription.getSymbolicName(), bundleDescription.getVersion().toString());
 		IArtifactDescriptor descriptor = PublisherHelper.createArtifactDescriptor(key, osgiTarget);
 		IInstallableUnit iu = createBundleIU(bundleDescription, osgiTarget.isDirectory(), key);
-		bundlePool.addDescriptor(descriptor);
+		bundlePool.addDescriptor(descriptor, new NullProgressMonitor());
 
 		Map parameters = new HashMap();
 		parameters.put(ActionConstants.PARM_AGENT, getAgent());