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

8324239: JFXPanelHiDPITest fails on Windows 11 #1344

Closed
wants to merge 4 commits into from

Conversation

prsadhuk
Copy link
Collaborator

@prsadhuk prsadhuk commented Jan 22, 2024

Test fails with

JFXPanelHiDPITest > testScale FAILED
    java.lang.NullPointerException: Cannot invoke "java.awt.image.BufferedImage.getWidth()" because "pixelsIm" is null 

because scenePeer is not yet created as the test is run with invokeLater.
FIx is to make it run with invokeAndWait so that it waits for the scene to be created..


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-8324239: JFXPanelHiDPITest fails on Windows 11 (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1344

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jfx/pull/1344.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 22, 2024

👋 Welcome back psadhukhan! 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 openjdk bot added the rfr Ready for review label Jan 22, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 22, 2024

Webrevs

@prsadhuk
Copy link
Collaborator Author

Guess better will be to use Platform.runAndWait for scene to be created

@andy-goryachev-oracle
Copy link
Contributor

is there a reason this test is skipped on macOS?

@kevinrushforth
Copy link
Member

is there a reason this test is skipped on macOS?

It's unrelated to this PR, but to answer your question, the test is Windows-specific by it's use of setting glass.win.uiScale.

@andy-goryachev-oracle
Copy link
Contributor

I wish the test class had a description.
It is not immediately apparent that this is a windows-only test without reading the whole thing very carefully.

Copy link
Contributor

@andy-goryachev-oracle andy-goryachev-oracle 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.
Are there any other places where we invokeLater() instead of invokeAndWait()?
And runLater() instead of runAndWait() ?

@openjdk
Copy link

openjdk bot commented Jan 22, 2024

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

8324239: JFXPanelHiDPITest fails on Windows 11

Reviewed-by: angorya, kcr

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

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 ready Ready to be integrated label Jan 22, 2024
@kevinrushforth
Copy link
Member

Are there any other places where we invokeLater() instead of invokeAndWait()?
And runLater() instead of runAndWait() ?

Good question. There might be, but each would need to be looked into to see whether they are causing problems. Also, when doing anything with Swing interop you need to be careful to not introduce a deadlock. It's fine in this specific case.

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Choose a reason for hiding this comment

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

The test runs correctly now. Tests should generally use Util.runAndWait instead of PlatformImpl.runAndWait.

@@ -149,7 +151,7 @@ public MyApp() {
}

private void createScene(final JFXPanel fxPanel) {
Platform.runLater(() -> {
PlatformImpl.runAndWait(() -> {
Copy link
Member

Choose a reason for hiding this comment

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

Generally we prefer test.util.Util::runAndWait so that exceptions are propagated.

Copy link
Contributor

Choose a reason for hiding this comment

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

good point!

@openjdk openjdk bot removed the ready Ready to be integrated label Jan 23, 2024
@openjdk openjdk bot added the ready Ready to be integrated label Jan 23, 2024
@prsadhuk
Copy link
Collaborator Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 29, 2024

Going to push as commit 876d535.
Since your change was applied there have been 23 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 29, 2024

@prsadhuk Pushed as commit 876d535.

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

@prsadhuk prsadhuk deleted the JDK-8324239 branch January 29, 2024 07:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants