Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8241311: Move some charset mapping tests from closed to open #44

Closed
wants to merge 3 commits into from

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Jun 21, 2023

This is a second pre-requisite for JDK-8301119 ("Support for GB18030-2022") and so is being proposed for inclusion in 8u382 during rampdown, so that the changes are in place for when GB18030-2022 enforcement begins in August. It adds more tests for character mappings, including GB18030.

The patch only introduces new tests, shuffled to the correct location. The one change to an existing file (TestCharsetMapping.java) is dropped, as it only adds an unneeded @modules line. Similarly, @modules is dropped from CoderTest.java, ConverterTest.java and TestConv.java.

The remaining change is to MS950.c2b-irreversible. 8u does not have JDK-8232161, a change with an associated CSR that changed some of the mappings in the MS950 character set. We removed the four mappings from the test set, so as to match 8u's behaviour and avoid the CoderTest.java test from failing.

All sun.nio.cs tests pass with this patch applied.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8241311: Move some charset mapping tests from closed to open (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u.git pull/44/head:pull/44
$ git checkout pull/44

Update a local copy of the PR:
$ git checkout pull/44
$ git pull https://git.openjdk.org/jdk8u.git pull/44/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 44

View PR using the GUI difftool:
$ git pr show -t 44

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u/pull/44.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 21, 2023

👋 Welcome back andrew! A progress list of the required criteria for merging this PR into pr/43 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title Backport c809c9944400f7ee9bc296e40d6068273bde5912 8241311: Move some charset mapping tests from closed to open Jun 21, 2023
@openjdk
Copy link

openjdk bot commented Jun 21, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jun 21, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 21, 2023

Webrevs

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK.

@gnu-andrew gnu-andrew mentioned this pull request Jun 23, 2023
3 tasks
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/43 to master June 23, 2023 09:54
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout JDK-8241311
git fetch https://git.openjdk.org/jdk8u.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Jun 23, 2023

@gnu-andrew this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout JDK-8241311
git fetch https://git.openjdk.org/jdk8u.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Jun 23, 2023
@openjdk
Copy link

openjdk bot commented Jun 23, 2023

@gnu-andrew This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8241311: Move some charset mapping tests from closed to open

Reviewed-by: sgehwolf

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Jun 23, 2023
@gnu-andrew
Copy link
Member Author

I see jdk8u-critical-yes so will integrate when testing of the merge version completes.

@gnu-andrew
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 23, 2023

Going to push as commit 0bec498.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 23, 2023
@openjdk openjdk bot closed this Jun 23, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 23, 2023
@openjdk
Copy link

openjdk bot commented Jun 23, 2023

@gnu-andrew Pushed as commit 0bec498.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants