Selaa lähdekoodia

Merge "Fix junit tests under windows when the platform is explicitly changed" into stable-3.6

tags/v3.6.0.201412230720-r
Matthias Sohn 9 vuotta sitten
vanhempi
commit
79201ac95e

+ 2
- 0
org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java Näytä tiedosto

setProperty("file.separator", "\\"); setProperty("file.separator", "\\");
setProperty("path.separator", ";"); setProperty("path.separator", ";");
setProperty("line.separator", "\r\n"); setProperty("line.separator", "\r\n");
setPlatformChecker();
} }


/** /**
setProperty("file.separator", "/"); setProperty("file.separator", "/");
setProperty("path.separator", ":"); setProperty("path.separator", ":");
setProperty("line.separator", "\n"); setProperty("line.separator", "\n");
setPlatformChecker();
} }
} }

+ 13
- 5
org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java Näytä tiedosto

private void init() { private void init() {
// Creating ObjectChecker must be deferred. Unit tests change // Creating ObjectChecker must be deferred. Unit tests change
// behavior of is{Windows,MacOS} in constructor of subclass. // behavior of is{Windows,MacOS} in constructor of subclass.
if (platformChecker == null) {
platformChecker = new ObjectChecker()
.setSafeForWindows(isWindows())
.setSafeForMacOS(isMacOS());
}
if (platformChecker == null)
setPlatformChecker();
}

/**
* Should be used in tests when the platform is explicitly changed.
*
* @since 3.6
*/
protected final void setPlatformChecker() {
platformChecker = new ObjectChecker()
.setSafeForWindows(isWindows())
.setSafeForMacOS(isMacOS());
} }


/** /**

Loading…
Peruuta
Tallenna