Skip to content

Conversation

@aivanov-jdk
Copy link
Member

@aivanov-jdk aivanov-jdk commented Jan 3, 2023

The ScaledEtchedBorderTest.java test (JDK-8279614) verifies that the thickness of lines of EtchedBorder is consistent. The component inside had the same background color as the frame. Yet if there's another component the background of which is different, that background could be seen.

The updated test covers the scenario reported in JDK-8294921.

The bug itself is fixed by refactoring JDK-8294680 the border rendering code which uses a more precise coordinate calculation, see #11571. Thus, I contribute the test under a separate bugid.

I also modified ScaledLineBorderTest.java so that the location of the child panels is saved when they're created as done in ScaledTextFieldBorderTest.java in #11498. I removed the unused Component import after this modification from both tests.


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-8299553: Make ScaledEtchedBorderTest.java comprehensive

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11836

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 3, 2023

👋 Welcome back aivanov! 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 Pull request is ready for review label Jan 3, 2023
@openjdk
Copy link

openjdk bot commented Jan 3, 2023

@aivanov-jdk 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 Jan 3, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 3, 2023

Webrevs

@mrserb
Copy link
Member

mrserb commented Jan 3, 2023

Don't you need to close the JDK-8294921 since it was fixed already?

@honkar-jdk
Copy link
Contributor

Don't you need to close the JDK-8294921 since it was fixed already?

This issue has been closed now.

@openjdk
Copy link

openjdk bot commented Jan 3, 2023

@aivanov-jdk 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:

8299553: Make ScaledEtchedBorderTest.java comprehensive

Reviewed-by: serb, honkar, achung

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 18 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 Pull request is ready to be integrated label Jan 3, 2023
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.

Tested all 3 tests, it works as expected.
Minor inline suggestions added that are applicable for all 3 tests.

@aivanov-jdk
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 19, 2023

Going to push as commit 558d610.
Since your change was applied there have been 272 commits pushed to the master branch:

  • 80ab50b: 8294680: Refactor scaled border rendering
  • b317658: 8300399: EdDSA does not verify when there is no message
  • d85243f: 8300647: Miscellaneous hashCode improvements in java.base
  • 453dbd1: 8298377: JfrVframeStream causes deadlocks in ZGC
  • 1084fd2: 8299973: Replace NULL with nullptr in share/utilities/
  • dea58ef: 8300119: CgroupMetrics.getTotalMemorySize0() can report invalid results on 32 bit systems
  • 2e4a3c4: 8293862: javax/swing/JFileChooser/8046391/bug8046391.java failed with 'Cannot invoke "java.awt.Image.getWidth(java.awt.image.ImageObserver)" because "retVal" is null'
  • e326b86: 8300042: Improve CPU related JFR events descriptions
  • 11df6eb: 8300540: Serial: Remove obsolete comments in GenMarkSweep
  • 8f7faa6: 8300447: Parallel: Refactor PSPromotionManager::drain_stacks_depth
  • ... and 262 more: https://git.openjdk.org/jdk/compare/ea25a561c57cba63c5581aefa21f92ffd7386244...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 19, 2023

@aivanov-jdk Pushed as commit 558d610.

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

@aivanov-jdk aivanov-jdk deleted the 8299553-scaledEtchedBorder branch January 19, 2023 19:42
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.

4 participants