Skip to content

8373796: Refactor java/net/httpclient/ThrowingPublishers*.java tests to use JUnit5#390

Closed
rm-gh-8 wants to merge 1 commit intoopenjdk:masterfrom
rm-gh-8:JDK-8373796-V25
Closed

8373796: Refactor java/net/httpclient/ThrowingPublishers*.java tests to use JUnit5#390
rm-gh-8 wants to merge 1 commit intoopenjdk:masterfrom
rm-gh-8:JDK-8373796-V25

Conversation

@rm-gh-8
Copy link
Copy Markdown
Contributor

@rm-gh-8 rm-gh-8 commented Mar 13, 2026 •
edited by openjdk Bot
Loading

Backporting JDK-8373796: Refactor java/net/httpclient/ThrowingPublishers*.java tests to use JUnit5.

This PR migrates the ThrowingPublishers test family (8 tests + abstract base) from TestNG to JUnit 5, converting data providers to @MethodSource, instance state to static, and the stop-after-first-failure mechanism to a JUnit TestWatcher/BeforeEachCallback extension..

For parity with Oracle JDK.

This PR is not clean because "test/jdk/java/net/httpclient/AbstractThrowingPublishers.java" skips a commit implementing JEP 517 (openjdk/jdk@e8db14f) which is not part of JDK 25. The file has been updated to preserve existing functionality while excluding the JEP 517 changes.

Ran related tests on linux-x64, linux-aarch64, macos-aarch64 and windows-x64:

make test TEST=test/jdk/java/net/httpclient/ThrowingPublishersCustomAfterCancel.java
make test TEST=test/jdk/java/net/httpclient/ThrowingPublishersCustomBeforeCancel.java
make test TEST=test/jdk/java/net/httpclient/ThrowingPublishersIOAfterCancel.java
make test TEST=test/jdk/java/net/httpclient/ThrowingPublishersIOBeforeCancel.java
make test TEST=test/jdk/java/net/httpclient/ThrowingPublishersInNextRequest.java
make test TEST=test/jdk/java/net/httpclient/ThrowingPublishersInRequest.java
make test TEST=test/jdk/java/net/httpclient/ThrowingPublishersInSubscribe.java
make test TEST=test/jdk/java/net/httpclient/ThrowingPublishersSanity.java

Results attached:

linux-aarch64-specific-test.log
linux-aarch64-specific-2-test.log
linux-aarch64-specific-3-test.log
linux-aarch64-specific-4-test.log
linux-aarch64-specific-5-test.log
linux-aarch64-specific-6-test.log
linux-aarch64-specific-7-test.log
linux-aarch64-specific-8-test.log
linux-x64-specific-test.log
linux-x64-specific-2-test.log
linux-x64-specific-3-test.log
linux-x64-specific-4-test.log
linux-x64-specific-5-test.log
linux-x64-specific-6-test.log
windows-x64-specific-7-test.log
windows-x64-specific-8-test.log
windows-x64-specific-test.log
windows-x64-specific-2-test.log
windows-x64-specific-3-test.log
windows-x64-specific-4-test.log
windows-x64-specific-5-test.log
windows-x64-specific-6-test.log
windows-x64-specific-7-test.log
windows-x64-specific-8-test.log
macos-aarch64-specific-test.log
macos-aarch64-specific-2-test.log
macos-aarch64-specific-3-test.log
macos-aarch64-specific-4-test.log
macos-aarch64-specific-5-test.log
macos-aarch64-specific-6-test.log
macos-aarch64-specific-7-test.log
macos-aarch64-specific-8-test.log

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-8373796 needs maintainer approval

Issue

  • JDK-8373796: Refactor java/net/httpclient/ThrowingPublishers*.java tests to use JUnit5 (Sub-task - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 390

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link
Copy Markdown

bridgekeeper Bot commented Mar 13, 2026

👋 Welcome back rm-gh-8! 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
Copy Markdown

openjdk Bot commented Mar 13, 2026 •
edited
Loading

@rm-gh-8 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:

8373796: Refactor java/net/httpclient/ThrowingPublishers*.java tests to use JUnit5

Reviewed-by: phh

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 57 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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk Bot changed the title Backport c6da35d7c7076aa9643b3dbf03a285420bb1003d 8373796: Refactor java/net/httpclient/ThrowingPublishers*.java tests to use JUnit5 Mar 13, 2026
@openjdk
Copy link
Copy Markdown

openjdk Bot commented Mar 13, 2026

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk Bot added the backport Port of a pull request already in a different code base label Mar 13, 2026
@rm-gh-8 rm-gh-8 marked this pull request as ready for review March 13, 2026 21:18
@openjdk openjdk Bot added the rfr Pull request is ready for review label Mar 13, 2026
@mlbridge
Copy link
Copy Markdown

mlbridge Bot commented Mar 13, 2026

Webrevs

@rm-gh-8 rm-gh-8 mentioned this pull request Mar 20, 2026
Closed
4 tasks
@openjdk
Copy link
Copy Markdown

openjdk Bot commented Mar 20, 2026

⚠️ @rm-gh-8 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.

@rm-gh-8
Copy link
Copy Markdown
Contributor Author

rm-gh-8 commented Mar 23, 2026

/approval request for backport of JDK-8373796: Refactor java/net/httpclient/ThrowingPublishers*.java tests to use JUnit5.

This is a test fix.

For parity with Oracle JDK.

This PR is not clean because "test/jdk/java/net/httpclient/AbstractThrowingPublishers.java" skips a commit implementing JEP 517 (openjdk/jdk@e8db14f) which is not part of JDK 25. The file has been updated to preserve existing functionality while excluding the JEP 517 changes.

@openjdk
Copy link
Copy Markdown

openjdk Bot commented Mar 23, 2026

@rm-gh-8
8373796: The approval request has been created successfully.

@openjdk openjdk Bot added approval Requires approval; will be removed when approval is received ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Mar 23, 2026
@rm-gh-8
Copy link
Copy Markdown
Contributor Author

rm-gh-8 commented Mar 24, 2026

/integrate

@openjdk openjdk Bot added the sponsor Pull request is ready to be sponsored label Mar 24, 2026
@openjdk
Copy link
Copy Markdown

openjdk Bot commented Mar 24, 2026

@rm-gh-8
Your change (at version 0a24c9f) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Copy Markdown
Member

phohensee commented Mar 24, 2026

/sponsor

@openjdk
Copy link
Copy Markdown

openjdk Bot commented Mar 24, 2026

Going to push as commit ca9bd28.
Since your change was applied there have been 57 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 24, 2026
@openjdk openjdk Bot closed this Mar 24, 2026
@openjdk openjdk Bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Mar 24, 2026
@openjdk
Copy link
Copy Markdown

openjdk Bot commented Mar 24, 2026

@phohensee @rm-gh-8 Pushed as commit ca9bd28.

💡 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

1 more reviewer

@phohensee phohensee phohensee approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@rm-gh-8 @phohensee