Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8327980: Convert javax/swing/JToggleButton/4128979/bug4128979.java applet test to main #18233

Closed
wants to merge 6 commits into from

Conversation

kumarabhi006
Copy link
Contributor

@kumarabhi006 kumarabhi006 commented Mar 12, 2024

Conversion of manual applet test to main based using PassFailJFrame manual framework


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-8327980: Convert javax/swing/JToggleButton/4128979/bug4128979.java applet test to main (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18233

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 12, 2024

👋 Welcome back abhiscxk! 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

openjdk bot commented Mar 12, 2024

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

@openjdk openjdk bot added the client client-libs-dev@openjdk.org label Mar 12, 2024
@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 12, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 12, 2024

Webrevs

frame.getContentPane().add(label);
frame.setSize(600, 250);
frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
frame.setVisible(true);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

frame.setVisible(true); redundant can be removed.


setLayout(new FlowLayout());
public static JFrame createAndShowUI() {
frame = new JFrame("Test window");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Frame title can be more descriptive.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated.

@openjdk
Copy link

openjdk bot commented Mar 13, 2024

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

8327980: Convert javax/swing/JToggleButton/4128979/bug4128979.java applet test to main

Reviewed-by: honkar, tr

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

  • 4d36c4a: 8328285: GetOwnedMonitorInfo functions should use JvmtiHandshake
  • 0efd9dc: 8328398: Convert java/awt/im/4490692/bug4490692.html applet test to main
  • 46809b3: 8324736: Invalid end positions for EMPTY_STATEMENT
  • f7f291c: 8328301: Convert Applet test ManualHTMLDataFlavorTest.java to main program
  • 771f6a2: 8327704: Update nsk/jdi tests to use driver instead of othervm
  • 4210e50: 8320362: Load anchor certificates from Keychain keystore
  • ab183e4: 8328642: Convert applet test MouseDraggedOutCauseScrollingTest.html to main
  • ab28045: 8328316: Finisher cannot emit if stream is sequential and integrator returned false
  • ba05c6d: 8328368: Convert java/awt/image/multiresolution/MultiDisplayTest/MultiDisplayTest.java applet test to main
  • fa823bd: 8328540: test javax/swing/JSplitPane/4885629/bug4885629.java fails on windows hidpi
  • ... and 202 more: https://git.openjdk.org/jdk/compare/f2b5ffdb8ea3c766f14bab1dfd7c3865cffa2ce8...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.

@kumarabhi006
Copy link
Contributor Author

@honkar-jdk Updated as per last review. Please take a look.

Copy link
Contributor

@honkar-jdk honkar-jdk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove unused imports

the test fails. """;

public static void main(String[] args) throws Exception {
UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsClassicLookAndFeel");
Copy link
Contributor

@honkar-jdk honkar-jdk Mar 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the test is for Windows only it is good to have OS check along with the @requires (os.family == "windows") and throw skipped exception otherwise.

Since it is followed by setting WindowsClassicLookAndFeel all the more reason to include this check.

Suggested change
UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsClassicLookAndFeel");
if (OSInfo.getOSType() != OSInfo.OSType.WINDOWS) {
throw new SkippedException("This test is for Windows only");
}
UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsClassicLookAndFeel");

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can remove the OS check here if you would like to, since it is not strictly required when run as jtreg test (which is essentially the case here).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will keep this check as of now.

@kumarabhi006
Copy link
Contributor Author

@honkar-jdk Please take a look.

* @build PassFailJFrame jtreg.SkippedException
* @summary Tests that background changes correctly in WinLF for JToggleButton when pressed
* @run main/manual bug4128979
*/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move it after imports.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated but placing of imports is still confusing.

applet.init();
applet.start();
public class bug4128979 {
private static JFrame frame;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

frame can be moved inside createAndShowUI().

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated.

} catch (Exception e) {
throw new RuntimeException("Couldn't set look and feel");
If the background color does not change correctly for at least one button,
the test fails. """;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Getting a white space after fails., can you check once.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a problem though since it is part of instruction. Anyways removed extra space.

@kumarabhi006
Copy link
Contributor Author

@honkar-jdk @TejeshR13 Test is updated. Please take a look.

Copy link
Contributor

@TejeshR13 TejeshR13 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good now.

Copy link
Contributor

@honkar-jdk honkar-jdk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated changes look good.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 22, 2024
@kumarabhi006
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 22, 2024

Going to push as commit 256d48b.
Since your change was applied there have been 214 commits pushed to the master branch:

  • 177b8a2: 8327840: Automate javax/swing/border/Test4129681.java
  • da00921: 8320404: Double whitespace in SubTypeCheckNode::dump_spec output
  • 4d36c4a: 8328285: GetOwnedMonitorInfo functions should use JvmtiHandshake
  • 0efd9dc: 8328398: Convert java/awt/im/4490692/bug4490692.html applet test to main
  • 46809b3: 8324736: Invalid end positions for EMPTY_STATEMENT
  • f7f291c: 8328301: Convert Applet test ManualHTMLDataFlavorTest.java to main program
  • 771f6a2: 8327704: Update nsk/jdi tests to use driver instead of othervm
  • 4210e50: 8320362: Load anchor certificates from Keychain keystore
  • ab183e4: 8328642: Convert applet test MouseDraggedOutCauseScrollingTest.html to main
  • ab28045: 8328316: Finisher cannot emit if stream is sequential and integrator returned false
  • ... and 204 more: https://git.openjdk.org/jdk/compare/f2b5ffdb8ea3c766f14bab1dfd7c3865cffa2ce8...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 22, 2024
@openjdk openjdk bot closed this Mar 22, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 22, 2024
@openjdk
Copy link

openjdk bot commented Mar 22, 2024

@kumarabhi006 Pushed as commit 256d48b.

💡 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
Labels
client client-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants