Skip to content

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

Open
rm-gh-8 wants to merge 1 commit into
openjdk:masterfrom
rm-gh-8:JDK-8373796-V17
Open

8373796: Refactor java/net/httpclient/ThrowingPublishers*.java tests to use JUnit5#4496
rm-gh-8 wants to merge 1 commit into
openjdk:masterfrom
rm-gh-8:JDK-8373796-V17

Conversation

@rm-gh-8

@rm-gh-8 rm-gh-8 commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

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. Already backported to 21.

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

make test TEST=test/jdk/java/net/httpclient/ThrowingPublishersCustomAfterCancel.java JTREG="OPTIONS=-e:LC_ALL=en_US.UTF-8"
make test TEST=test/jdk/java/net/httpclient/ThrowingPublishersCustomBeforeCancel.java JTREG="OPTIONS=-e:LC_ALL=en_US.UTF-8"
make test TEST=test/jdk/java/net/httpclient/ThrowingPublishersIOAfterCancel.java JTREG="OPTIONS=-e:LC_ALL=en_US.UTF-8"
make test TEST=test/jdk/java/net/httpclient/ThrowingPublishersIOBeforeCancel.java JTREG="OPTIONS=-e:LC_ALL=en_US.UTF-8"
make test TEST=test/jdk/java/net/httpclient/ThrowingPublishersInNextRequest.java JTREG="OPTIONS=-e:LC_ALL=en_US.UTF-8"
make test TEST=test/jdk/java/net/httpclient/ThrowingPublishersInRequest.java JTREG="OPTIONS=-e:LC_ALL=en_US.UTF-8"
make test TEST=test/jdk/java/net/httpclient/ThrowingPublishersInSubscribe.java JTREG="OPTIONS=-e:LC_ALL=en_US.UTF-8"
make test TEST=test/jdk/java/net/httpclient/ThrowingPublishersSanity.java JTREG="OPTIONS=-e:LC_ALL=en_US.UTF-8"

Results:

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
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
linux-x64-specific-7-test.log
linux-x64-specific-8-test.log
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
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 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)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4496

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@rm-gh-8 rm-gh-8 marked this pull request as ready for review June 3, 2026 12:56
@bridgekeeper

bridgekeeper Bot commented Jun 3, 2026

Copy link
Copy Markdown

👋 Welcome back rmesde! 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 commented Jun 3, 2026

Copy link
Copy Markdown

@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

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 32 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 Backport 0d05000b629d8cbb4995765c87cce948e117be9d 8373796: Refactor java/net/httpclient/ThrowingPublishers*.java tests to use JUnit5 Jun 3, 2026
@openjdk

openjdk Bot commented Jun 3, 2026

Copy link
Copy Markdown

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

@openjdk openjdk Bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Jun 3, 2026
@openjdk

openjdk Bot commented Jun 3, 2026

Copy link
Copy Markdown

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

@openjdk openjdk Bot added the rfr Pull request is ready for review label Jun 3, 2026
@rm-gh-8

rm-gh-8 commented Jun 3, 2026

Copy link
Copy Markdown
Contributor Author

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

This is a test fix.

Please note that the backport at 9b71cd6 (outside this PR), already merged into the codebase, introduces UTF-8 characters at line 437 of HttpServerAdapters.java. Since Java 17 doesn't include JEP 400, tests involving that file may need: JTREG="OPTIONS=-e:LC_ALL=en_US.UTF-8"

Let me know if you'd like me to open a JBS ticket and create a PR for the fix.

For parity with Oracle JDK. Already backported to 21.

@mlbridge

mlbridge Bot commented Jun 3, 2026

Copy link
Copy Markdown

Webrevs

@openjdk

openjdk Bot commented Jun 3, 2026

Copy link
Copy Markdown

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

@openjdk openjdk Bot added the approval Requires approval; will be removed when approval is received label Jun 3, 2026
@openjdk openjdk Bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Jun 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required ready Pull request is ready to be integrated rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.

1 participant