Bug 507193 - Build failure on N20161107-2000Y20170321-2315Y20170321-0120Y20170316-0500Y20170309-1000Y20170302-1000Y20170223-1000Y20170216-1515Y20170216-1450Y20170216-1000Y20170209-1000Y20170202-1000Y20170126-1700Y20170126-1000Y20170119-1000Y20170112-1300Y20170112-1000Y20170105-1040Y20170105-1000Y20161229-1000Y20161223-1030Y20161222-1000Y20161215-1200Y20161208-1000Y20161201-1000Y20161124-1000Y20161117-1000Y20161110-1000S4_7_0_M6S4_7_0_M5S4_7_0_M4I20170325-2000I20170324-2000I20170323-2000I20170322-2000I20170321-2000I20170320-2000I20170319-2000I20170318-2000I20170317-2000I20170316-2000I20170315-2000I20170315-0500I20170314-2000I20170313-2000I20170312-2000I20170311-2000I20170310-2000I20170308-2000I20170308-0800I20170307-2000I20170307-0800I20170307-0610I20170307-0450I20170307-0420I20170307-0410I20170307-0150I20170306-2000I20170306-0800I20170305-2000I20170304-2000I20170303-2000I20170302-2000I20170301-2000I20170228-2000I20170228-0330I20170228-0240I20170227-2000I20170226-2000I20170225-2000I20170224-2000I20170223-2000I20170222-2000I20170221-2000I20170220-2000I20170219-2000I20170218-2000I20170217-2000I20170216-2000I20170216-0140I20170215-2000I20170214-2200I20170214-2000I20170213-2000I20170212-2000I20170211-2000I20170210-2000I20170210-0615I20170210-0600I20170210-0550I20170210-0530I20170209-2000I20170208-2000I20170208-0700I20170207-2000I20170206-2000I20170205-2000I20170204-2000I20170203-2000I20170202-2000I20170201-2000I20170131-2000I20170130-2000I20170130-0600I20170129-2000I20170128-2000I20170127-2200I20170127-2000I20170126-1030I20170126-0505I20170125-2000I20170125-0800I20170124-2000I20170124-0800I20170123-2000I20170123-0830I20170123-0800I20170122-2000I20170121-2000I20170121-0950I20170120-2000I20170119-2000I20170119-1010I20170119-0345I20170118-2000I20170118-1215I20170117-2000I20170116-2000I20170115-2000I20170114-2000I20170113-2000I20170112-2000I20170112-0245I20170112-0200I20170111-2000I20170111-0200I20170110-2000I20170109-2000I20170108-2000I20170107-2000I20170106-2000I20170105-2000I20170105-0320I20170105-0230I20170104-2000I20170104-0800I20170103-2000I20170102-2000I20170101-2000I20161231-2000I20161230-2000I20161229-2000I20161228-2000I20161227-2000I20161226-2000I20161225-2000I20161224-2000I20161223-2000I20161223-0615I20161222-2000I20161221-2000I20161221-0400I20161220-2000I20161220-0530I20161219-2000I20161219-0145I20161218-2000I20161217-2000I20161216-2000I20161215-2000I20161215-0915I20161215-0830I20161215-0730I20161215-0130I20161214-2000I20161214-1005I20161213-2000I20161213-0600I20161213-0300I20161212-2000I20161211-2000I20161210-2000I20161208-0830I20161208-0730I20161207-2000I20161207-1340I20161207-0800I20161207-0515I20161206-2000I20161206-0800I20161205-2000I20161205-0800I20161204-2000I20161203-2000I20161202-2000I20161201-2000I20161201-0800I20161130-2000I20161129-2330I20161129-2000I20161128-2000I20161128-0600I20161128-0330I20161127-2000I20161127-1300I20161126-2000I20161126-0815I20161125-2000I20161124-2000I20161123-2000I20161122-2000I20161121-2000I20161120-2000I20161119-2000I20161118-2000I20161117-2000I20161116-2000I20161115-2000I20161114-2000I20161114-0355I20161113-2000I20161112-2000I20161112-0405I20161111-2000I20161111-1220I20161111-0900I20161111-0740I20161111-0510I20161110-2030I20161110-1630I20161110-1225I20161110-1130I20161110-0710I20161110-0510I20161109-2000I20161108-1015I20161108-0800

Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>

2 files changed, 8 insertions, 7 deletions

diff --git a/org.eclipse.pde.build.tests/META-INF/MANIFEST.MF b/org.eclipse.pde.build.tests/META-INF/MANIFEST.MF
index 4d811496..15721f00 100644
--- a/org.eclipse.pde.build.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.pde.build.tests/META-INF/MANIFEST.MF
@@ -24,6 +24,7 @@ Import-Package: org.eclipse.equinox.frameworkadmin;version="2.0.0",
  org.eclipse.equinox.internal.p2.metadata,
  org.eclipse.equinox.internal.p2.metadata.repository,
  org.eclipse.equinox.internal.p2.publisher.eclipse,
+ org.eclipse.equinox.internal.p2.repository.helpers,
  org.eclipse.equinox.p2.core;version="[2.0.0,3.0.0)",
  org.eclipse.equinox.p2.internal.repository.tools,
  org.eclipse.equinox.p2.metadata;version="[2.0.0,3.0.0)",
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java
index da12e91e..80288292 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2013 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2008, 2016 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
@@ -19,8 +19,8 @@ import org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepo
 import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
 import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
 import org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository;
+import org.eclipse.equinox.internal.p2.repository.helpers.ChecksumProducer;
 import org.eclipse.equinox.p2.core.IProvisioningAgent;
-import org.eclipse.equinox.p2.internal.repository.tools.RepositoryUtilities;
 import org.eclipse.equinox.p2.metadata.*;
 import org.eclipse.equinox.p2.query.IQueryResult;
 import org.eclipse.equinox.p2.query.QueryUtil;
@@ -140,7 +140,7 @@ public class P2TestCase extends PDETestCase {
 			return;
 
 		IFile artifact = repository.getFile(getArtifactLocation(descriptor));
-		String actualMD5 = RepositoryUtilities.computeMD5(artifact.getLocation().toFile());
+		String actualMD5 = ChecksumProducer.computeMD5(artifact.getLocation().toFile());
 		assertEquals(md5, actualMD5);
 	}
 
@@ -184,7 +184,7 @@ public class P2TestCase extends PDETestCase {
 	}
 
 	public void assertTouchpoint(IInstallableUnit iu, String phase, String action) {
-		Collection/*<ITouchpointData>*/data = iu.getTouchpointData();
+		Collection/*<ITouchpointData>*/ data = iu.getTouchpointData();
 		for (Iterator iter = data.iterator(); iter.hasNext();) {
 			ITouchpointInstruction instruction = ((ITouchpointData) iter.next()).getInstruction(phase);
 			if (instruction != null && instruction.getBody().indexOf(action) > -1)
@@ -194,7 +194,7 @@ public class P2TestCase extends PDETestCase {
 	}
 
 	public void assertProvides(IInstallableUnit iu, String namespace, String name) {
-		Collection/*<IProvidedCapability>*/caps = iu.getProvidedCapabilities();
+		Collection/*<IProvidedCapability>*/ caps = iu.getProvidedCapabilities();
 		for (Iterator iterator = caps.iterator(); iterator.hasNext();) {
 			IProvidedCapability cap = (IProvidedCapability) iterator.next();
 			if (cap.getNamespace().equals(namespace) && cap.getName().equals(name))
@@ -205,7 +205,7 @@ public class P2TestCase extends PDETestCase {
 	}
 
 	public void assertRequires(IInstallableUnit iu, String namespace, String name) {
-		Collection/*<IRequirement>*/reqs = iu.getRequirements();
+		Collection/*<IRequirement>*/ reqs = iu.getRequirements();
 		for (Iterator iterator = reqs.iterator(); iterator.hasNext();) {
 			IRequiredCapability reqCap = (IRequiredCapability) iterator.next();
 			if (reqCap.getNamespace().equals(namespace) && reqCap.getName().equals(name))
@@ -219,7 +219,7 @@ public class P2TestCase extends PDETestCase {
 		outer: for (Iterator iterator = requiredIUs.iterator(); iterator.hasNext();) {
 			IInstallableUnit reqIU = (IInstallableUnit) iterator.next();
 
-			Collection/*<IRequirement>*/reqs = iu.getRequirements();
+			Collection/*<IRequirement>*/ reqs = iu.getRequirements();
 			for (Iterator iterator2 = reqs.iterator(); iterator2.hasNext();) {
 				IRequiredCapability reqCap = (IRequiredCapability) iterator2.next();
 				if (reqCap.getNamespace().equals(IU_NAMESPACE) && reqCap.getName().equals(reqIU.getId()) && reqCap.getRange().isIncluded(reqIU.getVersion())) {