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

8311663: Additional refactoring of Locale tests to JUnit #3196

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 9, 2025

test/jdk/java/util/Locale/Bug8135061.java
test/jdk/java/util/Locale/Bug8159420.java
test/jdk/java/util/Locale/ThaiGov.java

These three need to be resolved because
"8283698: Refactor Locale constructors used in src/test" is not in 17.
Basically I took over the head version of the test in 21, and reverted the refactored constructor call.

test/jdk/java/util/Locale/UseOldISOCodesTest.java

is not in 17. It was added by "8295232: "java.locale.useOldISOCodes" property is read lazily".
As I understand the error fixed by JDK-8295232 was introduced by closed JDK-8294667. I built
jdk20 before JDK-8295232 was pushed, this causes the test to fail.
With 17 and 20 after this change it passes. I would like to take the test to 17 to
improve testing along with this change. This would also alert us if a change breaking
this is backported.
As with the changes above I had to undo JDK-8283698.


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
  • JDK-8311663 needs maintainer approval

Issue

  • JDK-8311663: Additional refactoring of Locale tests to JUnit (Sub-task - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3196

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 9, 2025

👋 Welcome back goetz! 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
Copy link

openjdk bot commented Jan 9, 2025

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

8311663: Additional refactoring of Locale tests to JUnit

Reviewed-by: rschmelter

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

  • 59f98c1: 8226933: [TEST_BUG]GTK L&F: There is no swatches or RGB tab in JColorChooser
  • 7c825dd: 8314225: SIGSEGV in JavaThread::is_lock_owned
  • 06c8242: 8198237: [macos] Test java/awt/Frame/ExceptionOnSetExtendedStateTest/ExceptionOnSetExtendedStateTest.java fails
  • b0286b3: 8327505: Test com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java fails
  • 6a1576d: 8317636: Improve heap walking API tests to verify correctness of field indexes
  • 0228f7c: 8208565: [TEST_BUG] javax\swing\PopupFactory\6276087\NonOpaquePopupMenuTest.java throws NPE
  • c93489b: 8314610: hotspot can't compile with the latest of gtest because of
  • 36481dd: 8328368: Convert java/awt/image/multiresolution/MultiDisplayTest/MultiDisplayTest.java applet test to main
  • 4dab8ba: 8311306: Test com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java failed: out of expected range
  • fe3e985: 8292704: sun/security/tools/jarsigner/compatibility/Compatibility.java use wrong key size for EC
  • ... and 4 more: https://git.openjdk.org/jdk17u-dev/compare/96100ad2f4c71d924468c1feed37f323eebf91dc...master

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 changed the title Backport 71cac8ce47b69a2b78d54cbceb0f0510e5ea4cdc 8311663: Additional refactoring of Locale tests to JUnit Jan 9, 2025
@openjdk
Copy link

openjdk bot commented Jan 9, 2025

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 Jan 9, 2025
@mlbridge
Copy link

mlbridge bot commented Jan 9, 2025

Webrevs

@schmelter-sap
Copy link
Contributor

Looks good.

Copy link
Contributor

@schmelter-sap schmelter-sap 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 13, 2025

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Jan 13, 2025
@GoeLin
Copy link
Member Author

GoeLin commented Jan 14, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Jan 14, 2025

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

  • 5491436: 8328085: C2: Use after free in PhaseChaitin::Register_Allocate()
  • 59f98c1: 8226933: [TEST_BUG]GTK L&F: There is no swatches or RGB tab in JColorChooser
  • 7c825dd: 8314225: SIGSEGV in JavaThread::is_lock_owned
  • 06c8242: 8198237: [macos] Test java/awt/Frame/ExceptionOnSetExtendedStateTest/ExceptionOnSetExtendedStateTest.java fails
  • b0286b3: 8327505: Test com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java fails
  • 6a1576d: 8317636: Improve heap walking API tests to verify correctness of field indexes
  • 0228f7c: 8208565: [TEST_BUG] javax\swing\PopupFactory\6276087\NonOpaquePopupMenuTest.java throws NPE
  • c93489b: 8314610: hotspot can't compile with the latest of gtest because of
  • 36481dd: 8328368: Convert java/awt/image/multiresolution/MultiDisplayTest/MultiDisplayTest.java applet test to main
  • 4dab8ba: 8311306: Test com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java failed: out of expected range
  • ... and 5 more: https://git.openjdk.org/jdk17u-dev/compare/96100ad2f4c71d924468c1feed37f323eebf91dc...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 14, 2025

@GoeLin Pushed as commit 10e109d.

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

@GoeLin GoeLin deleted the goetz_backport_8311663 branch January 14, 2025 13:29
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.

2 participants