Bug 399798 - StandardVMType should allow...add java.home prop to win32
ee files
diff --git a/org.eclipse.jdt.debug.tests/testfiles/test-jre/bin/test-resolver-win32-2.ee b/org.eclipse.jdt.debug.tests/testfiles/test-jre/bin/test-resolver-win32-2.ee
index 2940682..50c8b25 100644
--- a/org.eclipse.jdt.debug.tests/testfiles/test-jre/bin/test-resolver-win32-2.ee
+++ b/org.eclipse.jdt.debug.tests/testfiles/test-jre/bin/test-resolver-win32-2.ee
@@ -29,3 +29,4 @@
-Dee.name=Library Location Resolver Test JRE Definition
-Dee.description=Foundation Specification v1.1
-Dee.copyright=(c) Copyright IBM Corp. 2013 All Rights Reserved
+-Djava.home=..
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/testfiles/test-jre/bin/test-resolver-win32.ee b/org.eclipse.jdt.debug.tests/testfiles/test-jre/bin/test-resolver-win32.ee
index 3f5a097..dfb8c77 100644
--- a/org.eclipse.jdt.debug.tests/testfiles/test-jre/bin/test-resolver-win32.ee
+++ b/org.eclipse.jdt.debug.tests/testfiles/test-jre/bin/test-resolver-win32.ee
@@ -29,3 +29,4 @@
-Dee.name=Library Location Resolver Test JRE Definition
-Dee.description=Foundation Specification v1.1
-Dee.copyright=(c) Copyright IBM Corp. 2013 All Rights Reserved
+-Djava.home=..
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/VMInstallTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/VMInstallTests.java
index d441454..feb0e83 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/VMInstallTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/VMInstallTests.java
@@ -12,8 +12,6 @@
import java.io.File;
import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.net.URL;
import java.util.Map;
@@ -300,17 +298,12 @@
if(applies(libraryPath)) {
File file = JavaTestPlugin.getDefault().getFileInPlugin(new Path("testresources/test_resolver_javadoc.zip"));
if(file.isFile()) {
- URI uri;
try {
- uri = new URI("file", null, file.getAbsolutePath(), null);
- return URIUtil.toURL(uri);
+ return URIUtil.toURL(file.toURI());
}
catch (MalformedURLException e) {
e.printStackTrace();
}
- catch (URISyntaxException e) {
- e.printStackTrace();
- }
}
}
return null;
@@ -323,17 +316,12 @@
if(applies(libraryPath)) {
File file = JavaTestPlugin.getDefault().getFileInPlugin(new Path("testresources/test_resolver_index.index"));
if(file.isFile()) {
- URI uri;
try {
- uri = new URI("file", null, file.getAbsolutePath(), null);
- return URIUtil.toURL(uri);
+ return URIUtil.toURL(file.toURI());
}
catch (MalformedURLException e) {
e.printStackTrace();
}
- catch (URISyntaxException e) {
- e.printStackTrace();
- }
}
}
return null;
