-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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
Conversation
Converted to a main manual test.
👋 Welcome back kizune! A progress list of the required criteria for merging this PR into |
@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:
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
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 |
@azuev-java The following label will be automatically applied to this pull request:
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. |
import javax.swing.JLayeredPane; | ||
import javax.swing.JPanel; | ||
|
||
/** |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/** | |
/* |
There was a problem hiding this comment.
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); |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed.
.build() | ||
.awaitAndCheck(); | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
EOF newline missing.
There was a problem hiding this comment.
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) |
There was a problem hiding this comment.
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 :)
.rows(4) | |
.rows((int) instructions.lines().count() + 1) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok.
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); |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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 | ||
*/ |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
/integrate |
Going to push as commit 2094ff3.
Your commit was automatically rebased without conflicts. |
@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. |
Converted to a main manual test.
Progress
Issue
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