Move method assertMD5 from P2TestCase (which is base class for
LicenseTests, PublishingTests and P2Tests) to P2Tests, a single child
that actually uses it.
Change-Id: I068d476ee9a7eae05cf2214e1dc5d42c039800d8
Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
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 8028829..b0781ab 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
@@ -11,7 +11,6 @@
import java.io.File;
import java.net.URI;
import java.util.*;
-import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.URIUtil;
@@ -19,7 +18,6 @@
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.metadata.*;
import org.eclipse.equinox.p2.query.IQueryResult;
@@ -134,16 +132,6 @@
return baseURI;
}
- public void assertMD5(IFolder repository, IArtifactDescriptor descriptor) throws Exception {
- String md5 = descriptor.getProperty(IArtifactDescriptor.DOWNLOAD_MD5);
- if (md5 == null)
- return;
-
- IFile artifact = repository.getFile(getArtifactLocation(descriptor));
- String actualMD5 = ChecksumProducer.computeMD5(artifact.getLocation().toFile());
- assertEquals(md5, actualMD5);
- }
-
public String getArtifactLocation(IArtifactDescriptor descriptor) {
IArtifactKey key = descriptor.getArtifactKey();
String name = key.getId() + '_' + key.getVersion();
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java
index eab40bb..2e5c6b7 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java
@@ -20,6 +20,7 @@
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;
+import org.eclipse.equinox.internal.p2.repository.helpers.ChecksumProducer;
import org.eclipse.equinox.p2.metadata.IArtifactKey;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.query.IQueryResult;
@@ -576,6 +577,16 @@
}
}
+ private void assertMD5(IFolder repository, IArtifactDescriptor descriptor) throws Exception {
+ String md5 = descriptor.getProperty(IArtifactDescriptor.DOWNLOAD_MD5);
+ if (md5 == null)
+ return;
+
+ IFile artifact = repository.getFile(getArtifactLocation(descriptor));
+ String actualMD5 = ChecksumProducer.computeMD5(artifact.getLocation().toFile());
+ assertEquals(md5, actualMD5);
+ }
+
public void testBug263272() throws Exception {
IFolder buildFolder = newTest("263272");
