summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Daniel2013-11-12 07:36:43 (EST)
committerKrzysztof Daniel2013-11-14 03:06:15 (EST)
commite1f95889539f3cc8d09e51dfb0d21ea04aceb5d8 (patch)
tree47d4e7aa0d1e7a79320cf1569d3500a0340137fd
parentd9678dbe0e44b2074e9ab2fe9e2748d125b9e5b8 (diff)
downloadrt.equinox.p2-e1f95889539f3cc8d09e51dfb0d21ea04aceb5d8.zip
rt.equinox.p2-e1f95889539f3cc8d09e51dfb0d21ea04aceb5d8.tar.gz
rt.equinox.p2-e1f95889539f3cc8d09e51dfb0d21ea04aceb5d8.tar.bz2
bug 420260 - org.eclipse.equinox.p2.tests take 1.5h longer on the MacM20131127-1300M20131127-0800M20131120-0800
use domain that can be resolved by Eclipse Foundation infrastructure (avoid depending on proxy while executing tests). Conflicts: bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/CompositeMetadataRepositoryTest.java Change-Id: I113d43930b9fd0dd5a6079677d54e8e2e6708ba6 Signed-off-by: Krzysztof Daniel <kdaniel@redhat.com>
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/CompositeMetadataRepositoryTest.java10
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/ArtifactMirrorApplicationTest.java6
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/MetadataMirrorApplicationTest.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationArtifactTest.java6
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationMetadataTest.java4
5 files changed, 15 insertions, 15 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/CompositeMetadataRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/CompositeMetadataRepositoryTest.java
index e01be13..d5e4c61 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/CompositeMetadataRepositoryTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/CompositeMetadataRepositoryTest.java
@@ -589,10 +589,10 @@ public class CompositeMetadataRepositoryTest extends AbstractProvisioningTest {
PrintStream out = System.out;
try {
System.setOut(new PrintStream(new StringBufferStream()));
- URI location = new URI("http://foo.org/in/memory");
- URI childOne = new URI("http://foo.org/in/memory/one");
- URI childTwo = new URI("http://foo.org/in/memory/two");
- URI childThree = new URI("http://foo.org/in/memory/three");
+ URI location = new URI("http://eclipse.org/equinox/in/memory");
+ URI childOne = new URI("http://eclipse.org/equinox/in/memory/one");
+ URI childTwo = new URI("http://eclipse.org/equinox/in/memory/two");
+ URI childThree = new URI("http://eclipse.org/equinox/in/memory/three");
CompositeMetadataRepository repository = createRepository(location, "in memory test");
repository.addChild(childOne);
repository.addChild(childTwo);
@@ -659,7 +659,7 @@ public class CompositeMetadataRepositoryTest extends AbstractProvisioningTest {
PrintStream out = System.out;
try {
System.setOut(new PrintStream(new StringBufferStream()));
- URI location = new URI("http://foo.org/in/memory");
+ URI location = new URI("http://eclipse.org/equinox/in/memory");
URI one = new URI("one");
URI two = new URI("two");
CompositeMetadataRepository repository = createRepository(location, "in memory test");
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/ArtifactMirrorApplicationTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/ArtifactMirrorApplicationTest.java
index 23806ad..601158b 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/ArtifactMirrorApplicationTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/ArtifactMirrorApplicationTest.java
@@ -528,7 +528,7 @@ public class ArtifactMirrorApplicationTest extends AbstractProvisioningTest {
public void testArtifactMirrorToInvalid() {
try {
//Setup: create a URI pointing to an unmodifiable place
- URI invalidDestRepository = new URI("http://foobar.com/abcdefg");
+ URI invalidDestRepository = new URI("http://eclipse.org/equinox/foobar/abcdefg");
//run the application with the modifiable destination
basicRunMirrorApplication("14.1", sourceRepoLocation.toURL(), invalidDestRepository.toURL(), true);
@@ -552,7 +552,7 @@ public class ArtifactMirrorApplicationTest extends AbstractProvisioningTest {
try {
//Setup: create a URI pointing to an unmodifiable place
- URI invalidDestRepository = new URI("http://foobar.com/abcdefg");
+ URI invalidDestRepository = new URI("http://eclipse.org/equinox/foobar/abcdefg");
basicRunMirrorApplication("15.1", invalidRepository.toURL(), invalidDestRepository.toURL(), true);
//We expect the ProvisionException to be thrown
fail("15.0 ProvisionException not thrown");
@@ -1345,4 +1345,4 @@ public class ArtifactMirrorApplicationTest extends AbstractProvisioningTest {
fail("Error mirroring", e);
}
}
-} \ No newline at end of file
+}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/MetadataMirrorApplicationTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/MetadataMirrorApplicationTest.java
index 8b6e3ba..d89002c 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/MetadataMirrorApplicationTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/MetadataMirrorApplicationTest.java
@@ -516,7 +516,7 @@ public class MetadataMirrorApplicationTest extends AbstractProvisioningTest {
public void testMetadataMirrorToInvalid() {
URI invalidDestRepository;
try {
- invalidDestRepository = new URI("http://foobar.com/abcdefg");
+ invalidDestRepository = new URI("http://eclipse.org/equinox/foobar/abcdefg");
basicRunMirrorApplication("14.1", sourceRepoLocation.toURL(), invalidDestRepository.toURL(), true);
//we expect an illegal state exception to be thrown and should never get here
fail("14.0 IllegalStateExpection not thrown");
@@ -535,7 +535,7 @@ public class MetadataMirrorApplicationTest extends AbstractProvisioningTest {
delete(invalidRepository);
try {
- URI invalidDestRepository = new URI("http://foobar.com/abcdefg");
+ URI invalidDestRepository = new URI("http://eclipse.org/equinox/foobar/abcdefg");
basicRunMirrorApplication("15.1", invalidRepository.toURL(), invalidDestRepository.toURL(), true);
//we expect a provisioning exception to be thrown and should never get here
fail("15.0 ProvisionExpection not thrown");
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationArtifactTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationArtifactTest.java
index 624373c..120eb17 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationArtifactTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationArtifactTest.java
@@ -555,7 +555,7 @@ public class NewMirrorApplicationArtifactTest extends AbstractProvisioningTest {
URI invalidDestRepository = null;
try {
//Setup: create a URI pointing to an unmodifiable place
- invalidDestRepository = new URI("http://foobar.com/abcdefg");
+ invalidDestRepository = new URI("http://eclipse.org/equinox/foobar/abcdefg");
//run the application with the modifiable destination
basicRunMirrorApplication("14.1", sourceRepoLocation.toURI(), invalidDestRepository, true, false);
@@ -583,7 +583,7 @@ public class NewMirrorApplicationArtifactTest extends AbstractProvisioningTest {
try {
//Setup: create a URI pointing to an unmodifiable place
- URI invalidDestRepository = new URI("http://foobar.com/abcdefg");
+ URI invalidDestRepository = new URI("http://eclipse.org/equinox/foobar/abcdefg");
basicRunMirrorApplication("15.1", invalidRepository.toURI(), invalidDestRepository, true, false);
//We expect the ProvisionException to be thrown
fail("15.0 ProvisionException not thrown");
@@ -1432,4 +1432,4 @@ public class NewMirrorApplicationArtifactTest extends AbstractProvisioningTest {
fail("Error mirroring", e);
}
}
-} \ No newline at end of file
+}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationMetadataTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationMetadataTest.java
index 7a032fc..5aef0a0 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationMetadataTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationMetadataTest.java
@@ -551,7 +551,7 @@ public class NewMirrorApplicationMetadataTest extends AbstractProvisioningTest {
public void testMetadataMirrorToInvalid() {
URI invalidDestRepository = null;
try {
- invalidDestRepository = new URI("http://foobar.com/abcdefg");
+ invalidDestRepository = new URI("http://eclipse.org/equinox/foobar/abcdefg");
basicRunMirrorApplication("14.1", sourceRepoLocation.toURL(), invalidDestRepository.toURL(), true);
//we expect an illegal state exception to be thrown and should never get here
fail("14.0 IllegalStateExpection not thrown");
@@ -574,7 +574,7 @@ public class NewMirrorApplicationMetadataTest extends AbstractProvisioningTest {
delete(invalidRepository);
try {
- URI invalidDestRepository = new URI("http://foobar.com/abcdefg");
+ URI invalidDestRepository = new URI("http://eclipse.org/equinox/foobar/abcdefg");
basicRunMirrorApplication("15.1", invalidRepository.toURL(), invalidDestRepository.toURL(), true);
//we expect a provisioning exception to be thrown and should never get here
fail("15.0 ProvisionExpection not thrown");