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

8299439: java/text/Format/NumberFormat/CurrencyFormat.java fails for hr_HR #228

Closed
wants to merge 1 commit into from

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Jan 11, 2023

This is a mostly clean backport from 11u. The only difference is the ProblemList.txt copyright header change didn't apply, so I just omitted this. It seems odd to include such a change when there are no changes to the content of the file. Maybe this makes sense for 11+ where the file is more in sync with trunk, but it will actually create problems in 8u backporting earlier fixes.

There are actually two fixes here, which may not be clear from the original bug:

  1. The test data for the CurrencyFormat.java test still expects hr_HR to return Kn and hasn't been updated following Croatia's move to the Euro.
  2. When that is corrected, there is still a mismatch because the JDK is not converting the currency code EUR to the Euro symbol. The same change to CurrencyNames_hr_HR.properties is required as was made to CurrencyNames_lt_LT.properties for Lithuania's move to the Euro in 2014

The above was verified by running the unpatched test against an unpatched JDK ("Wrong currency symbol for locale hr_HR, expected: Kn, got: EUR"), the patched test against an unpatched JDK ("Wrong currency symbol for locale hr_HR, expected: \u20ac, got: EUR") and the patched test against a patched JDK (both \u20AC). Only the last of these passes.

The patch also removes the long redundant time dependencies for Lithuania and Latvia.


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

Issues

  • JDK-8299439: java/text/Format/NumberFormat/CurrencyFormat.java fails for hr_HR
  • JDK-8299483: ProblemList java/text/Format/NumberFormat/CurrencyFormat.java

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 228

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 11, 2023

👋 Welcome back andrew! A progress list of the required criteria for merging this PR into master 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 80eecc50e663155f04dcec1797efb4be4b8ee7b2 8299439: java/text/Format/NumberFormat/CurrencyFormat.java fails for hr_HR Jan 11, 2023
@openjdk
Copy link

openjdk bot commented Jan 11, 2023

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

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

mlbridge bot commented Jan 11, 2023

Webrevs

@gnu-andrew
Copy link
Member Author

Failures appear to be down to download errors, nothing to do with the patch.

Copy link
Contributor

@dimitryc dimitryc left a comment

Choose a reason for hiding this comment

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

Looks good

@openjdk
Copy link

openjdk bot commented Jan 11, 2023

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

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

8299439: java/text/Format/NumberFormat/CurrencyFormat.java fails for hr_HR
8299483: ProblemList java/text/Format/NumberFormat/CurrencyFormat.java

Reviewed-by: dcherepanov, 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 the ready Pull request is ready to be integrated label Jan 11, 2023
@gnu-andrew
Copy link
Member Author

gnu-andrew commented Jan 12, 2023

I see jdk8u-fix-yes.

/integrate

@gnu-andrew
Copy link
Member Author

Test failure is a timeout on gc/6581734/Test6581734.java. Is this a known failure?

@openjdk
Copy link

openjdk bot commented Jan 12, 2023

Going to push as commit a5c3ebe.
Since your change was applied there have been 2 commits pushed to the master branch:

  • 9d954b9: 8289695: [TESTBUG] TestMemoryAwareness.java fails on cgroups v2 and crun
  • 5a3fc18: 8299804: Fix non-portable code in hotspot shell tests in 8u

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 12, 2023

@gnu-andrew Pushed as commit a5c3ebe.

💡 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
Development

Successfully merging this pull request may close these issues.

3 participants