diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests.optimizers')
8 files changed, 63 insertions, 46 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tests.optimizers/META-INF/MANIFEST.MF index b453b2380..aca89fba1 100644 --- a/bundles/org.eclipse.equinox.p2.tests.optimizers/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/META-INF/MANIFEST.MF @@ -21,7 +21,6 @@ Import-Package: ie.wombat.jbdiff, org.eclipse.equinox.internal.p2.core.helpers, org.eclipse.equinox.internal.p2.metadata, org.eclipse.equinox.internal.p2.sar, - org.eclipse.equinox.internal.provisional.p2.artifact.repository, org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing, org.eclipse.equinox.internal.provisional.p2.metadata, org.eclipse.equinox.internal.provisional.p2.repository, 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 eb0a24997..5e06e758a 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,7 +10,11 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.artifact.optimizers; -import org.eclipse.equinox.internal.provisional.p2.metadata.Version; +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; @@ -19,10 +23,9 @@ 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.internal.provisional.p2.artifact.repository.ArtifactDescriptor; -import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; +import org.eclipse.equinox.p2.repository.artifact.spi.ArtifactDescriptor; import org.eclipse.equinox.p2.tests.artifact.processors.ArtifactRepositoryMock; import org.eclipse.equinox.p2.tests.optimizers.TestData; @@ -47,8 +50,8 @@ public class JBDiffStepTest extends TestCase { IArtifactRepository repoMock = ArtifactRepositoryMock.getMock("testData/optimizers/eclipse-3.2.exe"); MockableJBDiffStep differ = new MockableJBDiffStep(repoMock); - ProcessingStepDescriptor stepDescriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0", true); - IArtifactKey key = new ArtifactKey("cl", "id1", new Version("1.1")); + 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); 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 53fdbcf3b..b654cc923 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,7 +10,11 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.artifact.optimizers; -import org.eclipse.equinox.internal.provisional.p2.metadata.Version; +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; @@ -19,10 +23,9 @@ 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.internal.provisional.p2.artifact.repository.ArtifactDescriptor; -import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; +import org.eclipse.equinox.p2.repository.artifact.spi.ArtifactDescriptor; import org.eclipse.equinox.p2.tests.artifact.processors.ArtifactRepositoryMock; import org.eclipse.equinox.p2.tests.optimizers.TestData; @@ -39,8 +42,8 @@ public class JBDiffZipStepTest extends TestCase { public void testDiffJdt32to33() throws IOException { IArtifactRepository repoMock = ArtifactRepositoryMock.getMock("testData/optimizers/org.eclipse.jdt_3.2.0.v20060605-1400.njar"); MockableJBDiffZipStep differ = new MockableJBDiffZipStep(repoMock); - ProcessingStepDescriptor stepDescriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0", true); - IArtifactKey key = new ArtifactKey("cl", "id1", new Version("1.1")); + 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); 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 e9c69085d..a53fc4cbc 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,7 +11,11 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.artifact.optimizers; -import org.eclipse.equinox.internal.provisional.p2.metadata.Version; +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; @@ -20,11 +24,10 @@ 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.ArtifactDescriptor; -import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; +import org.eclipse.equinox.p2.repository.artifact.spi.ArtifactDescriptor; import org.eclipse.equinox.p2.tests.artifact.processors.ArtifactRepositoryMock; import org.eclipse.equinox.p2.tests.optimizers.TestData; @@ -37,7 +40,7 @@ public class JarDeltaOptimizerTest extends TestCase { // IArtifactRepository repoMock = ArtifactRepositoryMock.getMock("testData/optimizers/testdata_1.0.0.1.jar"); // ProcessingStep step = new MockableJarDeltaOptimizerStep(repoMock); // ProcessingStepDescriptor stepDescriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0.0.1", true); - // IArtifactKey key = new ArtifactKey("ns", "cl", "id1", new Version("1.0.0.2")); + // IArtifactKey key = new ArtifactKey("ns", "cl", "id1", Version.create("1.0.0.2")); // ArtifactDescriptor descriptor = new ArtifactDescriptor(key); // step.initialize(stepDescriptor, descriptor); // ByteArrayOutputStream destination = new ByteArrayOutputStream(); @@ -55,8 +58,8 @@ public class JarDeltaOptimizerTest extends TestCase { public void testOptimization() throws IOException { IArtifactRepository repoMock = ArtifactRepositoryMock.getMock("testData/optimizers/testdata_1.0.0.1.jar"); ProcessingStep step = new MockableJarDeltaOptimizerStep(repoMock); - ProcessingStepDescriptor stepDescriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0.0.1", true); - IArtifactKey key = new ArtifactKey("cl", "id1", new Version("1.0.0.2")); + 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); ByteArrayOutputStream destination = new ByteArrayOutputStream(); diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/ArtifactRepositoryMock.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/ArtifactRepositoryMock.java index fe1a13df9..49d63936f 100644 --- a/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/ArtifactRepositoryMock.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/ArtifactRepositoryMock.java @@ -14,8 +14,8 @@ import java.io.*; import java.lang.reflect.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; -import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor; -import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor; +import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; import org.eclipse.equinox.p2.tests.optimizers.TestActivator; /** 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 bceff17eb..29a6b2162 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,7 +10,11 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.artifact.processors; -import org.eclipse.equinox.internal.provisional.p2.metadata.Version; +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; @@ -19,11 +23,10 @@ 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.ArtifactDescriptor; -import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; +import org.eclipse.equinox.p2.repository.artifact.spi.ArtifactDescriptor; import org.eclipse.equinox.p2.tests.optimizers.TestData; /** @@ -35,8 +38,8 @@ public class JBPatchStepTest extends TestCase { public void testPatchEclipseExe32to33() throws IOException { IArtifactRepository repoMock = ArtifactRepositoryMock.getMock("testData/optimizers/eclipse-3.2.exe"); ProcessingStep patcher = new MockableJBPatchStep(repoMock); - ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0", true); - IArtifactKey key = new ArtifactKey("cl", "id1", new Version("1.1")); + 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); 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 7eb16eb2b..61e0a92ed 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,7 +10,11 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.artifact.processors; -import org.eclipse.equinox.internal.provisional.p2.metadata.Version; +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; @@ -19,11 +23,10 @@ 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.ArtifactDescriptor; -import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; +import org.eclipse.equinox.p2.repository.artifact.spi.ArtifactDescriptor; import org.eclipse.equinox.p2.tests.optimizers.TestData; /** @@ -53,8 +56,8 @@ public class JBPatchZipStepTest extends TestCase { IArtifactRepository repoMock = ArtifactRepositoryMock.getMock("testData/optimizers/org.eclipse.jdt_3.2.0.v20060605-1400.njar"); ProcessingStep patcher = new MockableJBPatchZipStep(repoMock); - ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0", true); - IArtifactKey key = new ArtifactKey("cl", "id1", new Version("1.1")); + 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); 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 c2d251db0..8654d61e8 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,7 +11,11 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.artifact.processors; -import org.eclipse.equinox.internal.provisional.p2.metadata.Version; +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; @@ -20,11 +24,10 @@ 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.ArtifactDescriptor; -import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; +import org.eclipse.equinox.p2.repository.artifact.spi.ArtifactDescriptor; import org.eclipse.equinox.p2.tests.optimizers.TestData; public class JarDeltaProcessorTest extends TestCase { @@ -40,8 +43,8 @@ public class JarDeltaProcessorTest extends TestCase { public void testProcessing() throws IOException { IArtifactRepository repoMock = ArtifactRepositoryMock.getMock("testData/optimizers/testdata_1.0.0.1.jar"); ProcessingStep step = new MockableJarDeltaProcessorStep(repoMock); - ProcessingStepDescriptor stepDescriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0.0.1", true); - IArtifactKey key = new ArtifactKey("cl", "id1", new Version("1.0.0.2")); + 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); ByteArrayOutputStream destination = new ByteArrayOutputStream(); |