8318662: Refactor some jdk/java/net/httpclient/http2 tests to JUnit #27388

mahendrachhipa · 2025-09-19T10:44:36Z

Refactoring following httpclient/http2 testng test to JUnit :
test/jdk/java/net/httpclient/http2/BadHeadersTest.java
test/jdk/java/net/httpclient/http2/BadPushPromiseTest.java
test/jdk/java/net/httpclient/http2/BasicTest.java
test/jdk/java/net/httpclient/http2/ConnectionFlowControlTest.java
test/jdk/java/net/httpclient/http2/ContinuationFrameTest.java

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-8318662: Refactor some jdk/java/net/httpclient/http2 tests to JUnit (Sub-task - P4)

Reviewers

Daniel Fuchs (@dfuch - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 27388

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

Using diff file

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

Using Webrev

Link to Webrev Comment

bridgekeeper · 2025-09-19T10:46:04Z

👋 Welcome back mchhipa! 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 · 2025-09-19T10:47:08Z

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

8318662: Refactor some jdk/java/net/httpclient/http2 tests to JUnit

Reviewed-by: dfuchs

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

52a923f: 8367702: PrintJob.getGraphics() should return null after PrintJob.end
f489598: 8221451: PIT: sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh fails
85f5bf3: 8368308: ISO 4217 Amendment 180 Update
... and 11 more: https://git.openjdk.org/jdk/compare/288822a5c2bbaba7b6b897faab1a9cc076c906cc...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 · 2025-09-19T10:48:00Z

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

net

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.

mlbridge · 2025-09-19T10:51:49Z

Webrevs

vy

@mahendrachhipa, would you mind confirming that tier1,2 pass, please?

test/jdk/java/net/httpclient/http2/BadHeadersTest.java

test/jdk/java/net/httpclient/http2/BasicTest.java

test/jdk/java/net/httpclient/http2/ConnectionFlowControlTest.java

vy · 2025-09-22T08:08:19Z

test/jdk/java/net/httpclient/http2/ContinuationFrameTest.java

+    static SSLContext sslContext;
+    static Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
+    static Http2TestServer https2TestServer;  // HTTP/2 ( h2  )
+    static String http2URI;
+    static String https2URI;
+    static String noBodyhttp2URI;
+    static String noBodyhttps2URI;
+    final static ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;


These can be private.

test/jdk/java/net/httpclient/http2/ContinuationFrameTest.java

test/jdk/java/net/httpclient/http2/BadHeadersTest.java

test/jdk/java/net/httpclient/http2/ConnectionFlowControlTest.java

openjdk · 2025-09-23T16:30:31Z

@mahendrachhipa this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout JDK-8318662
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

vy · 2025-09-23T18:19:49Z

test/jdk/java/net/httpclient/http2/BadHeadersTest.java

+                { http2URI, false, oneContinuation },
                { https2URI, false, oneContinuation },
-                { http2URI,  true,  oneContinuation },
-                { https2URI, true,  oneContinuation },
+                { http2URI, true, oneContinuation },
+                { https2URI, true, oneContinuation },

-                { http2URI,  false, byteAtATime },
-                { https2URI, false, byteAtATime },
-                { http2URI,  true,  byteAtATime },
-                { https2URI, true,  byteAtATime },
+                {http2URI, false, byteAtATime },
+                {https2URI, false, byteAtATime },
+                {http2URI, true, byteAtATime },
+                {https2URI, true, byteAtATime },


@mahendrachhipa, I'd advise avoiding styling changes, unless it is really necessary.

vy · 2025-09-23T18:22:11Z

test/jdk/java/net/httpclient/http2/ContinuationFrameTest.java

+                {http2URI,  false, oneContinuation},
+                {https2URI, false, oneContinuation},
+                {http2URI,  true,  oneContinuation},
+                {https2URI, true,  oneContinuation},
+
+                {noBodyhttp2URI,  false, twoContinuation},
+                {noBodyhttp2URI,  true,  twoContinuation},
+                {noBodyhttps2URI, false, twoContinuation},
+                {noBodyhttps2URI, true,  twoContinuation},
+
+                {http2URI,  false, byteAtATime},
+                {https2URI, false, byteAtATime},
+                {http2URI,  true,  byteAtATime},
+                {https2URI, true,  byteAtATime},


Again, I'd suggest reverting these.

test/jdk/java/net/httpclient/http2/ContinuationFrameTest.java

test/jdk/java/net/httpclient/http2/ConnectionFlowControlTest.java

vy · 2025-09-24T13:29:21Z

@mahendrachhipa, would you mind confirming that all test/jdk/java/net/httpclient/http2/ tests still pass on all supported platforms, please?

mahendrachhipa · 2025-09-24T16:40:59Z

@mahendrachhipa, would you mind confirming that all test/jdk/java/net/httpclient/http2/ tests still pass on all supported platforms, please?
Yes, Mach5 Job link is added in https://bugs.openjdk.org/browse/JDK-8318662

mahendrachhipa · 2025-09-24T17:46:31Z

/integrate

openjdk · 2025-09-24T17:48:14Z

Going to push as commit 7fe71a7.
Since your change was applied there have been 14 commits pushed to the master branch:

52a923f: 8367702: PrintJob.getGraphics() should return null after PrintJob.end
f489598: 8221451: PIT: sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh fails
85f5bf3: 8368308: ISO 4217 Amendment 180 Update
... and 11 more: https://git.openjdk.org/jdk/compare/288822a5c2bbaba7b6b897faab1a9cc076c906cc...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-09-24T17:48:23Z

@mahendrachhipa Pushed as commit 7fe71a7.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

JDK-8318662: Refactor some jdk/java/net/httpclient/http2 tests to JUnit

055a1cf

openjdk bot changed the title ~~JDK-8318662: Refactor some jdk/java/net/httpclient/http2 tests to JUnit~~ 8318662: Refactor some jdk/java/net/httpclient/http2 tests to JUnit Sep 19, 2025

openjdk bot added the net net-dev@openjdk.org label Sep 19, 2025

openjdk bot added the rfr Pull request is ready for review label Sep 19, 2025

vy suggested changes Sep 22, 2025

View reviewed changes

dfuch reviewed Sep 22, 2025

View reviewed changes

Implemented the review comments.

ea19729

openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Sep 23, 2025

vy suggested changes Sep 23, 2025

View reviewed changes

mahendrachhipa added 2 commits September 24, 2025 12:13

Merge branch 'master' into JDK-8318662

7e0254e

Updated test data indentation.

f4add75

openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Sep 24, 2025

vy suggested changes Sep 24, 2025

View reviewed changes

test/jdk/java/net/httpclient/http2/ContinuationFrameTest.java Outdated Show resolved Hide resolved

test/jdk/java/net/httpclient/http2/ConnectionFlowControlTest.java Outdated Show resolved Hide resolved

Reverted few formattings.

bd12288

dfuch approved these changes Sep 24, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Sep 24, 2025

openjdk bot added the integrated Pull request has been integrated label Sep 24, 2025

openjdk bot closed this Sep 24, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 24, 2025

8318662: Refactor some jdk/java/net/httpclient/http2 tests to JUnit #27388

8318662: Refactor some jdk/java/net/httpclient/http2 tests to JUnit #27388

Uh oh!

Conversation

mahendrachhipa commented Sep 19, 2025 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Sep 19, 2025

Uh oh!

openjdk bot commented Sep 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Sep 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mlbridge bot commented Sep 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

vy left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vy Sep 22, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

openjdk bot commented Sep 23, 2025

Uh oh!

vy Sep 23, 2025

Choose a reason for hiding this comment

Uh oh!

vy Sep 23, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

vy commented Sep 24, 2025

Uh oh!

mahendrachhipa commented Sep 24, 2025

Uh oh!

mahendrachhipa commented Sep 24, 2025

Uh oh!

openjdk bot commented Sep 24, 2025

Uh oh!

openjdk bot commented Sep 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

mahendrachhipa commented Sep 19, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Sep 19, 2025 •

edited

Loading

openjdk bot commented Sep 19, 2025 •

edited

Loading

mlbridge bot commented Sep 19, 2025 •

edited

Loading