@@ -18,31 +18,29 @@ public void givenJava_whenUsingRuntime_thenGetVersion() {
1818 @ Test
1919 @ Disabled ("Only valid for Java 8 and lower" )
2020 public void givenJava_whenUsingCommonsLang_thenGetVersion () {
21- String expectedVersion = "8" ;
22- String version = SystemUtils .JAVA_SPECIFICATION_VERSION ;
23- if (version .startsWith ("1." )) {
24- version = version .substring (2 , 3 );
21+ int expectedVersion = 8 ;
22+ String [] versionElements = SystemUtils .JAVA_SPECIFICATION_VERSION .split ("\\ ." );
23+ int discard = Integer .parseInt (versionElements [0 ]);
24+ int version ;
25+ if (discard == 1 ) {
26+ version = Integer .parseInt (versionElements [1 ]);
2527 } else {
26- int separator = version .indexOf ("." );
27- if (separator != -1 ) {
28- version = version .substring (0 , separator );
29- }
28+ version = discard ;
3029 }
3130 Assertions .assertThat (version ).isEqualTo (expectedVersion );
3231 }
3332
3433 @ Test
3534 @ Disabled ("Only valid for Java 8 and lower" )
3635 public void givenJava_whenUsingSystemProp_thenGetVersion () {
37- String expectedVersion = "8" ;
38- String version = System .getProperty ("java.version" );
39- if (version .startsWith ("1." )) {
40- version = version .substring (2 , 3 );
36+ int expectedVersion = 8 ;
37+ String [] versionElements = System .getProperty ("java.version" ).split ("\\ ." );
38+ int discard = Integer .parseInt (versionElements [0 ]);
39+ int version ;
40+ if (discard == 1 ) {
41+ version = Integer .parseInt (versionElements [1 ]);
4142 } else {
42- int separator = version .indexOf ("." );
43- if (separator != -1 ) {
44- version = version .substring (0 , separator );
45- }
43+ version = discard ;
4644 }
4745 Assertions .assertThat (version ).isEqualTo (expectedVersion );
4846 }
0 commit comments