8291226: Create Test Cases to cover scenarios for JDK-8278067 #9958

rgangadhar · 2022-08-22T08:26:19Z

There are total 160 scenarios written with combination of client properties (Client Scenarios) and Server Response (Server Scenarios).

In tabular format, Client and Server scenarios along with expected output are documented here:Permalink

This Program Should be run mandatorily in othervm mode itself since it has system property changes so can't be clubbed with other scenarios. so each scenario should be run in individual JVM.

For each and every scenario, ServerSocket is created and waits for clients to connect to it.
isProxySet and serverReady are shared variables between server thread and client thread(main) and it should be set and reset to false for each and every scenario.

isProxySet and serverReady variables should be set by server thread before proceeding to client thread(main).

if isProxySet variable is set to true then client set the proxy value to url.openConnection(Proxy)

if (isProxySet) {
httpUrlConnection = (sun.net.www.protocol.http.HttpURLConnection) url .openConnection(new Proxy(Type.HTTP, new InetSocketAddress("localhost", SERVER_PORT))); }
else {
httpUrlConnection = (sun.net.www.protocol.http.HttpURLConnection) url.openConnection();
}

Program tries to fetch the Value of <Key, Value> Pairs of HashMap KeepAliveCache where Key is KeepAliveKey and Value is ClientVector KeepAliveTimeout is stored in Value ClientVector of HashMap KeepAliveCache.

if connection is cached then KeepAliveTimeout is stored in ClientVector. KeepAliveTimeout stored in Value(ClientVector) of HashMap KeepAliveCache is compared with Expected Value.

if connection is not cached then connection is terminated immediately.

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-8291226: Create Test Cases to cover scenarios for JDK-8278067

Reviewers

Daniel Fuchs (@dfuch - Reviewer)
Michael McMahon (@Michael-Mc-Mahon - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9958

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

Using diff file

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

bridgekeeper · 2022-08-22T08:27:34Z

👋 Welcome back rgangadhar! 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 · 2022-08-22T08:29:53Z

@rgangadhar 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.

rgangadhar · 2022-08-22T08:33:43Z

Hi Michael, Daniel, JaiKiran Pai

@Michael-Mc-Mahon
@jaikiran
@dfuch

Could you please review this changeset ?

mlbridge · 2022-08-22T08:34:06Z

Webrevs

dfuch · 2022-08-22T14:27:28Z

Hi Ramesh, thanks for taking this one on. Would it be possible to first improve formatting a bit more, to make this easier to review? For instance - indentation in java code overall the whole oprnjdk code base is 4 spaces, not 2. Also it might be more concise to use List & loops to construct the various arrays, rather than copy/pasting the same line over and over (more specifically things line the serverScenarios and clientScenarios arrays look like they could be initialized with one or two imbricated loops). This might also give you the opportunity to add a bit more comments to explain what each loop/line represents.

I also wonder about representing things as strings that get parsed and split later on. Wouldn't using structure records make it easier to understand?

Also I wonder if having 150 @run lines will scale. It might be better to split this one big tests into several smaller one.

dfuch

This file is a java file and should have a .java extension.

test/jdk/sun/net/www/http/HttpClient/KeepAliveTest

1. Increased space from 2 to 4. 2. skipped test scenarios from 113 to 128 && 145 to 160

rgangadhar · 2022-08-22T17:10:30Z

This file is a java file and should have a .java extension.

My Bad . Yes thank you @dfuch . done this change

rgangadhar · 2022-08-22T17:13:35Z

Hi Ramesh, thanks for taking this one on. Would it be possible to first improve formatting a bit more, to make this easier to review? For instance - indentation in java code overall the whole oprnjdk code base is 4 spaces, not 2.

This is done @dfuch thanks @dfuch

test/jdk/sun/net/www/http/HttpClient/KeepAliveTest.java

Renamed Methods like startScenario, runClient, startServer, connectToServerURL added final to constants Changed clientScenarios array Changed serverScenarios array added IllegalArgumentException Replaced TIMEOUT with CountDownLatch Added Comments

Removed White Spaces

rgangadhar · 2022-08-22T19:58:46Z

Also it might be more concise to use List & loops to construct the various arrays, rather than copy/pasting the same line over and over (more specifically things line the serverScenarios and clientScenarios arrays look like they could be initialized with one or two imbricated loops).

avoided repetation of serverScenarios and clientScenarios array @dfuch thanks

renamed method createServer name to executeServer

rgangadhar · 2022-08-23T06:39:32Z

Also I wonder if having 150 @run lines will scale. It might be better to split this one big tests into several smaller one.

@dfuch : does it really required if we split scenarios into various test files ? how does it affect running ? could you pls explain.

test/jdk/sun/net/www/http/HttpClient/KeepAliveTest.java

Added scenarios documentation and removed white spaces

Removed Whitespaces

rgangadhar · 2022-09-19T14:27:26Z

@dfuch @Michael-Mc-Mahon : could you pls check latest changeset once ?

dfuch

Overall I believe this is OK to integrate. I will run some tests before approving. Please obtain Michael's approval too before integrating.

Michael-Mc-Mahon

This looks fine. I'll publish a PR soon to address JDK-8291638 which means I'll re-enable the disabled tests here.

openjdk · 2022-10-11T14:25:33Z

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

8291226: Create Test Cases to cover scenarios for JDK-8278067

Reviewed-by: dfuchs, michaelm

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

bdb4ed0: 8294580: frame::interpreter_frame_print_on() crashes if free BasicObjectLock exists in frame
461d903: 8294841: G1: Refactor predict_base_elapsed_time_ms
392f35d: 8295033: hsdis configure error when cross-compiling with --with-binutils-src
16e0c59: 8294950: print_sys_devices_cpu_info doesn't use the provided buffer
5ad126f: 8295012: Arena should not derive from CHeapObj
ab8c136: 8292898: [vectorapi] Unify vector mask cast operation
2ceb80c: 8288043: Optimize FP to word/sub-word integral type conversion on X86 AVX2 platforms
703a6ef: 8283699: Improve the peephole mechanism of hotspot
94a9b04: 8295013: OopStorage should derive from CHeapObjBase
3a980b9: 8295168: Remove superfluous period in @throws tag description
... and 593 more: https://git.openjdk.org/jdk/compare/a85a72341bd840b2c7b66ce32c8bbca920e519c8...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.

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 (@dfuch, @Michael-Mc-Mahon) 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).

dfuch · 2022-10-12T11:10:46Z

My tests have all come back green so this good to go! If you need a sponsor then please drop a note here after integrating.

rgangadhar · 2022-10-12T11:33:38Z

/integrate

openjdk · 2022-10-12T11:34:44Z

@rgangadhar
Your change (at version a51a82f) is now ready to be sponsored by a Committer.

rgangadhar · 2022-10-12T11:35:24Z

@dfuch : could you pls sponsor this integration ?

Michael-Mc-Mahon · 2022-10-12T11:42:41Z

/sponsor

openjdk · 2022-10-12T11:44:56Z

Going to push as commit 86ec158.
Since your change was applied there have been 604 commits pushed to the master branch:

94ec729: 8263044: jdk/jfr/jvm/TestDumpOnCrash.java timed out
bdb4ed0: 8294580: frame::interpreter_frame_print_on() crashes if free BasicObjectLock exists in frame
461d903: 8294841: G1: Refactor predict_base_elapsed_time_ms
392f35d: 8295033: hsdis configure error when cross-compiling with --with-binutils-src
16e0c59: 8294950: print_sys_devices_cpu_info doesn't use the provided buffer
5ad126f: 8295012: Arena should not derive from CHeapObj
ab8c136: 8292898: [vectorapi] Unify vector mask cast operation
2ceb80c: 8288043: Optimize FP to word/sub-word integral type conversion on X86 AVX2 platforms
703a6ef: 8283699: Improve the peephole mechanism of hotspot
94a9b04: 8295013: OopStorage should derive from CHeapObjBase
... and 594 more: https://git.openjdk.org/jdk/compare/a85a72341bd840b2c7b66ce32c8bbca920e519c8...master

Your commit was automatically rebased without conflicts.

openjdk · 2022-10-12T11:45:14Z

@Michael-Mc-Mahon @rgangadhar Pushed as commit 86ec158.

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

Create KeepAliveTest

7653a3a

openjdk bot added the rfr Pull request is ready for review label Aug 22, 2022

openjdk bot added the net net-dev@openjdk.org label Aug 22, 2022

dfuch suggested changes Aug 22, 2022

View reviewed changes

dfuch reviewed Aug 22, 2022

View reviewed changes

test/jdk/sun/net/www/http/HttpClient/KeepAliveTest Outdated Show resolved Hide resolved

rgangadhar added 2 commits August 22, 2022 22:24

Merge branch 'openjdk:master' into 8291226

7743724

Update and rename KeepAliveTest to KeepAliveTest.java

9596387

1. Increased space from 2 to 4. 2. skipped test scenarios from 113 to 128 && 145 to 160

dfuch suggested changes Aug 22, 2022

View reviewed changes

Update KeepAliveTest.java

440c43e

Renamed Methods like startScenario, runClient, startServer, connectToServerURL added final to constants Changed clientScenarios array Changed serverScenarios array added IllegalArgumentException Replaced TIMEOUT with CountDownLatch Added Comments

openjdk bot removed the rfr Pull request is ready for review label Aug 22, 2022

Update KeepAliveTest.java

de19a34

Removed White Spaces

openjdk bot added the rfr Pull request is ready for review label Aug 22, 2022

rgangadhar added 5 commits August 23, 2022 09:36

Renamed method names

462cf0c

renamed method createServer name to executeServer

Removed additional whitespaces

8e757fc

aligned imports and removed whitespaces

ecc8d18

Merge branch 'openjdk:master' into 8291226

9728c03

Merge branch 'openjdk:master' into 8291226

4dcce27

dfuch reviewed Aug 23, 2022

View reviewed changes

test/jdk/sun/net/www/http/HttpClient/KeepAliveTest.java Outdated Show resolved Hide resolved

dfuch reviewed Aug 23, 2022

View reviewed changes

test/jdk/sun/net/www/http/HttpClient/KeepAliveTest.java Show resolved Hide resolved

Added scenarios documentation

ac9788d

Added scenarios documentation and removed white spaces

openjdk bot removed the rfr Pull request is ready for review label Aug 26, 2022

Update KeepAliveTest.java

a51a82f

Removed Whitespaces

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

rgangadhar requested review from Michael-Mc-Mahon and dfuch and removed request for Michael-Mc-Mahon and dfuch October 11, 2022 05:42

dfuch reviewed Oct 11, 2022

View reviewed changes

Michael-Mc-Mahon approved these changes Oct 11, 2022

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Oct 11, 2022

dfuch approved these changes Oct 12, 2022

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Oct 12, 2022

openjdk bot added the integrated Pull request has been integrated label Oct 12, 2022

openjdk bot closed this Oct 12, 2022

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 Oct 12, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8291226: Create Test Cases to cover scenarios for JDK-8278067 #9958

8291226: Create Test Cases to cover scenarios for JDK-8278067 #9958

rgangadhar commented Aug 22, 2022 •

edited by openjdk bot

Loading

bridgekeeper bot commented Aug 22, 2022

openjdk bot commented Aug 22, 2022

rgangadhar commented Aug 22, 2022

mlbridge bot commented Aug 22, 2022 •

edited

Loading

dfuch commented Aug 22, 2022 •

edited

Loading

dfuch left a comment

rgangadhar commented Aug 22, 2022

rgangadhar commented Aug 22, 2022

rgangadhar commented Aug 22, 2022

rgangadhar commented Aug 23, 2022

rgangadhar commented Sep 19, 2022

dfuch left a comment

Michael-Mc-Mahon left a comment

openjdk bot commented Oct 11, 2022 •

edited

Loading

dfuch commented Oct 12, 2022 •

edited

Loading

rgangadhar commented Oct 12, 2022

openjdk bot commented Oct 12, 2022

rgangadhar commented Oct 12, 2022

Michael-Mc-Mahon commented Oct 12, 2022

openjdk bot commented Oct 12, 2022

openjdk bot commented Oct 12, 2022

8291226: Create Test Cases to cover scenarios for JDK-8278067 #9958

8291226: Create Test Cases to cover scenarios for JDK-8278067 #9958

Conversation

rgangadhar commented Aug 22, 2022 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Aug 22, 2022

openjdk bot commented Aug 22, 2022

rgangadhar commented Aug 22, 2022

mlbridge bot commented Aug 22, 2022 • edited Loading

Webrevs

dfuch commented Aug 22, 2022 • edited Loading

dfuch left a comment

Choose a reason for hiding this comment

rgangadhar commented Aug 22, 2022

rgangadhar commented Aug 22, 2022

rgangadhar commented Aug 22, 2022

rgangadhar commented Aug 23, 2022

rgangadhar commented Sep 19, 2022

dfuch left a comment

Choose a reason for hiding this comment

Michael-Mc-Mahon left a comment

Choose a reason for hiding this comment

openjdk bot commented Oct 11, 2022 • edited Loading

dfuch commented Oct 12, 2022 • edited Loading

rgangadhar commented Oct 12, 2022

openjdk bot commented Oct 12, 2022

rgangadhar commented Oct 12, 2022

Michael-Mc-Mahon commented Oct 12, 2022

openjdk bot commented Oct 12, 2022

openjdk bot commented Oct 12, 2022

rgangadhar commented Aug 22, 2022 •

edited by openjdk bot

Loading

mlbridge bot commented Aug 22, 2022 •

edited

Loading

dfuch commented Aug 22, 2022 •

edited

Loading

openjdk bot commented Oct 11, 2022 •

edited

Loading

dfuch commented Oct 12, 2022 •

edited

Loading