Commit 0d0564c
authored
Fix JDK 26 compatibility in CharsetsTest for ArrayEncoder API change (#6902)
Adapt CharsetsTest to support both JDK 26+ (new encodeFromUTF16 API) and
earlier JDK versions (old encode API) using version-aware method selection.
JDK 26 removed the unused sun.nio.cs.ArrayEncoder::encode method and
replaced it with encodeFromUTF16 which accepts UTF-16 encoded byte arrays
instead of char arrays (JDK-8363925).
Changes:
- Add JavaVersion utility for JDK version detection
- Update static initialization to load appropriate method based on JDK version
- Modify encode_data to use encodeFromUTF16 for JDK 26+ and encode for earlier versions
- Convert char[] to UTF-16 LE byte array when using new API
Files Modified:
- functional/MBCS_Tests/charsets/src/CharsetsTest.java
Files Created:
- functional/MBCS_Tests/charsets/src/JavaVersion.java
Fixes test failures caused by JDK 26's ArrayEncoder API change (JDK-8363925).
Reference: https://bugs.openjdk.org/browse/JDK-8363925
Signed-off-by: Rishabh Thakur <rishabh@ibm.com>1 parent 9885da2 commit 0d0564c
File tree
2 files changed
+95
-3
lines changed- functional/MBCS_Tests/charsets/src
2 files changed
+95
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| 35 | + | |
35 | 36 | | |
36 | 37 | | |
37 | 38 | | |
| |||
41 | 42 | | |
42 | 43 | | |
43 | 44 | | |
44 | | - | |
45 | | - | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
46 | 57 | | |
| 58 | + | |
47 | 59 | | |
48 | 60 | | |
49 | 61 | | |
| |||
223 | 235 | | |
224 | 236 | | |
225 | 237 | | |
| 238 | + | |
226 | 239 | | |
227 | | - | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
228 | 254 | | |
229 | 255 | | |
230 | 256 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
0 commit comments