Skip to content

8379326: Use JUnit in lib-test/jdk tests, here MethodTemplateTest#30087

Closed
sormuras wants to merge 1 commit intoopenjdk:masterfrom
sormuras:8379326-convert-testlib-to-junit
Closed

8379326: Use JUnit in lib-test/jdk tests, here MethodTemplateTest#30087
sormuras wants to merge 1 commit intoopenjdk:masterfrom
sormuras:8379326-convert-testlib-to-junit

Conversation

@sormuras
Copy link
Member

@sormuras sormuras commented Mar 5, 2026

Please review this change to use JUnit API in MethodTemplateTest.java. As only simple assertTrue and assertFalse are being called in test code, a swap of packages in import statements suffices.

This pull request also disallows testng actions in jtreg under this test root to prevent future additions of TestNG-based tests. See the umbrella issue https://bugs.openjdk.org/browse/JDK-8307843 and its associated subtasks for details.


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-8379326: Use JUnit in lib-test/jdk tests, here MethodTemplateTest (Sub-task - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 30087

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 5, 2026

👋 Welcome back cstein! 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 Mar 5, 2026

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

8379326: Use JUnit in lib-test/jdk tests, here MethodTemplateTest

Reviewed-by: dfuchs, rriggs

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:

  • 4d9d2c3: 8284315: DocTrees.getElement is inconsistent with Elements.getTypeElement
  • 0668dab: 8379114: HttpServer path prefix matching incorrectly matches paths that are not slash-prefixed

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 core-libs core-libs-dev@openjdk.org label Mar 5, 2026
@openjdk
Copy link

openjdk bot commented Mar 5, 2026

@sormuras The following label will be automatically applied to this pull request:

  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. 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 Mar 5, 2026
@mlbridge
Copy link

mlbridge bot commented Mar 5, 2026

Webrevs

@dfuch
Copy link
Member

dfuch commented Mar 5, 2026

I am not a typical Reviewer for that area, so maybe wait for someone who's worked on this codebase before to approve, before integrating. That said, having already converted a few TestNG tests to JUnit myself, I had a look at your proposed changes and they looked good. I verified that there was not assertEquals that would have required swapping the parameter order, and therefore no need to replace assertEquals with assertArrayEquals anywhere either.
So LGTM.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 5, 2026
Copy link
Contributor

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

@sormuras
Copy link
Member Author

sormuras commented Mar 6, 2026

Thanks for the reviews.

/integrate

@openjdk
Copy link

openjdk bot commented Mar 6, 2026

Going to push as commit a2ad080.
Since your change was applied there have been 14 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 Mar 6, 2026
@openjdk openjdk bot closed this Mar 6, 2026
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 6, 2026
@openjdk
Copy link

openjdk bot commented Mar 6, 2026

@sormuras Pushed as commit a2ad080.

💡 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 integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants