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.

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

8347146: Convert IncludeLocalesPluginTest to use JUnit #23016

Closed
wants to merge 2 commits into from
Closed

8347146: Convert IncludeLocalesPluginTest to use JUnit #23016

wants to merge 2 commits into from

Conversation

naotoj
Copy link
Member

@naotoj naotoj commented Jan 9, 2025 •
edited by openjdk bot
Loading

A simple refinement to the test makes diagnosing failures easier.

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-8347146: Convert IncludeLocalesPluginTest to use JUnit (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23016

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 9, 2025

👋 Welcome back naoto! 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 •
edited
Loading

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

8347146: Convert IncludeLocalesPluginTest to use JUnit

Reviewed-by: jlu, joehw

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

  • 379d05b: 8346990: Remove INTX_FORMAT and UINTX_FORMAT macros
  • d3a7ac2: 8346383: Cannot use DllMain in libdt_socket for static builds
  • 13a1775: 8344146: Remove temporary font file tracking code.
  • 61dc07c: 8346869: [AIX] Add regression test for handling 4 Byte aligned doubles in structures
  • 13e1ea5: 8346038: [REDO] - [C1] LIR Operations with one input should be implemented as LIR_Op1
  • 7c883c2: 8347605: Use spec tag to refer to IEEE 754 standard
  • 4e0ffda: 8346972: Test java/nio/channels/FileChannel/LoopingTruncate.java fails sometimes with IOException: There is not enough space on the disk
  • e0f2f4b: 8313396: Portable implementation of FORBID_C_FUNCTION and ALLOW_C_FUNCTION
  • b0c131e: 8345368: java/io/File/createTempFile/SpecialTempFile.java fails on Windows Server 2025
  • a7915bb: 8346468: SM cleanup of common test library
  • ... and 96 more: https://git.openjdk.org/jdk/compare/9702accdd9a25e05628d470bf248edd5d80c0c4d...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 added the rfr Pull request is ready for review label Jan 9, 2025
@openjdk
Copy link

openjdk bot commented Jan 9, 2025

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

mlbridge bot commented Jan 9, 2025 •
edited
Loading

Webrevs

justin-curtis-lu
justin-curtis-lu approved these changes Jan 9, 2025
View reviewed changes
Copy link
Member

@justin-curtis-lu justin-curtis-lu left a comment

Choose a reason for hiding this comment

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

Looked through the changes and the swap to a JUnit ParameterizedTest looks good to me.

test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java Outdated
@@ -424,47 +414,43 @@ public static void main(String[] args) throws Exception {

helper = Helper.newHelper(isLinkableRuntime);
if (helper == null) {
throw new RuntimeException("Helper could not be initialized");
fail("Helper could not be initialized");
Copy link
Member

Choose a reason for hiding this comment

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

Could be assertNotNull, but probably best to not use an assertion in the setup method.

Copy link
Member Author

Choose a reason for hiding this comment

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

Replaced with assertion here, and one other location. I think it is fine

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 14, 2025
@naotoj
Copy link
Member Author

naotoj commented Jan 14, 2025

Thanks for the reviews!
/integrate

@openjdk
Copy link

openjdk bot commented Jan 14, 2025

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

  • db76f47: 8347720: [BACKOUT] Portable implementation of FORBID_C_FUNCTION and ALLOW_C_FUNCTION
  • e6902cf: 8323740: java.lang.ExceptionInInitializerError when trying to load XML classes in wrong order
  • a01e92c: 8347724: Replace SIZE_FORMAT in jfr directory
  • d002933: 8347286: (fs) Remove some extensions from java/nio/file/Files/probeContentType/Basic.java
  • d532019: 8347143: [aix] Fix strdup use in os::dll_load
  • dfd215b: 8347376: tools/jlink/runtimeImage/JavaSEReproducibleTest.java and PackagedModulesVsRuntimeImageLinkTest.java failed after JDK-8321413
  • a49f833: 8346045: Cleanup of security library tests calling Security Manager APIs
  • 56c7800: 8347381: Upgrade jQuery UI to version 1.14.1
  • 1c64a45: 8347501: Make static-launcher fails after JDK-8346669
  • b4cd3b1: 8347566: Replace SSIZE_FORMAT with 'z' length modifier
  • ... and 116 more: https://git.openjdk.org/jdk/compare/9702accdd9a25e05628d470bf248edd5d80c0c4d...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

@naotoj Pushed as commit 06ff4c1.

💡 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

@justin-curtis-lu justin-curtis-lu justin-curtis-lu approved these changes

@JoeWang-Java JoeWang-Java JoeWang-Java approved these changes

Assignees
No one assigned
Labels
core-libs core-libs-dev@openjdk.org i18n i18n-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
Development

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