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

8328279: Convert java/awt/Cursor/CursorOverlappedPanelsTest test to main #18331

Closed
wants to merge 5 commits into from

Conversation

azuev-java
Copy link
Member

@azuev-java azuev-java commented Mar 15, 2024

Converted to a main manual test.


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-8328279: Convert java/awt/Cursor/CursorOverlappedPanelsTest test to main (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18331

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 15, 2024

👋 Welcome back kizune! 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 15, 2024

@azuev-java 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:

8328279: Convert java/awt/Cursor/CursorOverlappedPanelsTest test to main

Reviewed-by: honkar, abhiscxk

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

  • 652fb3a: 8328154: Convert sun/java2d/loops/CopyAreaSpeed.java applet test to main
  • 9059727: 8327182: Move serverAlias into the loop
  • 2dd5fba: 8319889: Vector API tests trigger VM crashes with -XX:+StressIncrementalInlining
  • 3f2e849: 8280392: java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java failed with "RuntimeException: Test failed."
  • c901da4: 8327098: GTest needs larger combination limit
  • 9e32db2: 8328309: Remove malformed masked shift instruction selection patterns
  • fc0472b: 8328000: Convert /java/awt/im/8154816/bug8154816.java applet test to main
  • 85fc47c: 8327180: Failed: java/io/ObjectStreamClass/ObjectStreamClassCaching.java#G1
  • 569b05a: 8327818: Implement Kerberos debug with sun.security.util.Debug
  • dec68d7: 8328234: Remove unused nativeUtils files
  • ... and 115 more: https://git.openjdk.org/jdk/compare/1f43fa0f8b0f956b41015e0ebc257e15a11ad99b...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 openjdk bot added the rfr Pull request is ready for review label Mar 15, 2024
@openjdk
Copy link

openjdk bot commented Mar 15, 2024

@azuev-java 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 15, 2024
import javax.swing.JLayeredPane;
import javax.swing.JPanel;

/**
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
/**
/*

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.


frame.getContentPane().add(layeredPane);
frame.pack();
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) can be removed, this avoid the test pane to appear initially at a different location and then switch the final location, additionally PassFailJFrame handles it.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed.

.build()
.awaitAndCheck();
}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

EOF newline missing.

Copy link
Member Author

Choose a reason for hiding this comment

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

Added new line

PassFailJFrame.builder()
.title("Overlapping Panels Cursor Test Instructions")
.instructions(instructions)
.rows(4)
Copy link
Contributor

@honkar-jdk honkar-jdk Mar 16, 2024

Choose a reason for hiding this comment

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

May be 5-6 rows looks better for the instruction length.
Using the below format avoids the need to specify a hardcoded row count number :)

Suggested change
.rows(4)
.rows((int) instructions.lines().count() + 1)

Copy link
Member Author

Choose a reason for hiding this comment

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

Ok.

@mlbridge
Copy link

mlbridge bot commented Mar 16, 2024

Webrevs

public class CursorOverlappedPanelsTest extends Frame {
public static JFrame initialize() {
final JFrame frame = new JFrame("Overlapping Panels Cursor Test");
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
Copy link
Contributor

Choose a reason for hiding this comment

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

frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); redundant, can be removed.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ok

* @library /java/awt/regtesthelpers
* @build PassFailJFrame
* @run main/manual CursorOverlappedPanelsTest
*/
Copy link
Contributor

Choose a reason for hiding this comment

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

May add a blank line after this.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ok

/*
* @test
* @bug 8007155
* @summary [macosx] Disabled panel takes mouse input in JLayeredPane
Copy link
Contributor

Choose a reason for hiding this comment

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

Is the test exclusive for MacOS?

Copy link
Member Author

Choose a reason for hiding this comment

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

No, the bug was found on MacOS but the test is valid for all operating systems.

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.

LGTM

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 18, 2024
@azuev-java
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 19, 2024

Going to push as commit 2094ff3.
Since your change was applied there have been 136 commits pushed to the master branch:

  • db4842c: 8328364: Remove redundant fields in 'BOTConstants'
  • c01095c: 8328262: Convert javax/swing/JSplitPane/8132123/bug8132123.java applet test to main
  • f1c69cc: 8289822: G1: Make concurrent mark code owner of TAMSes
  • 5b6b514: 8325362: Allow to create a simple in-memory input JavaFileObject
  • c59c41a: 8326941: Remove StringUTF16::isBigEndian
  • 6eea5d6: 8325187: JVMTI GetThreadState says virtual thread is JVMTI_THREAD_STATE_INTERRUPTED when it no longer is
  • 053ff76: 8308660: C2 compilation hits 'node must be dead' assert
  • e1b0af2: 8323972: C2 compilation fails with assert(!x->as_Loop()->is_loop_nest_inner_loop()) failed: loop was transformed
  • c0fc956: 8328275: CodeCache::print_internals should not be called in PRODUCT code
  • 4ef591f: 8326964: Remove Eclipse Shared Workspaces
  • ... and 126 more: https://git.openjdk.org/jdk/compare/1f43fa0f8b0f956b41015e0ebc257e15a11ad99b...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 19, 2024

@azuev-java Pushed as commit 2094ff3.

💡 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