8325590: Regression in round-tripping UTF-16 strings after JDK-8311906 #17817
Conversation
Correct the result string coder of a string encoded using a CharsetDecoder with multi-byte encoded input. Added tests for UTF16 strings and a regression test
|
👋 Welcome back rriggs! A progress list of the required criteria for merging this PR into |
|
@RogerRiggs The following labels will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command. |
Webrevs
|
| System.out.printf("actual UTF_16 bytes: %s\n", Arrays.toString(actual.getBytes(UTF_16))); | ||
| } | ||
| assertEquals(actual, original, "Round trip string mismatch with multi-byte encoding"); | ||
| } |
There was a problem hiding this comment.
The update to newStringNoRepl1 looks fine.
The added test is very different to the tests in this source file. We really need to expand the test to exercise a lot more charsets and input cases. It's okay to have a targeted test for now but needs to be renamed to be consistent with the other tests. Also the other tests use testFiles as the file paths rather than putting files in /tmp.
There was a problem hiding this comment.
The UTF-16 charset is added to the existing readString test.
Additional charsets can be added, most will exercise the same code path in newStringNoRepl1 that uses a CharsetDecoder for all charsets other than UTF-8, ASCII, or ISO-8859-1.
The additional individual test is taken from the bug report and is not strictly necessary.
Cleanup regression test to match style of other tests
|
@RogerRiggs This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be: You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 20 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
|
/integrate |
|
Going to push as commit 13d9e8f.
Your commit was automatically rebased without conflicts. |
openjdk
bot
removed
ready
|
@RogerRiggs Pushed as commit 13d9e8f. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Correct the result string coder of a string encoded using a CharsetDecoder with multi-byte encoded input.
Added tests for UTF16 strings and a regression test.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/17817/head:pull/17817$ git checkout pull/17817Update a local copy of the PR:
$ git checkout pull/17817$ git pull https://git.openjdk.org/jdk.git pull/17817/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 17817View PR using the GUI difftool:
$ git pr show -t 17817Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/17817.diff
Webrev
Link to Webrev Comment