Skip to content

8368335: Refactor the rest of Locale TestNG based tests to JUnit #27441

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 3 commits into from
Closed

8368335: Refactor the rest of Locale TestNG based tests to JUnit #27441

wants to merge 3 commits into from

Conversation

justin-curtis-lu
Copy link
Member

@justin-curtis-lu justin-curtis-lu commented Sep 22, 2025 •
edited by openjdk bot
Loading

Please review this PR which finishes the conversions of TestNG to JUnit within the Locale tests. (Primarily under bcp47u with a few other stragglers.) Tests pass as before. The same number of tests completed in the test results section remain the same.

test/jdk/java/util/Locale/LocaleMatchingTest.java
test/jdk/java/util/Locale/RequiredAvailableLocalesTest.java
test/jdk/java/util/Locale/TestOf.java
test/jdk/java/util/Locale/bcp47u/CalendarTests.java
test/jdk/java/util/Locale/bcp47u/CurrencyFormatTests.java
test/jdk/java/util/Locale/bcp47u/CurrencyTests.java
test/jdk/java/util/Locale/bcp47u/DisplayNameTests.java
test/jdk/java/util/Locale/bcp47u/FormatTests.java
test/jdk/java/util/Locale/bcp47u/SymbolsTests.java
test/jdk/java/util/Locale/bcp47u/SystemPropertyTests.java

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-8368335: Refactor the rest of Locale TestNG based tests to JUnit (Sub-task - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 27441

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/27441.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 22, 2025

👋 Welcome back jlu! 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 Sep 22, 2025 •
edited
Loading

@justin-curtis-lu 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:

8368335: Refactor the rest of Locale TestNG based tests to JUnit

Reviewed-by: naoto, liach

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 24 new commits pushed to 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 changed the title JDK-8368335: Refactor the rest of Locale TestNG based tests to JUnit 8368335: Refactor the rest of Locale TestNG based tests to JUnit Sep 22, 2025
@openjdk
Copy link

openjdk bot commented Sep 22, 2025 •
edited
Loading

@justin-curtis-lu The following labels will be automatically applied to this pull request:

  • core-libs
  • i18n

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.

@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 22, 2025
@mlbridge
Copy link

mlbridge bot commented Sep 22, 2025 •
edited
Loading

Webrevs

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 23, 2025
naotoj
naotoj approved these changes Sep 23, 2025
View reviewed changes
Copy link
Member

@naotoj naotoj left a comment

Choose a reason for hiding this comment

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

LGTM

test/jdk/java/util/Locale/LocaleMatchingTest.java
assertNotEquals(lr1, lr4, " LR(ja, 1.0).equals(LR(en, 1.0)) should return false.");
assertNotNull(lr1, " LR(ja, 1.0).equals(null) should return false.");
assertNotEquals(lr1, "", " LR(ja, 1.0).equals(\"\") should return false.");
assertNotEquals("", lr1, " LR(ja, 1.0).equals(\"\") should return false.");
Copy link
Member

Choose a reason for hiding this comment

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

Nit: If we change the unexpected and actual, probably do the same for L346/347

Copy link
Member Author

Choose a reason for hiding this comment

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

I had originally left L345-347 untouched because it seemed like one of those cases where there wasn't a clear expected/unexpected (compared to the "" in L349). But you are right that it would be consistent and no reason to not do so considering the opposite actual vs expected positioning of TestNG vs JUnit. Fixed in aef3447.

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Sep 23, 2025
@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 23, 2025
@justin-curtis-lu
Copy link
Member Author

Thank you for the reviews.
/integrate

@openjdk
Copy link

openjdk bot commented Sep 24, 2025

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 24, 2025

@justin-curtis-lu Pushed as commit 5d93242.

💡 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
Reviewers
2 more reviewers

@naotoj naotoj naotoj approved these changes

@liach liach liach approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
core-libs [email protected] i18n [email protected] integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@justin-curtis-lu @naotoj @liach