8351884: Refactor bug8033699.java test code #24384

rajamah · 2025-04-02T17:34:34Z

Details:
Refactored code as requested in the Bug description.

Tested and verified the test passes.

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-8351884: Refactor bug8033699.java test code (Enhancement - P4)

Reviewers

Harshitha Onkar (@honkar-jdk - Reviewer) Review applies to 7225dff4
Dmitry Markov (@dmarkov20 - Reviewer) Review applies to 7225dff4
Alexey Ivanov (@aivanov-jdk - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24384

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

Using diff file

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

Using Webrev

Link to Webrev Comment

bridgekeeper · 2025-04-02T17:35:10Z

👋 Welcome back rmahajan! 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-04-02T17:35:29Z

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

8351884: Refactor bug8033699.java test  code

Reviewed-by: aivanov, honkar, dmarkov

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

62d165d: 8355669: Add static-jdk-bundles make target
af4388a: 8355649: Missing ResourceMark in ExceptionMark::check_no_pending_exception
acd93df: 8355080: java.base/jdk.internal.foreign.SystemLookup.find() doesn't work on static JDK
... and 727 more: https://git.openjdk.org/jdk/compare/b50fe9b8cc39730d3339e45a83b365ab3dd8a5da...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 (@honkar-jdk, @dmarkov20, @aivanov-jdk) 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 · 2025-04-02T17:36:25Z

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

client

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-04-02T17:39:03Z

Webrevs

rajamah · 2025-04-15T17:45:23Z

Can someone please review this? , it has been more than 10 days that it has been out there.

Thank you!

honkar-jdk

LGTM apart from minor inline suggestion.

Since the test has lot of tab movements, does CI testing look good on all platforms on multiple runs (repeat) ?

test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java

aivanov-jdk

Overall, it looks good to me.

Except for the minor comments that I left, I can suggest:

removing System.out.println before throwing an error — it adds no value, the error message from the exception is sufficient;
removing "as expected" from the error message which is implied because it's an error.

aivanov-jdk · 2025-04-17T16:22:29Z

test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java

 import java.awt.event.KeyEvent;
-
 import javax.swing.BorderFactory;


I'd rather preserve the blank line between java.* and javax.* packages. However, the list of imports isn't too long in either block.

aivanov-jdk · 2025-04-17T16:23:33Z

test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java

+            SwingUtilities.invokeAndWait(() -> {
+                focusManager = KeyboardFocusManager.getCurrentKeyboardFocusManager();
+            });
+


Storing the focusManager once before calling testLaF for the first time is enough.

test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java

aivanov-jdk · 2025-04-17T16:35:59Z

test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java


    private static boolean actRB1 = false;
    private static boolean actRB2 = false;
    private static boolean actRB3 = false;


These three boolean variables need to be declared volatile, the value is modified on the EDT but their value is read on the main thread.

You can replace them with CountDownLatches, but it looks like an overkill in this case, moreover hitKey automatically invokes robot.waitForIdle.

test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java

aivanov-jdk · 2025-04-17T16:54:52Z

For the sake of completeness, the description could've mentioned that @kumarabhi006 requested these changes in #23964 (comment).

Abhishek, could you review the updated test code?

kumarabhi006 · 2025-04-17T19:49:48Z

#23964 (comment)

Will take a look soon.

kumarabhi006 · 2025-04-18T18:15:25Z

#23964 (comment)

Will take a look soon.

I took a look today and it looks good to me.
I agree with @aivanov-jdk suggestions. Adding print statements are redundant.

rajamah · 2025-04-22T18:56:08Z

LGTM apart from minor inline suggestion.

Since the test has lot of tab movements, does CI testing look good on all platforms on multiple runs (repeat) ?

Yes, it looks good on multiple runs.

aivanov-jdk

Looks good to me, except for minor nits.

aivanov-jdk · 2025-04-25T19:33:52Z

test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java

        robot = new Robot();
-
+        SwingUtilities.invokeAndWait(() -> {


I wonder why you removed the blank line, I'm strongly for restoring it here.

test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java

Co-authored-by: Alexey Ivanov <alexey.ivanov@oracle.com>

test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java

Co-authored-by: Alexey Ivanov <alexey.ivanov@oracle.com>

aivanov-jdk

Remove the unused import. Otherwise, looks good to me.

aivanov-jdk · 2025-04-28T14:36:37Z

test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java


 import javax.swing.BorderFactory;
+import javax.swing.Box;
 import javax.swing.BoxLayout;


Now, BoxLayout is unused.

rajamah · 2025-04-28T20:12:34Z

/integrate

openjdk · 2025-04-28T20:13:22Z

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

aivanov-jdk · 2025-04-30T12:22:43Z

/sponsor

openjdk · 2025-04-30T12:23:24Z

Going to push as commit 482538b.
Since your change was applied there have been 764 commits pushed to the master branch:

0110aca: 8354791: Use Hashtable.putIfAbsent in CSS constructor
526951d: 8354145: G1: UseCompressedOops boundary is calculated on maximum heap region size instead of maxiumum ergonomic heap region size
765cef4: 8355878: RISC-V: jdk/incubator/vector/DoubleMaxVectorTests.java fails when using RVV
... and 761 more: https://git.openjdk.org/jdk/compare/b50fe9b8cc39730d3339e45a83b365ab3dd8a5da...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-04-30T12:23:38Z

@aivanov-jdk @rajamah Pushed as commit 482538b.

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

rajamah added 2 commits March 14, 2025 10:44

8351884: Refactor bug8033699.java test code

6e53051

8351884: Refactor bug8033699.java test code

7225dff

openjdk bot changed the title ~~8351884: Refactor bug8033699.java test code~~ 8351884: Refactor bug8033699.java test code Apr 2, 2025

openjdk bot added the rfr Pull request is ready for review label Apr 2, 2025

openjdk bot added the client client-libs-dev@openjdk.org label Apr 2, 2025

honkar-jdk approved these changes Apr 15, 2025

View reviewed changes

test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java Outdated Show resolved Hide resolved

openjdk bot added the ready Pull request is ready to be integrated label Apr 15, 2025

dmarkov20 approved these changes Apr 16, 2025

View reviewed changes

aivanov-jdk suggested changes Apr 17, 2025

View reviewed changes

made changes according to suggestions in code review

babefb8

openjdk bot removed the ready Pull request is ready to be integrated label Apr 22, 2025

code changes as per code review

edb99cb

aivanov-jdk approved these changes Apr 25, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Apr 25, 2025

aivanov-jdk reviewed Apr 25, 2025

View reviewed changes

test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java Outdated Show resolved Hide resolved

rajamah and others added 2 commits April 25, 2025 12:47

Update test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java

bbda18e

Co-authored-by: Alexey Ivanov <alexey.ivanov@oracle.com>

Update test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java

af82520

Co-authored-by: Alexey Ivanov <alexey.ivanov@oracle.com>

openjdk bot removed the ready Pull request is ready to be integrated label Apr 25, 2025

rajamah and others added 3 commits April 25, 2025 12:48

Update test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java

942a41e

Co-authored-by: Alexey Ivanov <alexey.ivanov@oracle.com>

Update test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java

d125207

Co-authored-by: Alexey Ivanov <alexey.ivanov@oracle.com>

Update test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java

172d08f

Co-authored-by: Alexey Ivanov <alexey.ivanov@oracle.com>

aivanov-jdk suggested changes Apr 25, 2025

View reviewed changes

test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java Show resolved Hide resolved

test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java Show resolved Hide resolved

test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java Show resolved Hide resolved

rajamah and others added 2 commits April 25, 2025 13:05

Update test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java

ca4b673

Co-authored-by: Alexey Ivanov <alexey.ivanov@oracle.com>

code review suggestions

d539142

aivanov-jdk approved these changes Apr 28, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Apr 28, 2025

code review suggestions

c0ad289

openjdk bot removed the ready Pull request is ready to be integrated label Apr 28, 2025

aivanov-jdk approved these changes Apr 28, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Apr 28, 2025

openjdk bot added the sponsor Pull request is ready to be sponsored label Apr 28, 2025

openjdk bot added the integrated Pull request has been integrated label Apr 30, 2025

openjdk bot closed this Apr 30, 2025

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 Apr 30, 2025

		import java.awt.event.KeyEvent;

		import javax.swing.BorderFactory;

8351884: Refactor bug8033699.java test code #24384

8351884: Refactor bug8033699.java test code #24384

Uh oh!

Conversation

rajamah commented Apr 2, 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 Apr 2, 2025

Uh oh!

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

Uh oh!

Uh oh!

openjdk bot commented Apr 2, 2025

Uh oh!

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

Uh oh!

Webrevs

Uh oh!

rajamah commented Apr 15, 2025

Uh oh!

honkar-jdk left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

aivanov-jdk left a comment

Choose a reason for hiding this comment

Uh oh!

aivanov-jdk Apr 17, 2025

Choose a reason for hiding this comment

Uh oh!

aivanov-jdk Apr 17, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

aivanov-jdk Apr 17, 2025

Choose a reason for hiding this comment

Uh oh!

aivanov-jdk Apr 17, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

aivanov-jdk commented Apr 17, 2025

Uh oh!

kumarabhi006 commented Apr 17, 2025

Uh oh!

kumarabhi006 commented Apr 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rajamah commented Apr 22, 2025

Uh oh!

aivanov-jdk left a comment

Choose a reason for hiding this comment

Uh oh!

aivanov-jdk Apr 25, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

aivanov-jdk left a comment

Choose a reason for hiding this comment

Uh oh!

aivanov-jdk Apr 28, 2025

Choose a reason for hiding this comment

Uh oh!

rajamah commented Apr 28, 2025

Uh oh!

openjdk bot commented Apr 28, 2025

Uh oh!

aivanov-jdk commented Apr 30, 2025

rajamah commented Apr 2, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Apr 2, 2025 •

edited

Loading

mlbridge bot commented Apr 2, 2025 •

edited

Loading

kumarabhi006 commented Apr 18, 2025 •

edited

Loading