From 9faaed06625f31f3e4f26f65c3cffe4e947604fd Mon Sep 17 00:00:00 2001 From: Thomas Hallgren Date: Fri, 5 Feb 2010 22:07:01 +0000 Subject: 299987 : Removal of p2 services in favor of always using an agent. --- .../tests/artifact/optimizers/JBDiffStepTest.java | 14 +++++--------- .../artifact/optimizers/JBDiffZipStepTest.java | 14 +++++--------- .../artifact/optimizers/JarDeltaOptimizerTest.java | 14 +++++--------- .../tests/artifact/optimizers/OptimizerTest.java | 22 ++++++++++++++++++++++ .../tests/artifact/processors/JBPatchStepTest.java | 15 ++++++--------- .../artifact/processors/JBPatchZipStepTest.java | 15 ++++++--------- .../artifact/processors/JarDeltaProcessorTest.java | 15 ++++++--------- 7 files changed, 55 insertions(+), 54 deletions(-) create mode 100644 bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/OptimizerTest.java (limited to 'bundles/org.eclipse.equinox.p2.tests.optimizers') diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffStepTest.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffStepTest.java index 5e06e758a..ca98076fa 100644 --- a/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffStepTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffStepTest.java @@ -10,29 +10,25 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.artifact.optimizers; -import org.eclipse.equinox.p2.metadata.Version; - -import org.eclipse.equinox.p2.repository.artifact.spi.ProcessingStepDescriptor; - -import org.eclipse.equinox.p2.repository.artifact.IProcessingStepDescriptor; - 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.JBDiffStep; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.metadata.Version; import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; +import org.eclipse.equinox.p2.repository.artifact.IProcessingStepDescriptor; import org.eclipse.equinox.p2.repository.artifact.spi.ArtifactDescriptor; +import org.eclipse.equinox.p2.repository.artifact.spi.ProcessingStepDescriptor; import org.eclipse.equinox.p2.tests.artifact.processors.ArtifactRepositoryMock; import org.eclipse.equinox.p2.tests.optimizers.TestData; /** * Test the JBDiffStepTest processing step. */ -public class JBDiffStepTest extends TestCase { +public class JBDiffStepTest extends OptimizerTest { // public void testGenerateTestDataExe32To33() throws IOException { // File exe32 = TestData.getTempFile("optimizers", "eclipse-3.2.exe"); @@ -53,7 +49,7 @@ public class JBDiffStepTest extends TestCase { IProcessingStepDescriptor stepDescriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0", true); IArtifactKey key = new ArtifactKey("cl", "id1", Version.create("1.1")); ArtifactDescriptor descriptor = new ArtifactDescriptor(key); - differ.initialize(stepDescriptor, descriptor); + differ.initialize(getAgent(), stepDescriptor, descriptor); ByteArrayOutputStream destination = new ByteArrayOutputStream(); differ.link(destination, new NullProgressMonitor()); diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffZipStepTest.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffZipStepTest.java index b654cc923..9a0a818e7 100644 --- a/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffZipStepTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffZipStepTest.java @@ -10,29 +10,25 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.artifact.optimizers; -import org.eclipse.equinox.p2.metadata.Version; - -import org.eclipse.equinox.p2.repository.artifact.spi.ProcessingStepDescriptor; - -import org.eclipse.equinox.p2.repository.artifact.IProcessingStepDescriptor; - 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; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.metadata.Version; import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; +import org.eclipse.equinox.p2.repository.artifact.IProcessingStepDescriptor; import org.eclipse.equinox.p2.repository.artifact.spi.ArtifactDescriptor; +import org.eclipse.equinox.p2.repository.artifact.spi.ProcessingStepDescriptor; import org.eclipse.equinox.p2.tests.artifact.processors.ArtifactRepositoryMock; import org.eclipse.equinox.p2.tests.optimizers.TestData; /** * Test the JBDiffZipTest processing step. */ -public class JBDiffZipStepTest extends TestCase { +public class JBDiffZipStepTest extends OptimizerTest { /** * Test diffing the normalized jars. This is indicated by the extension ".njar". @@ -45,7 +41,7 @@ public class JBDiffZipStepTest extends TestCase { IProcessingStepDescriptor stepDescriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0", true); IArtifactKey key = new ArtifactKey("cl", "id1", Version.create("1.1")); ArtifactDescriptor descriptor = new ArtifactDescriptor(key); - differ.initialize(stepDescriptor, descriptor); + differ.initialize(getAgent(), stepDescriptor, descriptor); ByteArrayOutputStream destination = new ByteArrayOutputStream(); differ.link(destination, new NullProgressMonitor()); diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JarDeltaOptimizerTest.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JarDeltaOptimizerTest.java index a53fc4cbc..ea17138c8 100644 --- a/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JarDeltaOptimizerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JarDeltaOptimizerTest.java @@ -11,30 +11,26 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.artifact.optimizers; -import org.eclipse.equinox.p2.metadata.Version; - -import org.eclipse.equinox.p2.repository.artifact.spi.ProcessingStepDescriptor; - -import org.eclipse.equinox.p2.repository.artifact.IProcessingStepDescriptor; - import java.io.*; import java.util.zip.ZipInputStream; -import junit.framework.TestCase; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.artifact.optimizers.jardelta.JarDeltaOptimizerStep; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.metadata.Version; import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; +import org.eclipse.equinox.p2.repository.artifact.IProcessingStepDescriptor; import org.eclipse.equinox.p2.repository.artifact.spi.ArtifactDescriptor; +import org.eclipse.equinox.p2.repository.artifact.spi.ProcessingStepDescriptor; import org.eclipse.equinox.p2.tests.artifact.processors.ArtifactRepositoryMock; import org.eclipse.equinox.p2.tests.optimizers.TestData; /** * Test the JarDelta processing step. */ -public class JarDeltaOptimizerTest extends TestCase { +public class JarDeltaOptimizerTest extends OptimizerTest { // public void testPrepare() throws IOException { // IArtifactRepository repoMock = ArtifactRepositoryMock.getMock("testData/optimizers/testdata_1.0.0.1.jar"); @@ -61,7 +57,7 @@ public class JarDeltaOptimizerTest extends TestCase { IProcessingStepDescriptor stepDescriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0.0.1", true); IArtifactKey key = new ArtifactKey("cl", "id1", Version.create("1.0.0.2")); ArtifactDescriptor descriptor = new ArtifactDescriptor(key); - step.initialize(stepDescriptor, descriptor); + step.initialize(getAgent(), stepDescriptor, descriptor); ByteArrayOutputStream destination = new ByteArrayOutputStream(); step.link(destination, new NullProgressMonitor()); diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/OptimizerTest.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/OptimizerTest.java new file mode 100644 index 000000000..7e9bb3987 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/OptimizerTest.java @@ -0,0 +1,22 @@ +package org.eclipse.equinox.p2.tests.artifact.optimizers; + +import junit.framework.TestCase; +import org.eclipse.equinox.internal.p2.artifact.optimizers.Activator; +import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; +import org.eclipse.equinox.p2.core.IProvisioningAgent; + +public abstract class OptimizerTest extends TestCase { + public OptimizerTest(String name) { + super(name); + } + + public OptimizerTest() { + super(); + } + + protected static IProvisioningAgent getAgent() { + //get the global agent for the currently running system + return (IProvisioningAgent) ServiceHelper.getService(Activator.getContext(), IProvisioningAgent.SERVICE_NAME); + } + +} diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchStepTest.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchStepTest.java index 29a6b2162..1405e12c2 100644 --- a/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchStepTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchStepTest.java @@ -10,30 +10,27 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.artifact.processors; -import org.eclipse.equinox.p2.metadata.Version; - -import org.eclipse.equinox.p2.repository.artifact.spi.ProcessingStepDescriptor; - -import org.eclipse.equinox.p2.repository.artifact.IProcessingStepDescriptor; - 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.JBPatchStep; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.metadata.Version; import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; +import org.eclipse.equinox.p2.repository.artifact.IProcessingStepDescriptor; import org.eclipse.equinox.p2.repository.artifact.spi.ArtifactDescriptor; +import org.eclipse.equinox.p2.repository.artifact.spi.ProcessingStepDescriptor; +import org.eclipse.equinox.p2.tests.artifact.optimizers.OptimizerTest; import org.eclipse.equinox.p2.tests.optimizers.TestData; /** * Test the JBPatchStep * */ -public class JBPatchStepTest extends TestCase { +public class JBPatchStepTest extends OptimizerTest { public void testPatchEclipseExe32to33() throws IOException { IArtifactRepository repoMock = ArtifactRepositoryMock.getMock("testData/optimizers/eclipse-3.2.exe"); @@ -41,7 +38,7 @@ public class JBPatchStepTest extends TestCase { IProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0", true); IArtifactKey key = new ArtifactKey("cl", "id1", Version.create("1.1")); ArtifactDescriptor context = new ArtifactDescriptor(key); - patcher.initialize(descriptor, context); + patcher.initialize(getAgent(), descriptor, context); ByteArrayOutputStream destination = new ByteArrayOutputStream(); patcher.link(destination, new NullProgressMonitor()); diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchZipStepTest.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchZipStepTest.java index 61e0a92ed..c5c921916 100644 --- a/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchZipStepTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchZipStepTest.java @@ -10,29 +10,26 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.artifact.processors; -import org.eclipse.equinox.p2.metadata.Version; - -import org.eclipse.equinox.p2.repository.artifact.spi.ProcessingStepDescriptor; - -import org.eclipse.equinox.p2.repository.artifact.IProcessingStepDescriptor; - 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; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.metadata.Version; import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; +import org.eclipse.equinox.p2.repository.artifact.IProcessingStepDescriptor; import org.eclipse.equinox.p2.repository.artifact.spi.ArtifactDescriptor; +import org.eclipse.equinox.p2.repository.artifact.spi.ProcessingStepDescriptor; +import org.eclipse.equinox.p2.tests.artifact.optimizers.OptimizerTest; import org.eclipse.equinox.p2.tests.optimizers.TestData; /** * Test the JBPatchZipStep processing step. */ -public class JBPatchZipStepTest extends TestCase { +public class JBPatchZipStepTest extends OptimizerTest { // /** // * This is a disabled "unit test" that was used to generate the data needed for real test. @@ -59,7 +56,7 @@ public class JBPatchZipStepTest extends TestCase { IProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0", true); IArtifactKey key = new ArtifactKey("cl", "id1", Version.create("1.1")); ArtifactDescriptor context = new ArtifactDescriptor(key); - patcher.initialize(descriptor, context); + patcher.initialize(getAgent(), descriptor, context); ByteArrayOutputStream destination = new ByteArrayOutputStream(); patcher.link(destination, new NullProgressMonitor()); diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/JarDeltaProcessorTest.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/JarDeltaProcessorTest.java index 8654d61e8..7ec8dc3c7 100644 --- a/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/JarDeltaProcessorTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/JarDeltaProcessorTest.java @@ -11,26 +11,23 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.artifact.processors; -import org.eclipse.equinox.p2.metadata.Version; - -import org.eclipse.equinox.p2.repository.artifact.spi.ProcessingStepDescriptor; - -import org.eclipse.equinox.p2.repository.artifact.IProcessingStepDescriptor; - import java.io.*; import java.util.zip.ZipInputStream; -import junit.framework.TestCase; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.artifact.processors.jardelta.JarDeltaProcessorStep; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.metadata.Version; import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; +import org.eclipse.equinox.p2.repository.artifact.IProcessingStepDescriptor; import org.eclipse.equinox.p2.repository.artifact.spi.ArtifactDescriptor; +import org.eclipse.equinox.p2.repository.artifact.spi.ProcessingStepDescriptor; +import org.eclipse.equinox.p2.tests.artifact.optimizers.OptimizerTest; import org.eclipse.equinox.p2.tests.optimizers.TestData; -public class JarDeltaProcessorTest extends TestCase { +public class JarDeltaProcessorTest extends OptimizerTest { public JarDeltaProcessorTest(String name) { super(name); @@ -46,7 +43,7 @@ public class JarDeltaProcessorTest extends TestCase { IProcessingStepDescriptor stepDescriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0.0.1", true); IArtifactKey key = new ArtifactKey("cl", "id1", Version.create("1.0.0.2")); ArtifactDescriptor descriptor = new ArtifactDescriptor(key); - step.initialize(stepDescriptor, descriptor); + step.initialize(getAgent(), stepDescriptor, descriptor); ByteArrayOutputStream destination = new ByteArrayOutputStream(); step.link(destination, new NullProgressMonitor()); -- cgit v1.2.3