diff options
2 files changed, 6 insertions, 8 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/jbdiff/JBDiffZipStepTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/jbdiff/JBDiffZipStepTest.java index 6e5e3e1d3..df55e3cfe 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/jbdiff/JBDiffZipStepTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/jbdiff/JBDiffZipStepTest.java @@ -11,8 +11,6 @@ package org.eclipse.equinox.p2.tests.artifact.optimizers.jbdiff; import java.io.*; -import java.util.Arrays; -import junit.framework.TestCase; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.artifact.optimizers.jbdiff.JBDiffZipStep; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; @@ -20,6 +18,7 @@ import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor; import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; import org.eclipse.equinox.p2.tests.artifact.processor.jbdiff.ArtifactRepositoryMock; import org.eclipse.equinox.p2.tests.artifact.processor.jbdiff.TestArtifactKey; @@ -28,7 +27,7 @@ import org.osgi.framework.Version; /** * Test the <code>JBDiffZipTest</code> processing step. */ -public class JBDiffZipStepTest extends TestCase { +public class JBDiffZipStepTest extends AbstractProvisioningTest { /** * Test diffing the <b>normalized</b> jars. This is indicated by the extension ".njar". @@ -53,7 +52,7 @@ public class JBDiffZipStepTest extends TestCase { inputStream = TestActivator.getContext().getBundle().getEntry("testData/delta/org.eclipse.jdt_3.2.0-3.3.0.jbdiff").openStream(); ByteArrayOutputStream expected = new ByteArrayOutputStream(); FileUtils.copyStream(inputStream, true, expected, true); - assertTrue(Arrays.equals(expected.toByteArray(), destination.toByteArray())); + assertEquals("", expected.toByteArray(), destination.toByteArray()); } /** diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processor/jbdiff/JBPatchZipStepTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processor/jbdiff/JBPatchZipStepTest.java index 6d2624b4f..85e683b31 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processor/jbdiff/JBPatchZipStepTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processor/jbdiff/JBPatchZipStepTest.java @@ -11,8 +11,6 @@ package org.eclipse.equinox.p2.tests.artifact.processor.jbdiff; import java.io.*; -import java.util.Arrays; -import junit.framework.TestCase; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.artifact.processors.jbdiff.JBPatchZipStep; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; @@ -21,13 +19,14 @@ import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep; import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; import org.osgi.framework.Version; /** * Test the <code>JBPatchZipStep</code> processing step. */ -public class JBPatchZipStepTest extends TestCase { +public class JBPatchZipStepTest extends AbstractProvisioningTest { // /** // * This is a disabled "unit test" that was used to generate the data needed for real test. @@ -74,7 +73,7 @@ public class JBPatchZipStepTest extends TestCase { inputStream = TestActivator.getContext().getBundle().getEntry("testData/delta/org.eclipse.jdt_3.3.0.v20070607-1300.njar").openStream(); ByteArrayOutputStream expected = new ByteArrayOutputStream(); FileUtils.copyStream(inputStream, true, expected, true); - assertTrue(Arrays.equals(expected.toByteArray(), destination.toByteArray())); + assertEquals("", expected.toByteArray(), destination.toByteArray()); } /** |