diff options
55 files changed, 359 insertions, 53 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/.classpath b/bundles/org.eclipse.equinox.p2.tests.optimizers/.classpath new file mode 100644 index 000000000..2fbb7a23e --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/.project b/bundles/org.eclipse.equinox.p2.tests.optimizers/.project new file mode 100644 index 000000000..2bc9a3891 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.equinox.p2.tests.optimizers</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.p2.tests.optimizers/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..8114580e9 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +#Tue Apr 08 11:13:27 EDT 2008 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.3 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 new file mode 100644 index 000000000..e16100c27 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/META-INF/MANIFEST.MF @@ -0,0 +1,31 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: p2 Optimizers Test Plug-in +Bundle-SymbolicName: org.eclipse.equinox.p2.tests.optimizers;singleton:=true +Bundle-Version: 1.0.0.qualifier +Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Require-Bundle: org.eclipse.equinox.common;bundle-version="3.4.0", + org.junit;bundle-version="3.8.2" +Export-Package: org.eclipse.equinox.p2.tests.artifact.optimizers, + org.eclipse.equinox.p2.tests.artifact.processors, + org.eclipse.equinox.p2.tests.artifact.repository.processing, + org.eclipse.equinox.p2.tests.sar +Import-Package: ie.wombat.jbdiff, + org.eclipse.equinox.internal.p2.artifact.optimizers, + org.eclipse.equinox.internal.p2.artifact.optimizers.jardelta, + org.eclipse.equinox.internal.p2.artifact.optimizers.jbdiff, + org.eclipse.equinox.internal.p2.artifact.optimizers.pack200, + org.eclipse.equinox.internal.p2.artifact.processors.jardelta, + org.eclipse.equinox.internal.p2.artifact.processors.jbdiff, + org.eclipse.equinox.internal.p2.artifact.processors.pack200, + org.eclipse.equinox.internal.p2.artifact.processors.verifier, + org.eclipse.equinox.internal.p2.artifact.repository, + 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.osgi.framework;version="1.4.0" +Bundle-ActivationPolicy: lazy +Bundle-Activator: org.eclipse.equinox.p2.tests.optimizers.TestActivator diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/build.properties b/bundles/org.eclipse.equinox.p2.tests.optimizers/build.properties new file mode 100644 index 000000000..c832c5c21 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/build.properties @@ -0,0 +1,6 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml,\ + testData/ diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/plugin.xml b/bundles/org.eclipse.equinox.p2.tests.optimizers/plugin.xml new file mode 100644 index 000000000..d9646386c --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/plugin.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.2"?> +<plugin> + <extension + point="org.eclipse.equinox.p2.artifact.repository.processingSteps" + id="org.eclipse.equinox.p2.processing.ByteShifter"> + <step class="org.eclipse.equinox.p2.tests.artifact.repository.processing.ByteShifter"/> + </extension> + + <extension + point="org.eclipse.equinox.p2.artifact.repository.processingSteps" + id="org.eclipse.equinox.p2.processing.Adder"> + <step class="org.eclipse.equinox.p2.tests.artifact.repository.processing.Adder"/> + </extension> + + <extension + point="org.eclipse.equinox.p2.artifact.repository.processingSteps" + id="org.eclipse.equinox.p2.processing.Multiplier"> + <step class="org.eclipse.equinox.p2.tests.artifact.repository.processing.Multiplier"/> + </extension> +</plugin> diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/AllTests.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/AllTests.java index 194be73c0..194be73c0 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/AllTests.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/AllTests.java diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/Bug209233Test.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/Bug209233Test.java index 44fac3453..97abc5de4 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/Bug209233Test.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/Bug209233Test.java @@ -15,7 +15,7 @@ import java.io.*; import java.util.Arrays; import junit.framework.TestCase; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; -import org.eclipse.equinox.p2.tests.TestData; +import org.eclipse.equinox.p2.tests.optimizers.TestData; /** * ... <code>Bug209233Test</code> ... diff --git a/bundles/org.eclipse.equinox.p2.tests/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 432c67d26..07501ff5c 100644 --- a/bundles/org.eclipse.equinox.p2.tests/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 @@ -21,8 +21,8 @@ import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactD 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.tests.TestData; import org.eclipse.equinox.p2.tests.artifact.processors.ArtifactRepositoryMock; +import org.eclipse.equinox.p2.tests.optimizers.TestData; import org.osgi.framework.Version; /** diff --git a/bundles/org.eclipse.equinox.p2.tests/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 cc04242a6..7fb727394 100644 --- a/bundles/org.eclipse.equinox.p2.tests/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 @@ -12,6 +12,7 @@ package org.eclipse.equinox.p2.tests.artifact.optimizers; 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,15 +21,14 @@ import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactD 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.tests.AbstractProvisioningTest; -import org.eclipse.equinox.p2.tests.TestData; import org.eclipse.equinox.p2.tests.artifact.processors.ArtifactRepositoryMock; +import org.eclipse.equinox.p2.tests.optimizers.TestData; import org.osgi.framework.Version; /** * Test the <code>JBDiffZipTest</code> processing step. */ -public class JBDiffZipStepTest extends AbstractProvisioningTest { +public class JBDiffZipStepTest extends TestCase { /** * Test diffing the <b>normalized</b> jars. This is indicated by the extension ".njar". diff --git a/bundles/org.eclipse.equinox.p2.tests/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 abed5061f..dd6595e12 100644 --- a/bundles/org.eclipse.equinox.p2.tests/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 @@ -23,8 +23,8 @@ import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifact 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.tests.TestData; import org.eclipse.equinox.p2.tests.artifact.processors.ArtifactRepositoryMock; +import org.eclipse.equinox.p2.tests.optimizers.TestData; import org.osgi.framework.Version; /** diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/Pack200OptimizerTest.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/Pack200OptimizerTest.java index adfbf0ab8..f61c78883 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/Pack200OptimizerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/Pack200OptimizerTest.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.artifact.optimizers.pack200.Pack200OptimizerStep; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.p2.tests.TestActivator; +import org.eclipse.equinox.p2.tests.optimizers.TestActivator; import org.osgi.framework.Bundle; public class Pack200OptimizerTest extends TestCase { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/AllTests.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/AllTests.java index ab6d5f8cd..ab6d5f8cd 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/AllTests.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/AllTests.java diff --git a/bundles/org.eclipse.equinox.p2.tests/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 85c85c1e1..a2939aed2 100644 --- a/bundles/org.eclipse.equinox.p2.tests/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 @@ -16,7 +16,7 @@ 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.tests.TestActivator; +import org.eclipse.equinox.p2.tests.optimizers.TestActivator; /** * Mock the getArtifact() needed to locate the predecessor. @@ -47,7 +47,7 @@ public class ArtifactRepositoryMock implements InvocationHandler { FileUtils.copyStream(inputStream, true, destination, true); return Status.OK_STATUS; } catch (IOException e) { - return new Status(IStatus.ERROR, TestActivator.PI_PROV_TESTS, ":-(", e); + return new Status(IStatus.ERROR, TestActivator.PI, ":-(", e); } } }
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.p2.tests/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 128f2474a..77eee5c0d 100644 --- a/bundles/org.eclipse.equinox.p2.tests/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 @@ -22,7 +22,7 @@ import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifact 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.tests.TestData; +import org.eclipse.equinox.p2.tests.optimizers.TestData; import org.osgi.framework.Version; /** diff --git a/bundles/org.eclipse.equinox.p2.tests/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 58efb35ba..fb73e93fb 100644 --- a/bundles/org.eclipse.equinox.p2.tests/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 @@ -12,6 +12,7 @@ package org.eclipse.equinox.p2.tests.artifact.processors; 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,14 +22,13 @@ import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifact 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.tests.AbstractProvisioningTest; -import org.eclipse.equinox.p2.tests.TestData; +import org.eclipse.equinox.p2.tests.optimizers.TestData; import org.osgi.framework.Version; /** * Test the <code>JBPatchZipStep</code> processing step. */ -public class JBPatchZipStepTest extends AbstractProvisioningTest { +public class JBPatchZipStepTest extends TestCase { // /** // * This is a disabled "unit test" that was used to generate the data needed for real test. diff --git a/bundles/org.eclipse.equinox.p2.tests/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 85dd261d0..a20d72de5 100644 --- a/bundles/org.eclipse.equinox.p2.tests/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 @@ -23,7 +23,7 @@ import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifact 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.tests.TestData; +import org.eclipse.equinox.p2.tests.optimizers.TestData; import org.osgi.framework.Version; public class JarDeltaProcessorTest extends TestCase { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/Pack200ProcessorTest.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/Pack200ProcessorTest.java index 6b1f6b201..12b765095 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/Pack200ProcessorTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/Pack200ProcessorTest.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.artifact.processors.pack200.Pack200ProcessorStep; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.p2.tests.TestActivator; +import org.eclipse.equinox.p2.tests.optimizers.TestActivator; import org.osgi.framework.Bundle; public class Pack200ProcessorTest extends TestCase { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Adder.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Adder.java index 50b7840c9..50b7840c9 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Adder.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Adder.java diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/AllTests.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/AllTests.java index 0eb941c04..0eb941c04 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/AllTests.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/AllTests.java diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ByteShifter.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ByteShifter.java index ff6e04ee6..ff6e04ee6 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ByteShifter.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ByteShifter.java diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java index 008b05370..008b05370 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Multiplier.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Multiplier.java index 4dae1cc20..4dae1cc20 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Multiplier.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Multiplier.java diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepHandlerTest.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepHandlerTest.java index 766255908..14293a951 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepHandlerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepHandlerTest.java @@ -19,7 +19,7 @@ import org.eclipse.equinox.internal.p2.artifact.processors.pack200.Pack200Proces import org.eclipse.equinox.internal.p2.artifact.processors.verifier.MD5Verifier; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.*; -import org.eclipse.equinox.p2.tests.TestActivator; +import org.eclipse.equinox.p2.tests.optimizers.TestActivator; public class ProcessingStepHandlerTest extends TestCase { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepTest.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepTest.java index c77e074fc..c77e074fc 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepTest.java diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/optimizers/AutomatedTests.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/optimizers/AutomatedTests.java new file mode 100644 index 000000000..96b52a872 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/optimizers/AutomatedTests.java @@ -0,0 +1,29 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.eclipse.equinox.p2.tests.optimizers; + +import junit.framework.*; + +/** + * @since 1.0 + */ +public class AutomatedTests extends TestCase { + + public static Test suite() { + TestSuite suite = new TestSuite(AutomatedTests.class.getName()); + suite.addTest(org.eclipse.equinox.p2.tests.artifact.optimizers.AllTests.suite()); + suite.addTest(org.eclipse.equinox.p2.tests.artifact.processors.AllTests.suite()); + suite.addTest(org.eclipse.equinox.p2.tests.artifact.repository.processing.AllTests.suite()); + suite.addTest(org.eclipse.equinox.p2.tests.sar.AllTests.suite()); + return suite; + } + +} diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/optimizers/TestActivator.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/optimizers/TestActivator.java new file mode 100644 index 000000000..cd6876056 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/optimizers/TestActivator.java @@ -0,0 +1,42 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.eclipse.equinox.p2.tests.optimizers; + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +/** + * @since 1.0 + */ +public class TestActivator implements BundleActivator { + + public static final String PI = "org.eclipse.equinox.p2.tests.optimizers"; //$NON-NLS-1$ + private static BundleContext bundleContext; + + /* (non-Javadoc) + * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + bundleContext = context; + } + + /* (non-Javadoc) + * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + bundleContext = null; + } + + public static BundleContext getContext() { + return bundleContext; + } + +} diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/optimizers/TestData.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/optimizers/TestData.java new file mode 100644 index 000000000..464fa1e77 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/optimizers/TestData.java @@ -0,0 +1,168 @@ +/******************************************************************************* + * Copyright (c) 2007 compeople AG 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 + * + * Contributors: + * compeople AG (Stefan Liebig) - initial API and implementation + * Red Hat, Inc. (Andrew Overholt) - add getFile method + *******************************************************************************/ +package org.eclipse.equinox.p2.tests.optimizers; + +import java.io.*; +import java.util.*; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; +import junit.framework.Assert; +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; + +/** + * <code>TestData</code> helps with handling of test data. + */ +public class TestData { + + private static final String TEST_DATA_ROOT_FOLDER = "testData"; + private static final String PREFIX_SEPERATOR = "~"; + + /** + * Get an input stream from the resource testDataName within the folder + * testDataFolder of the testData folder of this project. + * @param testDataFolder + * @param testDataName + * @return input stream for the test data + * @throws IOException + */ + public static InputStream get(String testDataFolder, String testDataName) throws IOException { + return new BufferedInputStream(TestActivator.getContext().getBundle().getEntry(TEST_DATA_ROOT_FOLDER + "/" + testDataFolder + "/" + testDataName).openStream()); + } + + /** + * Get a File from the resource testDataName within the folder + * testDataFolder of the testData folder of this project. + * @param testDataFolder + * @return test data File + * @throws IOException + */ + public static File getFile(String testDataFolder, String testDataName) throws IOException { + return new File(FileLocator.toFileURL(TestActivator.getContext().getBundle().getEntry(TEST_DATA_ROOT_FOLDER + "/" + testDataFolder + "/" + testDataName)).getPath()); + } + + /** + * Create a temporary file for the test data. The temporary file will be deleted + * when the jvm exists. If testDataName contains an extension this extension will + * be used as suffix for the temporary file. + * @param testDataFolder + * @param testDataName + * @return temporary file with test data + * @throws IOException + */ + public static File getTempFile(String testDataFolder, String testDataName) throws IOException { + File temp = createTempFile(testDataName); + OutputStream out = new FileOutputStream(temp); + FileUtils.copyStream(get(testDataFolder, testDataName), true, out, true); + return temp; + } + + /** + * Create a temporary file. This file will be deleted if the jvm exits. + * If testDataName contains an extension this extension will be used as + * suffix for the temporary file. + * @param testDataName + * @return temporary file + * @throws IOException + */ + public static File createTempFile(String testDataName) throws IOException { + int i = testDataName.lastIndexOf('.'); + File temp = (i == -1) ? File.createTempFile(testDataName + PREFIX_SEPERATOR, ".tmp") : File.createTempFile(testDataName.substring(0, i) + PREFIX_SEPERATOR, testDataName.substring(i)); + temp.deleteOnExit(); + return temp; + } + + /** + * Assert equality of files. + * @param expected + * @param actual + * @throws IOException + */ + public static void assertEquals(File expected, File actual) throws IOException { + Assert.assertEquals("Files have different lengths.", expected.length(), actual.length()); + TestData.assertEquals(new BufferedInputStream(new FileInputStream(expected)), new BufferedInputStream(new FileInputStream(actual))); + } + + /** + * Assert equality of input streams. + * @param expected + * @param actual + * @throws IOException + */ + public static void assertEquals(InputStream expected, InputStream actual) throws IOException { + try { + int readExpected = 0; + int readActual = 0; + int count = 0; + while (readActual != -1 && readExpected != -1) { + readActual = actual.read(); + readExpected = expected.read(); + Assert.assertEquals("Different bytes at " + count, readExpected, readActual); + count++; + } + } finally { + if (expected != null) + expected.close(); + if (actual != null) + actual.close(); + } + } + + /** + * Assert equality of zip input streams. + * @param input1 + * @param input2 + * @throws IOException + */ + public static void assertEquals(ZipInputStream input1, ZipInputStream input2) throws IOException { + Map jar1 = getEntries(input1); + Map jar2 = getEntries(input2); + for (Iterator i = jar1.keySet().iterator(); i.hasNext();) { + String name = (String) i.next(); + Object[] file1 = (Object[]) jar1.get(name); + Object[] file2 = (Object[]) jar2.remove(name); + Assert.assertNotNull(file2); + + ZipEntry entry1 = (ZipEntry) file1[0]; + ZipEntry entry2 = (ZipEntry) file2[0]; + // compare the entries + Assert.assertTrue(entry1.getName().equals(entry2.getName())); + Assert.assertTrue(entry1.getSize() == entry2.getSize()); + // TODO for now skip over the timestamp as they seem to be different + // assertTrue(entry1.getTime() == entry2.getTime()); + Assert.assertTrue(entry1.isDirectory() == entry2.isDirectory()); + Assert.assertTrue(entry1.getCrc() == entry2.getCrc()); + Assert.assertTrue(entry1.getMethod() == entry2.getMethod()); + + // check the content of the entries + Assert.assertTrue(Arrays.equals((byte[]) file1[1], (byte[]) file2[1])); + } + + // ensure that we have consumed all of the entries in the second JAR + Assert.assertTrue(jar2.size() == 0); + } + + private static Map getEntries(ZipInputStream input) throws IOException { + Map result = new HashMap(); + while (true) { + ZipEntry entry = input.getNextEntry(); + if (entry == null) + return result; + + ByteArrayOutputStream content = new ByteArrayOutputStream(); + FileUtils.copyStream(input, false, content, true); + input.closeEntry(); + result.put(entry.getName(), new Object[] {entry, content.toByteArray()}); + } + } + +}
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sar/AllTests.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/sar/AllTests.java index af49c8c26..af49c8c26 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sar/AllTests.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/sar/AllTests.java diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sar/DirectByteArrayOutputStreamTest.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/sar/DirectByteArrayOutputStreamTest.java index d98ae78e7..d98ae78e7 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sar/DirectByteArrayOutputStreamTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/sar/DirectByteArrayOutputStreamTest.java diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sar/SarTest.java b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/sar/SarTest.java index 4d172388a..1811889e1 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sar/SarTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/sar/SarTest.java @@ -14,7 +14,7 @@ import java.io.*; import java.util.Arrays; import junit.framework.TestCase; import org.eclipse.equinox.internal.p2.sar.SarUtil; -import org.eclipse.equinox.p2.tests.TestData; +import org.eclipse.equinox.p2.tests.optimizers.TestData; /** * Test the sar stuff. diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/jarprocessor.jar.pack.gz b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/jarprocessor.jar.pack.gz Binary files differnew file mode 100644 index 000000000..f2df489b2 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/jarprocessor.jar.pack.gz diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/1_6/org.eclipse.equinox.app_1.0.100.v20071015.jar.pack.gz b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/1_6/org.eclipse.equinox.app_1.0.100.v20071015.jar.pack.gz Binary files differnew file mode 100644 index 000000000..9f52ad35f --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/1_6/org.eclipse.equinox.app_1.0.100.v20071015.jar.pack.gz diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/eclipse-3.2-3.3.jbdiff b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/eclipse-3.2-3.3.jbdiff Binary files differnew file mode 100644 index 000000000..deac744b8 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/eclipse-3.2-3.3.jbdiff diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/eclipse-3.2.exe b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/eclipse-3.2.exe Binary files differnew file mode 100644 index 000000000..7826d1ed8 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/eclipse-3.2.exe diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/eclipse-3.3.exe b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/eclipse-3.3.exe Binary files differnew file mode 100644 index 000000000..c5cd8f038 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/eclipse-3.3.exe diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/org.eclipse.equinox.app_1.0.100.v20071015.jar b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/org.eclipse.equinox.app_1.0.100.v20071015.jar Binary files differnew file mode 100644 index 000000000..0c809eeed --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/org.eclipse.equinox.app_1.0.100.v20071015.jar diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/org.eclipse.equinox.app_1.0.100.v20071015.jar.pack.gz b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/org.eclipse.equinox.app_1.0.100.v20071015.jar.pack.gz Binary files differnew file mode 100644 index 000000000..b586d3cc8 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/org.eclipse.equinox.app_1.0.100.v20071015.jar.pack.gz diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/org.eclipse.jdt_3.2.0-3.3.0.jbdiff b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/org.eclipse.jdt_3.2.0-3.3.0.jbdiff Binary files differnew file mode 100644 index 000000000..b920d53bb --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/org.eclipse.jdt_3.2.0-3.3.0.jbdiff diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/org.eclipse.jdt_3.2.0.v20060605-1400.njar b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/org.eclipse.jdt_3.2.0.v20060605-1400.njar Binary files differnew file mode 100644 index 000000000..41ee47bcc --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/org.eclipse.jdt_3.2.0.v20060605-1400.njar diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sar/org.eclipse.jdt_3.3.0.v20070607-1300.jar b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/org.eclipse.jdt_3.3.0.v20070607-1300.njar Binary files differindex 9deec2f0e..9deec2f0e 100644 --- a/bundles/org.eclipse.equinox.p2.tests/testData/sar/org.eclipse.jdt_3.3.0.v20070607-1300.jar +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/org.eclipse.jdt_3.3.0.v20070607-1300.njar diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/testdata_1.0.0.1-2.jar b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/testdata_1.0.0.1-2.jar Binary files differnew file mode 100644 index 000000000..71a546b02 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/testdata_1.0.0.1-2.jar diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/testdata_1.0.0.1.jar b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/testdata_1.0.0.1.jar Binary files differnew file mode 100644 index 000000000..49e7f90a2 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/testdata_1.0.0.1.jar diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/testdata_1.0.0.2.jar b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/testdata_1.0.0.2.jar Binary files differnew file mode 100644 index 000000000..3515b0f46 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/optimizers/testdata_1.0.0.2.jar diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sar/alien.zip b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/sar/alien.zip Binary files differindex 9872214cc..9872214cc 100644 --- a/bundles/org.eclipse.equinox.p2.tests/testData/sar/alien.zip +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/sar/alien.zip diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sar/org.eclipse.jdt_3.2.0.v20060605-1400.jar b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/sar/org.eclipse.jdt_3.2.0.v20060605-1400.jar Binary files differindex d674aef01..d674aef01 100644 --- a/bundles/org.eclipse.equinox.p2.tests/testData/sar/org.eclipse.jdt_3.2.0.v20060605-1400.jar +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/sar/org.eclipse.jdt_3.2.0.v20060605-1400.jar diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sar/org.eclipse.jdt_3.2.0.v20060605-1400.sar b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/sar/org.eclipse.jdt_3.2.0.v20060605-1400.sar Binary files differindex 0abfe3604..0abfe3604 100644 --- a/bundles/org.eclipse.equinox.p2.tests/testData/sar/org.eclipse.jdt_3.2.0.v20060605-1400.sar +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/sar/org.eclipse.jdt_3.2.0.v20060605-1400.sar diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/sar/org.eclipse.jdt_3.3.0.v20070607-1300.jar b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/sar/org.eclipse.jdt_3.3.0.v20070607-1300.jar Binary files differnew file mode 100644 index 000000000..9deec2f0e --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/sar/org.eclipse.jdt_3.3.0.v20070607-1300.jar diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sar/org.eclipse.jdt_3.3.0.v20070607-1300.sar b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/sar/org.eclipse.jdt_3.3.0.v20070607-1300.sar Binary files differindex 842bb71f7..842bb71f7 100644 --- a/bundles/org.eclipse.equinox.p2.tests/testData/sar/org.eclipse.jdt_3.3.0.v20070607-1300.sar +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/sar/org.eclipse.jdt_3.3.0.v20070607-1300.sar diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sar/test.zip b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/sar/test.zip Binary files differindex dde8b8440..dde8b8440 100644 --- a/bundles/org.eclipse.equinox.p2.tests/testData/sar/test.zip +++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/testData/sar/test.zip diff --git a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF index 05d7e227a..92525c895 100644 --- a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF @@ -5,16 +5,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-Version: 0.1.0.qualifier -Import-Package: ie.wombat.jbdiff, - junit.framework;version="3.8.2", - org.eclipse.equinox.internal.p2.artifact.optimizers, - org.eclipse.equinox.internal.p2.artifact.optimizers.jardelta, - org.eclipse.equinox.internal.p2.artifact.optimizers.jbdiff, - org.eclipse.equinox.internal.p2.artifact.optimizers.pack200, - org.eclipse.equinox.internal.p2.artifact.processors.jardelta, - org.eclipse.equinox.internal.p2.artifact.processors.jbdiff, - org.eclipse.equinox.internal.p2.artifact.processors.pack200, - org.eclipse.equinox.internal.p2.artifact.processors.verifier, +Import-Package: junit.framework;version="3.8.2", org.eclipse.equinox.internal.p2.artifact.repository, org.eclipse.equinox.internal.p2.artifact.repository.simple, org.eclipse.equinox.internal.p2.core.helpers, @@ -25,7 +16,6 @@ Import-Package: ie.wombat.jbdiff, org.eclipse.equinox.internal.p2.metadata.repository.io, org.eclipse.equinox.internal.p2.persistence, org.eclipse.equinox.internal.p2.resolution, - org.eclipse.equinox.internal.p2.sar, org.eclipse.equinox.internal.p2.touchpoint.eclipse, org.eclipse.equinox.internal.p2.updatesite, org.eclipse.equinox.internal.provisional.p2.artifact.repository, @@ -60,10 +50,7 @@ Eclipse-LazyStart: true Eclipse-RegisterBuddy: org.eclipse.equinox.p2.artifact.repository Bundle-RequiredExecutionEnvironment: J2SE-1.4 Export-Package: org.eclipse.equinox.p2.tests, - org.eclipse.equinox.p2.tests.artifact.optimizers, - org.eclipse.equinox.p2.tests.artifact.processors, org.eclipse.equinox.p2.tests.artifact.repository, - org.eclipse.equinox.p2.tests.artifact.repository.processing, org.eclipse.equinox.p2.tests.director, org.eclipse.equinox.p2.tests.directorywatcher, org.eclipse.equinox.p2.tests.download, @@ -73,5 +60,4 @@ Export-Package: org.eclipse.equinox.p2.tests, org.eclipse.equinox.p2.tests.generator, org.eclipse.equinox.p2.tests.metadata, org.eclipse.equinox.p2.tests.metadata.repository, - org.eclipse.equinox.p2.tests.sar, org.eclipse.equinox.p2.tests.simpleconfigurator diff --git a/bundles/org.eclipse.equinox.p2.tests/plugin.xml b/bundles/org.eclipse.equinox.p2.tests/plugin.xml index bed49ce7d..20342b361 100644 --- a/bundles/org.eclipse.equinox.p2.tests/plugin.xml +++ b/bundles/org.eclipse.equinox.p2.tests/plugin.xml @@ -1,23 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.2"?> <plugin> - <extension - point="org.eclipse.equinox.p2.artifact.repository.processingSteps" - id="org.eclipse.equinox.p2.processing.ByteShifter"> - <step class="org.eclipse.equinox.p2.tests.artifact.repository.processing.ByteShifter"/> - </extension> - - <extension - point="org.eclipse.equinox.p2.artifact.repository.processingSteps" - id="org.eclipse.equinox.p2.processing.Adder"> - <step class="org.eclipse.equinox.p2.tests.artifact.repository.processing.Adder"/> - </extension> - - <extension - point="org.eclipse.equinox.p2.artifact.repository.processingSteps" - id="org.eclipse.equinox.p2.processing.Multiplier"> - <step class="org.eclipse.equinox.p2.tests.artifact.repository.processing.Multiplier"/> - </extension> <extension id="phaseTest" point="org.eclipse.equinox.p2.engine.touchpoints"> diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java index a002328f1..2d3df2c18 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java @@ -20,10 +20,7 @@ import junit.framework.*; public class AutomatedTests extends TestCase { public static Test suite() { TestSuite suite = new TestSuite(AutomatedTests.class.getName()); - suite.addTest(org.eclipse.equinox.p2.tests.artifact.optimizers.AllTests.suite()); - suite.addTest(org.eclipse.equinox.p2.tests.artifact.processors.AllTests.suite()); suite.addTest(org.eclipse.equinox.p2.tests.artifact.repository.AllTests.suite()); - suite.addTest(org.eclipse.equinox.p2.tests.artifact.repository.processing.AllTests.suite()); suite.addTest(org.eclipse.equinox.p2.tests.director.AllTests.suite()); suite.addTest(org.eclipse.equinox.p2.tests.download.AllTests.suite()); suite.addTest(org.eclipse.equinox.p2.tests.engine.AllTests.suite()); @@ -31,7 +28,6 @@ public class AutomatedTests extends TestCase { suite.addTest(org.eclipse.equinox.p2.tests.metadata.AllTests.suite()); suite.addTest(org.eclipse.equinox.p2.tests.metadata.repository.AllTests.suite()); suite.addTest(org.eclipse.equinox.p2.tests.planner.AllTests.suite()); - suite.addTest(org.eclipse.equinox.p2.tests.sar.AllTests.suite()); suite.addTest(org.eclipse.equinox.p2.tests.directorywatcher.AllTests.suite()); suite.addTest(org.eclipse.equinox.p2.tests.simpleconfigurator.SimpleConfiguratorTests.suite()); suite.addTest(org.eclipse.equinox.p2.tests.updatesite.AllTests.suite()); diff --git a/org.eclipse.equinox.p2.releng/projectSet-extssh.psf b/org.eclipse.equinox.p2.releng/projectSet-extssh.psf index c68870c23..920cc9022 100644 --- a/org.eclipse.equinox.p2.releng/projectSet-extssh.psf +++ b/org.eclipse.equinox.p2.releng/projectSet-extssh.psf @@ -15,6 +15,7 @@ <project reference="1.0,:extssh:dev.eclipse.org:/cvsroot/eclipse,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.console,org.eclipse.equinox.p2.console"/> <project reference="1.0,:extssh:dev.eclipse.org:/cvsroot/eclipse,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.natives,org.eclipse.equinox.p2.touchpoint.natives"/> <project reference="1.0,:extssh:dev.eclipse.org:/cvsroot/eclipse,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests,org.eclipse.equinox.p2.tests"/> +<project reference="1.0,:extssh:dev.eclipse.org:/cvsroot/eclipse,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.optimizers,org.eclipse.equinox.p2.tests.optimizers"/> <project reference="1.0,:extssh:dev.eclipse.org:/cvsroot/eclipse,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.metadata"/> <project reference="1.0,:extssh:dev.eclipse.org:/cvsroot/eclipse,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.exemplarysetup,org.eclipse.equinox.p2.exemplarysetup"/> <project reference="1.0,:extssh:dev.eclipse.org:/cvsroot/eclipse,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.garbagecollector,org.eclipse.equinox.p2.garbagecollector"/> diff --git a/org.eclipse.equinox.p2.releng/projectSet.psf b/org.eclipse.equinox.p2.releng/projectSet.psf index 7e19bea06..b604900a0 100644 --- a/org.eclipse.equinox.p2.releng/projectSet.psf +++ b/org.eclipse.equinox.p2.releng/projectSet.psf @@ -15,6 +15,7 @@ <project reference="1.0,:pserver:dev.eclipse.org:/cvsroot/eclipse,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.console,org.eclipse.equinox.p2.console"/> <project reference="1.0,:pserver:dev.eclipse.org:/cvsroot/eclipse,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.natives,org.eclipse.equinox.p2.touchpoint.natives"/> <project reference="1.0,:pserver:dev.eclipse.org:/cvsroot/eclipse,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests,org.eclipse.equinox.p2.tests"/> +<project reference="1.0,:pserver:dev.eclipse.org:/cvsroot/eclipse,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.optimizers,org.eclipse.equinox.p2.tests.optimizers"/> <project reference="1.0,:pserver:dev.eclipse.org:/cvsroot/eclipse,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.metadata"/> <project reference="1.0,:pserver:dev.eclipse.org:/cvsroot/eclipse,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.exemplarysetup,org.eclipse.equinox.p2.exemplarysetup"/> <project reference="1.0,:pserver:dev.eclipse.org:/cvsroot/eclipse,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.garbagecollector,org.eclipse.equinox.p2.garbagecollector"/> |