(LANG-624) SystemUtils.getJavaVersionAsFloat throws StringIndexOutOfBoundsException on Android runtime/Dalvik VM. Oops, fix return type.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@949223 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
2d9a9ae59f
commit
eb79f7c6f3
|
@ -1669,7 +1669,7 @@ static float toJavaVersionFloat(String version) {
|
||||||
*
|
*
|
||||||
* @return the version, for example 131 for Java 1.3.1
|
* @return the version, for example 131 for Java 1.3.1
|
||||||
*/
|
*/
|
||||||
static float toJavaVersionInt(String version) {
|
static int toJavaVersionInt(String version) {
|
||||||
return toVersionInt(toJavaVersionIntArray(version, JAVA_VERSION_TRIM_SIZE));
|
return toVersionInt(toJavaVersionIntArray(version, JAVA_VERSION_TRIM_SIZE));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -207,22 +207,22 @@ public void testJavaVersionAsFloat() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testJavaVersionAsInt() {
|
public void testJavaVersionAsInt() {
|
||||||
assertEquals(0, SystemUtils.toJavaVersionInt(null), 0.000001f);
|
assertEquals(0, SystemUtils.toJavaVersionInt(null));
|
||||||
assertEquals(0, SystemUtils.toJavaVersionInt(""), 0.000001f);
|
assertEquals(0, SystemUtils.toJavaVersionInt(""));
|
||||||
assertEquals(0, SystemUtils.toJavaVersionInt("0"), 0.000001f);
|
assertEquals(0, SystemUtils.toJavaVersionInt("0"));
|
||||||
assertEquals(110, SystemUtils.toJavaVersionInt("1.1"), 0.000001f);
|
assertEquals(110, SystemUtils.toJavaVersionInt("1.1"));
|
||||||
assertEquals(120, SystemUtils.toJavaVersionInt("1.2"), 0.000001f);
|
assertEquals(120, SystemUtils.toJavaVersionInt("1.2"));
|
||||||
assertEquals(130, SystemUtils.toJavaVersionInt("1.3.0"), 0.000001f);
|
assertEquals(130, SystemUtils.toJavaVersionInt("1.3.0"));
|
||||||
assertEquals(131, SystemUtils.toJavaVersionInt("1.3.1"), 0.000001f);
|
assertEquals(131, SystemUtils.toJavaVersionInt("1.3.1"));
|
||||||
assertEquals(140, SystemUtils.toJavaVersionInt("1.4.0"), 0.000001f);
|
assertEquals(140, SystemUtils.toJavaVersionInt("1.4.0"));
|
||||||
assertEquals(141, SystemUtils.toJavaVersionInt("1.4.1"), 0.000001f);
|
assertEquals(141, SystemUtils.toJavaVersionInt("1.4.1"));
|
||||||
assertEquals(142, SystemUtils.toJavaVersionInt("1.4.2"), 0.000001f);
|
assertEquals(142, SystemUtils.toJavaVersionInt("1.4.2"));
|
||||||
assertEquals(150, SystemUtils.toJavaVersionInt("1.5.0"), 0.000001f);
|
assertEquals(150, SystemUtils.toJavaVersionInt("1.5.0"));
|
||||||
assertEquals(160, SystemUtils.toJavaVersionInt("1.6.0"), 0.000001f);
|
assertEquals(160, SystemUtils.toJavaVersionInt("1.6.0"));
|
||||||
assertEquals(131, SystemUtils.toJavaVersionInt("JavaVM-1.3.1"), 0.000001f);
|
assertEquals(131, SystemUtils.toJavaVersionInt("JavaVM-1.3.1"));
|
||||||
assertEquals(131, SystemUtils.toJavaVersionInt("1.3.1 subset"), 0.000001f);
|
assertEquals(131, SystemUtils.toJavaVersionInt("1.3.1 subset"));
|
||||||
// This used to return 0f in [lang] version 2.5:
|
// This used to return 0f in [lang] version 2.5:
|
||||||
assertEquals(130, SystemUtils.toJavaVersionInt("XXX-1.3.x"), 0.000001f);
|
assertEquals(130, SystemUtils.toJavaVersionInt("XXX-1.3.x"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testJavaVersionAtLeastFloat() {
|
public void testJavaVersionAtLeastFloat() {
|
||||||
|
|
Loading…
Reference in New Issue