Skip to main content
summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.equinox.p2.tests
diff options
context:
space:
mode:
authorDJ Houghton2008-04-18 21:35:35 +0000
committerDJ Houghton2008-04-18 21:35:35 +0000
commit03b9c4456816b025f356a8f5240c105cf67a488d (patch)
tree13905acd3e03256ba3fb3110d4a76acd4f6f9249 /bundles/org.eclipse.equinox.p2.tests
parentce55ebb1a9515133fda95b447f699847e87c1d4c (diff)
downloadrt.equinox.p2-03b9c4456816b025f356a8f5240c105cf67a488d.tar.gz
rt.equinox.p2-03b9c4456816b025f356a8f5240c105cf67a488d.tar.xz
rt.equinox.p2-03b9c4456816b025f356a8f5240c105cf67a488d.zip
Bug 227817 - Should be able to pass in properties at repository creation time
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests')
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestArtifactRepository.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactOutputStreamTest.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/FoldersRepositoryTest.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/SimpleArtifactRepositoryTest.java12
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/JarURLRepositoryTest.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/LocalMetadataRepositoryTest.java15
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java4
8 files changed, 24 insertions, 17 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestArtifactRepository.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestArtifactRepository.java
index 71f9416d9..19a91005a 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestArtifactRepository.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestArtifactRepository.java
@@ -65,7 +65,7 @@ public class TestArtifactRepository extends AbstractArtifactRepository {
};
public TestArtifactRepository() {
- super(NAME, TYPE, VERSION, null, DESCRIPTION, PROVIDER);
+ super(NAME, TYPE, VERSION, null, DESCRIPTION, PROVIDER, null);
}
public void addArtifact(IArtifactKey key, byte[] contents) {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java
index 0a90349d2..ab4f6c415 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java
@@ -46,7 +46,7 @@ public class TestMetadataRepository extends AbstractMetadataRepository {
}
public TestMetadataRepository(IInstallableUnit[] ius) {
- super(NAME, TYPE, VERSION, createLocation(), DESCRIPTION, PROVIDER);
+ super(NAME, TYPE, VERSION, createLocation(), DESCRIPTION, PROVIDER, null);
units.addAll(Arrays.asList(ius));
}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactOutputStreamTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactOutputStreamTest.java
index 109fc997d..a4453488f 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactOutputStreamTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactOutputStreamTest.java
@@ -39,7 +39,7 @@ public class ArtifactOutputStreamTest extends TestCase {
tempWritableLocation = File.createTempFile("artifact", ".repo");
tempWritableLocation.delete();
tempWritableLocation.mkdirs();
- sar = new SimpleArtifactRepository("name", tempWritableLocation.toURL());
+ sar = new SimpleArtifactRepository("name", tempWritableLocation.toURL(), null);
destination = new Destination();
ak = new ArtifactKey("classifier", "id", new Version("1.0"));
ad = new ArtifactDescriptor(ak);
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/FoldersRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/FoldersRepositoryTest.java
index b4dc73549..0f5bbb293 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/FoldersRepositoryTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/FoldersRepositoryTest.java
@@ -53,7 +53,7 @@ public class FoldersRepositoryTest extends TestCase {
testRepo.mkdir();
manager.removeRepository(testRepo.toURL());
- IArtifactRepository repo = manager.createRepository(testRepo.toURL(), "testRepo", IArtifactRepositoryManager.TYPE_SIMPLE_REPOSITORY);
+ IArtifactRepository repo = manager.createRepository(testRepo.toURL(), "testRepo", IArtifactRepositoryManager.TYPE_SIMPLE_REPOSITORY, null);
manager.addRepository(repo.getLocation());
File pluginsFolder = new File(testRepo, "plugins");
pluginsFolder.mkdir();
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/SimpleArtifactRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/SimpleArtifactRepositoryTest.java
index 0faf2b414..84fba33e0 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/SimpleArtifactRepositoryTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/SimpleArtifactRepositoryTest.java
@@ -13,6 +13,8 @@ package org.eclipse.equinox.p2.tests.artifact.repository;
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
import junit.framework.TestCase;
import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository;
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
@@ -64,9 +66,10 @@ public class SimpleArtifactRepositoryTest extends TestCase {
IArtifactRepositoryManager artifactRepositoryManager = getArtifactRepositoryManager();
String tempDir = System.getProperty("java.io.tmpdir");
File repoLocation = new File(tempDir, "SimpleArtifactRepositoryTest");
- IArtifactRepository repo = artifactRepositoryManager.createRepository(repoLocation.toURL(), "artifact name", IArtifactRepositoryManager.TYPE_SIMPLE_REPOSITORY);
+ Map properties = new HashMap();
+ properties.put(IRepository.PROP_COMPRESSED, "true");
+ IArtifactRepository repo = artifactRepositoryManager.createRepository(repoLocation.toURL(), "artifact name", IArtifactRepositoryManager.TYPE_SIMPLE_REPOSITORY, properties);
artifactRepositoryManager.addRepository(repo.getLocation());
- repo.setProperty(IRepository.PROP_COMPRESSED, "true");
EclipseInstallGeneratorInfoProvider provider = new EclipseInstallGeneratorInfoProvider();
provider.setArtifactRepository(repo);
provider.initialize(repoLocation);
@@ -96,9 +99,10 @@ public class SimpleArtifactRepositoryTest extends TestCase {
IArtifactRepositoryManager artifactRepositoryManager = getArtifactRepositoryManager();
String tempDir = System.getProperty("java.io.tmpdir");
File repoLocation = new File(tempDir, "SimpleArtifactRepositoryTest");
- IArtifactRepository repo = artifactRepositoryManager.createRepository(repoLocation.toURL(), "artifact name", IArtifactRepositoryManager.TYPE_SIMPLE_REPOSITORY);
+ Map properties = new HashMap();
+ properties.put(IRepository.PROP_COMPRESSED, "false");
+ IArtifactRepository repo = artifactRepositoryManager.createRepository(repoLocation.toURL(), "artifact name", IArtifactRepositoryManager.TYPE_SIMPLE_REPOSITORY, properties);
artifactRepositoryManager.addRepository(repo.getLocation());
- repo.setProperty(IRepository.PROP_COMPRESSED, "false");
EclipseInstallGeneratorInfoProvider provider = new EclipseInstallGeneratorInfoProvider();
provider.setArtifactRepository(repo);
provider.initialize(repoLocation);
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/JarURLRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/JarURLRepositoryTest.java
index 3e2f0c7b1..a07bf93e2 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/JarURLRepositoryTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/JarURLRepositoryTest.java
@@ -66,7 +66,7 @@ public class JarURLRepositoryTest extends TestCase {
deleteDirectory(testRepo);
testRepo.mkdir();
provider.setFlavor("jartest");
- IMetadataRepository repository = manager.createRepository(testRepo.toURL(), "testRepo", IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY);
+ IMetadataRepository repository = manager.createRepository(testRepo.toURL(), "testRepo", IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY, null);
manager.addRepository(repository.getLocation());
provider.setMetadataRepository(repository);
new Generator(provider).generate();
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/LocalMetadataRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/LocalMetadataRepositoryTest.java
index 6c6b848b6..e6da11932 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/LocalMetadataRepositoryTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/LocalMetadataRepositoryTest.java
@@ -12,6 +12,7 @@ package org.eclipse.equinox.p2.tests.metadata.repository;
import java.io.File;
import java.net.MalformedURLException;
+import java.util.HashMap;
import java.util.Map;
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
@@ -50,9 +51,10 @@ public class LocalMetadataRepositoryTest extends AbstractProvisioningTest {
public void testCompressedRepository() throws MalformedURLException, ProvisionException {
IMetadataRepositoryManager manager = getMetadataRepositoryManager();
- IMetadataRepository repo = manager.createRepository(repoLocation.toURL(), "TestRepo", IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY);
+ Map properties = new HashMap();
+ properties.put(IRepository.PROP_COMPRESSED, "true");
+ IMetadataRepository repo = manager.createRepository(repoLocation.toURL(), "TestRepo", IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY, properties);
manager.addRepository(repo.getLocation());
- repo.setProperty(IRepository.PROP_COMPRESSED, "true");
EclipseInstallGeneratorInfoProvider provider = new EclipseInstallGeneratorInfoProvider();
provider.setMetadataRepository(repo);
provider.initialize(repoLocation);
@@ -83,7 +85,7 @@ public class LocalMetadataRepositoryTest extends AbstractProvisioningTest {
public void testGetProperties() throws MalformedURLException, ProvisionException {
IMetadataRepositoryManager manager = getMetadataRepositoryManager();
- IMetadataRepository repo = manager.createRepository(repoLocation.toURL(), "TestRepo", IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY);
+ IMetadataRepository repo = manager.createRepository(repoLocation.toURL(), "TestRepo", IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY, null);
Map properties = repo.getProperties();
//attempting to modify the properties should fail
try {
@@ -96,7 +98,7 @@ public class LocalMetadataRepositoryTest extends AbstractProvisioningTest {
public void testSetProperty() throws MalformedURLException, ProvisionException {
IMetadataRepositoryManager manager = getMetadataRepositoryManager();
- IMetadataRepository repo = manager.createRepository(repoLocation.toURL(), "TestRepo", IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY);
+ IMetadataRepository repo = manager.createRepository(repoLocation.toURL(), "TestRepo", IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY, null);
manager.addRepository(repo.getLocation());
Map properties = repo.getProperties();
assertTrue("1.0", !properties.containsKey(TEST_KEY));
@@ -120,9 +122,10 @@ public class LocalMetadataRepositoryTest extends AbstractProvisioningTest {
public void testUncompressedRepository() throws MalformedURLException, ProvisionException {
IMetadataRepositoryManager manager = getMetadataRepositoryManager();
- IMetadataRepository repo = manager.createRepository(repoLocation.toURL(), "TestRepo", IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY);
+ Map properties = new HashMap();
+ properties.put(IRepository.PROP_COMPRESSED, "false");
+ IMetadataRepository repo = manager.createRepository(repoLocation.toURL(), "TestRepo", IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY, properties);
manager.addRepository(repo.getLocation());
- repo.setProperty(IRepository.PROP_COMPRESSED, "false");
EclipseInstallGeneratorInfoProvider provider = new EclipseInstallGeneratorInfoProvider();
provider.setMetadataRepository(repo);
provider.initialize(repoLocation);
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java
index 45bafb768..6723e0f80 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java
@@ -70,7 +70,7 @@ public class MetadataRepositoryManagerTest extends AbstractProvisioningTest {
//create a new repository
File repoLocation = getTempLocation();
- IMetadataRepository testRepo = manager.createRepository(repoLocation.toURL(), "MetadataRepositoryManagerTest", IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY);
+ IMetadataRepository testRepo = manager.createRepository(repoLocation.toURL(), "MetadataRepositoryManagerTest", IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY, null);
manager.addRepository(testRepo.getLocation());
int newNonSystemCount = manager.getKnownRepositories(IMetadataRepositoryManager.REPOSITORIES_NON_SYSTEM).length;
int newSystemCount = manager.getKnownRepositories(IMetadataRepositoryManager.REPOSITORIES_SYSTEM).length;
@@ -106,7 +106,7 @@ public class MetadataRepositoryManagerTest extends AbstractProvisioningTest {
File cacheFileJAR = new File(dataAreaFile, "content" + repoLocation.hashCode() + ".jar");
// create a local repository
- manager.createRepository(repoLocation.toURL(), "MetadataRepositoryCachingTest", IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY);
+ manager.createRepository(repoLocation.toURL(), "MetadataRepositoryCachingTest", IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY, null);
manager.loadRepository(repoLocation.toURL(), null);
// check that a local cache was not created

Back to the top