honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14064 from rmuir/blinded_forever 

Allow tests to run from eclipse on windows
This commit is contained in:
Robert Muir 2015-10-13 06:58:19 -04:00
parent b9ba5fb765 9072f4ffbf
commit a68c163959
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/main/java/org/elasticsearch/bootstrap/JarHell.java
View File

@ -104,7 +104,9 @@ public class JarHell {
*/
@SuppressForbidden(reason = "resolves against CWD because that is how classpaths work")
static URL[] parseClassPath(String classPath) {
String elements[] = classPath.split(System.getProperty("path.separator"));
String pathSeparator = System.getProperty("path.separator");
String fileSeparator = System.getProperty("file.separator");
String elements[] = classPath.split(pathSeparator);
URL urlElements[] = new URL[elements.length];
for (int i = 0; i < elements.length; i++) {
String element = elements[i];
@ -118,6 +120,20 @@ public class JarHell {
if (element.isEmpty()) {
throw new IllegalStateException("Classpath should not contain empty elements! (outdated shell script from a previous version?) classpath='" + classPath + "'");
}
// we should be able to just Paths.get() each element, but unfortunately this is not the
// whole story on how classpath parsing works: if you want to know, start at sun.misc.Launcher,
// be sure to stop before you tear out your eyes. we just handle the "alternative" filename
// specification which java seems to allow, explicitly, right here...
if (element.startsWith("/") && "\\".equals(fileSeparator)) {
// "correct" the entry to become a normal entry
// change to correct file separators
element = element.replace("/", "\\");
// if there is a drive letter, nuke the leading separator
if (element.length() >= 3 && element.charAt(2) == ':') {
element = element.substring(1);
}
}
// now just parse as ordinary file
try {
urlElements[i] = PathUtils.get(element).toUri().toURL();
} catch (MalformedURLException e) {

19
core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.bootstrap;
import org.elasticsearch.Version;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.PathUtils;
import org.elasticsearch.test.ESTestCase;
import java.io.IOException;
@ -335,4 +336,22 @@ public class JarHellTests extends ESTestCase {
assertTrue(expected.getMessage().contains("should not contain empty elements"));
}
}
/**
* Make sure a "bogus" windows classpath element is accepted, java's classpath parsing accepts it,
* therefore eclipse OSGI code does it :)
*/
public void testCrazyEclipseClassPathWindows() throws Exception {
assumeTrue("test is designed for windows-like systems only", ";".equals(System.getProperty("path.separator")));
assumeTrue("test is designed for windows-like systems only", "\\".equals(System.getProperty("file.separator")));
URL expected[] = {
PathUtils.get("c:\\element1").toUri().toURL(),
PathUtils.get("c:\\element2").toUri().toURL(),
PathUtils.get("c:\\element3").toUri().toURL(),
PathUtils.get("c:\\element 4").toUri().toURL(),
};
URL actual[] = JarHell.parseClassPath("c:\\element1;c:\\element2;/c:/element3;/c:/element 4");
assertArrayEquals(expected, actual);
}
}