Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDJ Houghton2008-10-10 18:25:36 +0000
committerDJ Houghton2008-10-10 18:25:36 +0000
commit2351ff74f14e9da7fe365e351b0b7c4737254e51 (patch)
treecb678bb38fa23bb295a83d9640f8f4c44b0d9168 /bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator
parent6bd48dbc11834858db4b8d3be03214e275eb6519 (diff)
downloadrt.equinox.p2-2351ff74f14e9da7fe365e351b0b7c4737254e51.tar.gz
rt.equinox.p2-2351ff74f14e9da7fe365e351b0b7c4737254e51.tar.xz
rt.equinox.p2-2351ff74f14e9da7fe365e351b0b7c4737254e51.zip
Bug 250452 - Update applications to handle URIs
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator')
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/GeneratorTests.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/TestGeneratorInfo.java8
2 files changed, 5 insertions, 5 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/GeneratorTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/GeneratorTests.java
index e4a555d9f..fcfdd6bc9 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/GeneratorTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/GeneratorTests.java
@@ -39,7 +39,7 @@ public class GeneratorTests extends AbstractProvisioningTest {
application.run(arguments);
fail("3.0 - Expected Illegal Argument Exception not thrown.");
} catch (IllegalArgumentException e) {
- assertTrue("3.0 - Expected Illegal Argument", e.getMessage().equals(NLS.bind(Messages.exception_artifactRepoNoAppendDestroysInput, rootFolder.toURL().toExternalForm().toString())));
+ assertTrue("3.0 - Expected Illegal Argument", e.getMessage().equals(NLS.bind(Messages.exception_artifactRepoNoAppendDestroysInput, rootFolder.toURI())));
}
assertTrue("3.1 - artifact repo existance", new File(rootFolder, "artifacts.xml").exists());
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/TestGeneratorInfo.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/TestGeneratorInfo.java
index def32fbe0..ea46ad3c3 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/TestGeneratorInfo.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/TestGeneratorInfo.java
@@ -11,7 +11,7 @@
package org.eclipse.equinox.p2.tests.generator;
import java.io.File;
-import java.net.URL;
+import java.net.URI;
import java.util.*;
import org.eclipse.equinox.internal.provisional.frameworkadmin.ConfigData;
import org.eclipse.equinox.internal.provisional.frameworkadmin.LauncherData;
@@ -34,7 +34,7 @@ public class TestGeneratorInfo implements IGeneratorInfo {
private String rootId;
private String rootVersion;
private String launcherConfig;
- private URL siteLocation;
+ private URI siteLocation;
private boolean updateCompatibilty = false;
public TestGeneratorInfo(File baseLocation) {
@@ -110,7 +110,7 @@ public class TestGeneratorInfo implements IGeneratorInfo {
return rootVersion;
}
- public URL getSiteLocation() {
+ public URI getSiteLocation() {
return siteLocation;
}
@@ -145,7 +145,7 @@ public class TestGeneratorInfo implements IGeneratorInfo {
this.rootId = value;
}
- public void setSiteLocation(URL location) {
+ public void setSiteLocation(URI location) {
this.siteLocation = location;
}

Back to the top