Skip to content

Commit 4ec9b8e

Browse files
garydgregorygarydgregory
committed
Add missing assertions for Java 25 in SystemUtilsTest
1 parent f2f204d commit 4ec9b8e

File tree

1 file changed

+53
-11
lines changed

1 file changed

+53
-11
lines changed

‎src/test/java/org/apache/commons/lang3/SystemUtilsTest.java‎

Lines changed: 53 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,11 @@ private boolean getIS_JAVA(final int version) throws Exception {
5454
*/
5555
public int getLastSupportedJavaVersion() {
5656
int lastSupportedVersion = 0;
57-
5857
for (final Field field : SystemUtils.class.getFields()) {
5958
if (field.getName().matches("IS_JAVA_\\d+")) {
6059
lastSupportedVersion = Math.max(lastSupportedVersion, Integer.parseInt(field.getName().substring(8)));
6160
}
6261
}
63-
6462
return lastSupportedVersion;
6563
}
6664

@@ -93,6 +91,8 @@ void test_IS_JAVA() throws Exception {
9391
assertFalse(SystemUtils.IS_JAVA_21);
9492
assertFalse(SystemUtils.IS_JAVA_22);
9593
assertFalse(SystemUtils.IS_JAVA_23);
94+
assertFalse(SystemUtils.IS_JAVA_24);
95+
assertFalse(SystemUtils.IS_JAVA_25);
9696
for (int version = 9; version <= lastSupportedVersion; version++) {
9797
assertFalse(getIS_JAVA(version));
9898
}
@@ -120,10 +120,11 @@ void test_IS_JAVA() throws Exception {
120120
assertFalse(SystemUtils.IS_JAVA_21);
121121
assertFalse(SystemUtils.IS_JAVA_22);
122122
assertFalse(SystemUtils.IS_JAVA_23);
123+
assertFalse(SystemUtils.IS_JAVA_24);
124+
assertFalse(SystemUtils.IS_JAVA_25);
123125
for (int version = 9; version <= lastSupportedVersion; version++) {
124126
assertFalse(getIS_JAVA(version));
125127
}
126-
127128
} else if (!javaVersion.startsWith("1.")) {
128129
assertFalse(SystemUtils.IS_JAVA_1_1);
129130
assertFalse(SystemUtils.IS_JAVA_1_2);
@@ -134,11 +135,9 @@ void test_IS_JAVA() throws Exception {
134135
assertFalse(SystemUtils.IS_JAVA_1_7);
135136
assertFalse(SystemUtils.IS_JAVA_1_8);
136137
assertEquals(javaVersion.startsWith("9"), SystemUtils.IS_JAVA_1_9);
137-
138138
for (int version = 9; version <= lastSupportedVersion; version++) {
139139
assertEquals(javaVersion.startsWith("" + version), getIS_JAVA(version));
140140
}
141-
142141
} else {
143142
System.out.println("Can't test IS_JAVA value: " + javaVersion);
144143
}
@@ -1357,6 +1356,7 @@ void testJavaVersionMatches() {
13571356
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
13581357
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
13591358
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1359+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
13601360
javaVersion = "";
13611361
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
13621362
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1383,6 +1383,7 @@ void testJavaVersionMatches() {
13831383
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
13841384
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
13851385
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1386+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
13861387
javaVersion = "1.0";
13871388
assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
13881389
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1409,6 +1410,7 @@ void testJavaVersionMatches() {
14091410
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
14101411
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
14111412
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1413+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
14121414
javaVersion = "1.1";
14131415
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
14141416
assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1435,6 +1437,7 @@ void testJavaVersionMatches() {
14351437
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
14361438
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
14371439
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1440+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
14381441
javaVersion = "1.2";
14391442
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
14401443
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1461,6 +1464,7 @@ void testJavaVersionMatches() {
14611464
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
14621465
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
14631466
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1467+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
14641468
javaVersion = "1.3.0";
14651469
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
14661470
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1487,6 +1491,7 @@ void testJavaVersionMatches() {
14871491
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
14881492
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
14891493
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1494+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
14901495
javaVersion = "1.3.1";
14911496
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
14921497
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1513,6 +1518,7 @@ void testJavaVersionMatches() {
15131518
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
15141519
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
15151520
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1521+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
15161522
javaVersion = "1.4.0";
15171523
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
15181524
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1539,6 +1545,7 @@ void testJavaVersionMatches() {
15391545
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
15401546
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
15411547
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1548+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
15421549
javaVersion = "1.4.1";
15431550
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
15441551
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1565,6 +1572,7 @@ void testJavaVersionMatches() {
15651572
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
15661573
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
15671574
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1575+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
15681576
javaVersion = "1.4.2";
15691577
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
15701578
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1591,6 +1599,7 @@ void testJavaVersionMatches() {
15911599
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
15921600
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
15931601
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1602+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
15941603
javaVersion = "1.5.0";
15951604
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
15961605
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1617,6 +1626,7 @@ void testJavaVersionMatches() {
16171626
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
16181627
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
16191628
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1629+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
16201630
javaVersion = "1.6.0";
16211631
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
16221632
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1643,6 +1653,7 @@ void testJavaVersionMatches() {
16431653
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
16441654
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
16451655
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1656+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
16461657
javaVersion = "1.7.0";
16471658
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
16481659
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1669,6 +1680,7 @@ void testJavaVersionMatches() {
16691680
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
16701681
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
16711682
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1683+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
16721684
javaVersion = "1.8.0";
16731685
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
16741686
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1695,6 +1707,7 @@ void testJavaVersionMatches() {
16951707
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
16961708
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
16971709
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1710+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
16981711
javaVersion = "9";
16991712
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
17001713
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1721,6 +1734,7 @@ void testJavaVersionMatches() {
17211734
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
17221735
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
17231736
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1737+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
17241738
javaVersion = "10";
17251739
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
17261740
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1747,6 +1761,7 @@ void testJavaVersionMatches() {
17471761
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
17481762
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
17491763
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1764+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
17501765
javaVersion = "11"; // LTS
17511766
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
17521767
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1773,6 +1788,7 @@ void testJavaVersionMatches() {
17731788
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
17741789
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
17751790
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1791+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
17761792
javaVersion = "17"; // LTS
17771793
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
17781794
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1799,6 +1815,7 @@ void testJavaVersionMatches() {
17991815
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
18001816
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
18011817
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1818+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
18021819
javaVersion = "21"; // LTS
18031820
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
18041821
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1825,6 +1842,7 @@ void testJavaVersionMatches() {
18251842
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
18261843
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
18271844
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1845+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
18281846
javaVersion = "22";
18291847
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
18301848
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1851,6 +1869,7 @@ void testJavaVersionMatches() {
18511869
assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
18521870
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
18531871
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1872+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
18541873
javaVersion = "23";
18551874
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
18561875
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1877,6 +1896,7 @@ void testJavaVersionMatches() {
18771896
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
18781897
assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
18791898
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1899+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
18801900
javaVersion = "24";
18811901
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
18821902
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
@@ -1903,6 +1923,34 @@ void testJavaVersionMatches() {
19031923
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
19041924
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
19051925
assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1926+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
1927+
javaVersion = "25";
1928+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0"));
1929+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1"));
1930+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.2"));
1931+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.3"));
1932+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.4"));
1933+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.5"));
1934+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.6"));
1935+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.7"));
1936+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.8"));
1937+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "9"));
1938+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "10"));
1939+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "11"));
1940+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "12"));
1941+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "13"));
1942+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "14"));
1943+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "15"));
1944+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "16"));
1945+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "17"));
1946+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "18"));
1947+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "19"));
1948+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20"));
1949+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21"));
1950+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22"));
1951+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23"));
1952+
assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24"));
1953+
assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "25"));
19061954
}
19071955

19081956
@Test
@@ -1948,34 +1996,28 @@ void testOSMatchesNameAndVersion() {
19481996
void testOsVersionMatches() {
19491997
String osVersion = null;
19501998
assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.1"));
1951-
19521999
osVersion = "";
19532000
assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.1"));
1954-
19552001
osVersion = "10";
19562002
assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.1"));
19572003
assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.1.1"));
19582004
assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.10"));
19592005
assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.10.1"));
1960-
19612006
osVersion = "10.1";
19622007
assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.1"));
19632008
assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.1.1"));
19642009
assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.10"));
19652010
assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.10.1"));
1966-
19672011
osVersion = "10.1.1";
19682012
assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.1"));
19692013
assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.1.1"));
19702014
assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.10"));
19712015
assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.10.1"));
1972-
19732016
osVersion = "10.10";
19742017
assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.1"));
19752018
assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.1.1"));
19762019
assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.10"));
19772020
assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.10.1"));
1978-
19792021
osVersion = "10.10.1";
19802022
assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.1"));
19812023
assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.1.1"));

0 commit comments

Comments
 (0)