Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2010-05-12 16:28:05 +0000
committerPascal Rapicault2010-05-12 16:28:05 +0000
commitf19abed12ad5dbed3a6d97d0eb7fa71ba236d513 (patch)
tree2d8ad5bcc83ca836f69c77bed00e3bc36d1cb05d /bundles/org.eclipse.equinox.p2.tests/src/org
parent10520757435420504f38ac5144bfba24fc444af9 (diff)
downloadrt.equinox.p2-f19abed12ad5dbed3a6d97d0eb7fa71ba236d513.tar.gz
rt.equinox.p2-f19abed12ad5dbed3a6d97d0eb7fa71ba236d513.tar.xz
rt.equinox.p2-f19abed12ad5dbed3a6d97d0eb7fa71ba236d513.zip
Bug 274272 - [repository] Cache artifact repository index
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests/src/org')
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/JarURLArtifactRepositoryTest.java3
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/SimpleArtifactRepositoryTest.java11
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug306279f.java3
3 files changed, 4 insertions, 13 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/JarURLArtifactRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/JarURLArtifactRepositoryTest.java
index d20aef2c7..105ad2ecc 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/JarURLArtifactRepositoryTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/JarURLArtifactRepositoryTest.java
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Sonatype Inc - ongoing development
*******************************************************************************/
package org.eclipse.equinox.p2.tests.artifact.repository;
@@ -47,7 +48,7 @@ public class JarURLArtifactRepositoryTest extends TestCase {
URL engineJar = TestActivator.getContext().getBundle().getEntry("/testData/enginerepo.jar");
URI jarRepoLocation = null;
try {
- jarRepoLocation = URIUtil.toURI(new URL("jar:" + engineJar.toString() + "!/testData/enginerepo/artifacts.xml"));
+ jarRepoLocation = URIUtil.toURI(new URL("jar:" + engineJar.toString() + "!/testData/enginerepo/"));
} catch (URISyntaxException e) {
fail(e.getMessage());
} catch (MalformedURLException e) {
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 369665e57..8324b7a0d 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
@@ -9,6 +9,7 @@
* compeople AG (Stefan Liebig) - initial API and implementation
* Code 9 - ongoing development
* IBM - ongoing development
+ * Sonatype Inc - ongoing development
*******************************************************************************/
package org.eclipse.equinox.p2.tests.artifact.repository;
@@ -62,11 +63,6 @@ public class SimpleArtifactRepositoryTest extends AbstractProvisioningTest {
assertEquals(new URI(base + "artifacts.xml"), SimpleArtifactRepository.getActualLocation(base, false));
}
- public void testGetActualLocation3() throws Exception {
- URI base = new URI("http://localhost/artifactRepository/artifacts.xml");
- assertEquals(base, SimpleArtifactRepository.getActualLocation(base, false));
- }
-
public void testGetActualLocationCompressed1() throws Exception {
URI base = new URI("http://localhost/artifactRepository");
assertEquals(new URI(base + "/artifacts.jar"), SimpleArtifactRepository.getActualLocation(base, true));
@@ -77,11 +73,6 @@ public class SimpleArtifactRepositoryTest extends AbstractProvisioningTest {
assertEquals(new URI(base + "artifacts.jar"), SimpleArtifactRepository.getActualLocation(base, true));
}
- public void testGetActualLocationCompressed3() throws Exception {
- URI base = new URI("http://localhost/artifactRepository/artifacts.jar");
- assertEquals(base, SimpleArtifactRepository.getActualLocation(base, true));
- }
-
public void testCompressedRepository() throws ProvisionException {
IArtifactRepositoryManager artifactRepositoryManager = getArtifactRepositoryManager();
String tempDir = System.getProperty("java.io.tmpdir");
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug306279f.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug306279f.java
index d0bc612aa..0ed69240a 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug306279f.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug306279f.java
@@ -1,6 +1,5 @@
package org.eclipse.equinox.p2.tests.planner;
-import java.net.URISyntaxException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.equinox.p2.core.*;
import org.eclipse.equinox.p2.engine.*;
@@ -11,7 +10,7 @@ import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
public class Bug306279f extends AbstractProvisioningTest {
- public void testInstallBabel() throws ProvisionException, URISyntaxException {
+ public void testInstallBabel() throws ProvisionException {
IProvisioningAgentProvider provider = getAgentProvider();
IProvisioningAgent agent = provider.createAgent(getTestData("bug306279f data", "testData/bug306279f/p2").toURI());
IMetadataRepositoryManager repoMgr = (IMetadataRepositoryManager) agent.getService(IMetadataRepositoryManager.SERVICE_NAME);

Back to the top