Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-lang.git

This commit is contained in:
Gary Gregory 2020-06-13 18:30:50 -04:00
parent 494a4db395 31d7eea1c6
commit 98eda51817
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/apache/commons/lang3/JavaVersion.java
View File

@ -115,6 +115,20 @@ public enum JavaVersion {
*/
JAVA_13(13.0f, "13"),
/**
* Java 14
*
* @since 3.11
*/
JAVA_14(14.0f, "14"),
/**
* Java 15
*
* @since 3.11
*/
JAVA_15(15.0f, "15"),
/**
* The most recent java version. Mainly introduced to avoid to break when a new version of Java is used.
*/
@ -224,6 +238,10 @@ static JavaVersion get(final String nom) {
return JAVA_12;
} else if ("13".equals(nom)) {
return JAVA_13;
} else if ("14".equals(nom)) {
return JAVA_14;
} else if ("15".equals(nom)) {
return JAVA_15;
}
final float v = toFloatVersion(nom);
if ((v - 1.) < 1.) { // then we need to check decimals > .9

6
src/test/java/org/apache/commons/lang3/JavaVersionTest.java
View File

@ -25,6 +25,8 @@
import static org.apache.commons.lang3.JavaVersion.JAVA_11;
import static org.apache.commons.lang3.JavaVersion.JAVA_12;
import static org.apache.commons.lang3.JavaVersion.JAVA_13;
import static org.apache.commons.lang3.JavaVersion.JAVA_14;
import static org.apache.commons.lang3.JavaVersion.JAVA_15;
import static org.apache.commons.lang3.JavaVersion.JAVA_1_1;
import static org.apache.commons.lang3.JavaVersion.JAVA_1_2;
import static org.apache.commons.lang3.JavaVersion.JAVA_1_3;
@ -62,10 +64,12 @@ public void testGetJavaVersion() {
assertEquals(JAVA_11, get("11"), "11 failed");
assertEquals(JAVA_12, get("12"), "12 failed");
assertEquals(JAVA_13, get("13"), "13 failed");
assertEquals(JAVA_14, get("14"), "14 failed");
assertEquals(JAVA_15, get("15"), "15 failed");
assertEquals(JAVA_RECENT, get("1.10"), "1.10 failed");
// assertNull("2.10 unexpectedly worked", get("2.10"));
assertEquals(get("1.5"), getJavaVersion("1.5"), "Wrapper method failed");
assertEquals(JAVA_RECENT, get("14"), "Unhandled"); // LANG-1384
assertEquals(JAVA_RECENT, get("16"), "Unhandled"); // LANG-1384
}
@Test