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

8297316: [TestBug] LocalDateTimeStringConverterTest.testChronologyConsistency fails with JDK 20 #1114

Closed
wants to merge 3 commits into from

Conversation

arapte
Copy link
Member

@arapte arapte commented Apr 25, 2023

The expected result was changed due to an enhancement in JDK:
JDK-8284840: Update CLDR to Version 42.0
Similar tests were corrected in JDK along with the enhancement: check this for example

We need to make similar change. But the expected result is different before JDK20 and with JDK20. The fix checks JDK major version to change expected result accordingly.


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-8297316: [TestBug] LocalDateTimeStringConverterTest.testChronologyConsistency fails with JDK 20

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1114

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jfx/pull/1114.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 25, 2023

👋 Welcome back arapte! 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 added the rfr Ready for review label Apr 25, 2023
@mlbridge
Copy link

mlbridge bot commented Apr 25, 2023

Webrevs

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Choose a reason for hiding this comment

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

The fix looks good. I left a (minor) comment suggesting that the initialization of the static JAPANESE_DATE_STRING field only needs to be done once for the class and not for each instance. I'll reapprove if you want to change it.

Comment on lines 108 to 115
final var version = Runtime.Version.parse(System.getProperty("java.version"));
if (version.major() < 20) {
// TODO: This can be removed when the minimum version of boot jdk
// for JFX build is updated to JDK20 or above.
JAPANESE_DATE_STRING = "Saturday, January 12, 60 Shōwa, 12:34:56 PM";
} else {
JAPANESE_DATE_STRING = "Saturday, January 12, 60 Shōwa, 12:34:56\u202fPM";
}
Copy link
Member

Choose a reason for hiding this comment

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

Minor: I think this could move to the (static) @BeforeClass method rather than being recomputed for each instance.

Copy link
Member Author

Choose a reason for hiding this comment

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

It is now moved to the @BeforeClass method.

@openjdk
Copy link

openjdk bot commented Apr 25, 2023

@arapte 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:

8297316: [TestBug] LocalDateTimeStringConverterTest.testChronologyConsistency fails with JDK 20

Reviewed-by: kcr

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 2 new commits pushed to the master branch:

  • e40000b: 8306424: [testbug] DatePickerUpdateOnAlertCloseTest fails on MacOS
  • cf5b838: 8306115: Update libxml2 to 2.10.4

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Ready to be integrated label Apr 25, 2023
@openjdk openjdk bot removed the ready Ready to be integrated label Apr 25, 2023
@openjdk openjdk bot added the ready Ready to be integrated label Apr 25, 2023
@arapte
Copy link
Member Author

arapte commented Apr 25, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Apr 25, 2023

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

  • e40000b: 8306424: [testbug] DatePickerUpdateOnAlertCloseTest fails on MacOS
  • cf5b838: 8306115: Update libxml2 to 2.10.4

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 25, 2023

@arapte Pushed as commit 52d32c0.

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

@arapte arapte deleted the jdk-8297316 branch October 23, 2023 12:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants