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

JDK-8325908: Finish removal of IntlTest and CollatorTest #17858

Conversation

justin-curtis-lu
Copy link
Member

@justin-curtis-lu justin-curtis-lu commented Feb 14, 2024

Please review this PR which fixes / finishes the rest of the IntlTest test framework removal in java.text and java.util.i18n tests.

For context, the IntlTest class only ran methods prefixed by test or Test with public visibility and was originally removed due to some tests spuriously passing that were not aware of the specific running requirements.

This PR includes the following changes,

  • There were some tests with package-private visibility that were never ran by IntlTest. Those tests do appear to be valid tests, and thus have been updated with @Test annotation.
  • The test method DFSExponenTest() in DFSExponential.java was not prefixed by test and thus never ran by IntlTest. It is a valid test and should be ran as well.
  • DateFormatRoundTripTest.java was supposed to remain a non JUnit test, however the run invocation was converted to @run junit ... this has been switched back to @run main ...
  • There were two instances of the script missing some tests that should have had their methods updated with the @Test annotation: APITest.java and DFSSerialization.java. These tests have been updated 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-8325908: Finish removal of IntlTest and CollatorTest (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17858

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 14, 2024

👋 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 openjdk bot added the rfr Pull request is ready for review label Feb 14, 2024
@openjdk
Copy link

openjdk bot commented Feb 14, 2024

@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 core-libs core-libs-dev@openjdk.org i18n i18n-dev@openjdk.org labels Feb 14, 2024
@mlbridge
Copy link

mlbridge bot commented Feb 14, 2024

Webrevs

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


public void DFSExponenTest() throws Exception {
@Test
public void DFSExponenTest() throws Exception {
Copy link
Member

Choose a reason for hiding this comment

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

Not your change, but the method name reads odd to me. TestDFSExponential may be better alined with the other test for serialization.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done, thanks for the review.

@openjdk
Copy link

openjdk bot commented Feb 15, 2024

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

8325908: Finish removal of IntlTest and CollatorTest

Reviewed-by: naoto

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 45 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 added the ready Pull request is ready to be integrated label Feb 15, 2024
@justin-curtis-lu
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Feb 16, 2024

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

  • 5310250: 8325941: Remove unused Space::block_size
  • 7a76252: 8325990: Remove use of snippet @replace annotation in java.base
  • 00b5c70: 8326062: ProblemList jcstress tests that are failing due to JDK-8325984
  • 4388095: 8325326: [PPC64] Don't relocate in case of allocation failure
  • 244573e: 8265372: Simplify PKCS9Attribute
  • 80b63b6: 8323801: tag doesn't strikethrough the text
  • 9f4ec21: 8325862: set -XX:+ErrorFileToStderr when executing java in containers for some container related jtreg tests
  • 0aaec97: 8325763: Revert properties: vm.opt.x.*
  • 4018b2b: 8323782: Race: Thread::interrupt vs. AbstractInterruptibleChannel.begin
  • 2705ed0: 8325074: ZGC fails assert(index == 0 || is_power_of_2(index)) failed: Incorrect load shift: 11
  • ... and 64 more: https://git.openjdk.org/jdk/compare/16b3be0a76b0a71c8f59168dfc94c06d8a899bd4...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 16, 2024

@justin-curtis-lu Pushed as commit 4c7b313.

💡 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
core-libs core-libs-dev@openjdk.org i18n i18n-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants