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

8274465: Fix javax/swing/text/ParagraphView/6364882/bug6364882.java failures #5761

Closed
wants to merge 3 commits into from

Conversation

@aivanov-jdk
Copy link
Member

@aivanov-jdk aivanov-jdk commented Sep 29, 2021

I made the test and its assertions more flexible in regards to the font size and to the number of lines.

The test still requires there are at least four lines so that the text is wrapped before the first hard line break; thus at least one line of text is justified. This pre-requisite gets broken if font-size: 4pt property is added to the style attribute in my local environment. I also ran the test with a few larger font sizes, the updated test passes successfully.

I made sure the image is saved if any exception gets thrown from checkJustification, which wasn't the case.

This PR replaces #5744.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8274465: Fix javax/swing/text/ParagraphView/6364882/bug6364882.java failures

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5761/head:pull/5761
$ git checkout pull/5761

Update a local copy of the PR:
$ git checkout pull/5761
$ git pull https://git.openjdk.java.net/jdk pull/5761/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5761

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5761.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 29, 2021

👋 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 label Sep 29, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 29, 2021

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

@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 29, 2021

Webrevs

@DamonFool
Copy link
Member

@DamonFool DamonFool commented Sep 29, 2021

Good.
I'll spend some time testing this fix and will let you know in this pr.
Thanks.

@DamonFool
Copy link
Member

@DamonFool DamonFool commented Sep 30, 2021

I've tested this fix on two of our cloud hosts.
Both of them passed.

Although I'm not sure whether it will pass on all our platforms, it's much better now.
So I'm fine with it.

You still need at least one more review since I'm not familiar with this part.
Thanks.

@openjdk
Copy link

@openjdk openjdk bot commented Sep 30, 2021

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

8274465: Fix javax/swing/text/ParagraphView/6364882/bug6364882.java failures

Reviewed-by: jiefu, serb

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

  • 2e690ba: 8274322: Problems with oopDesc construction
  • a8edd1b: 8274527: Minimal VM build fails after JDK-8273459
  • 7326481: 8274393: Suppress more warnings on non-serializable non-transient instance fields in security libs
  • 8215b2e: 8274398: Suppress more warnings on non-serializable non-transient instance fields in management libs
  • 9573022: 8253197: vmTestbase/nsk/jvmti/StopThread/stopthrd007/TestDescription.java fails with "ERROR: DebuggeeSleepingThread: ThreadDeath lost"
  • f08180f: 8274501: c2i entry barriers read int as long on AArch64
  • c57ed22: 8274528: Add comment to explain an HKDF optimization in SSLSecretDerivation
  • 9180d9a: 8273216: JCMD does not work across container boundaries with Podman
  • 3e0d7c3: 8270290: NTLM authentication fails if HEAD request is used
  • bfd6163: 8274196: Crashes in VM_HeapDumper::work after JDK-8252842
  • ... and 16 more: https://git.openjdk.java.net/jdk/compare/c4d115701d102c33af937ca25dda8ac50117ac6b...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 ready label Sep 30, 2021
mrserb
mrserb approved these changes Oct 1, 2021
Copy link
Member

@mrserb mrserb left a comment

I assume that the update test still can be used for 6364882 verification.

@aivanov-jdk
Copy link
Member Author

@aivanov-jdk aivanov-jdk commented Oct 1, 2021

I assume that the update test still can be used for 6364882 verification.

Yes, the assertions still work correctly. In JDK 6-b75, the explicitly broken lines are justified:

java.lang.Error: Line 5 is justified: 453 > 290
        at bug6364882.checkJustification(bug6364882.java:192)
        …
java.lang.Error: Line 5 and 6 have different width: 453 != 567
        at bug6364882.checkJustification(bug6364882.java:198)
        …

@aivanov-jdk
Copy link
Member Author

@aivanov-jdk aivanov-jdk commented Oct 1, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Oct 1, 2021

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

  • 05d3860: 8274605: Fix predicate guarantees on returned values in (Doc)SourcePositions
  • 3d7671b: 8274562: (fs) UserDefinedFileAttributeView doesn't correctly determine if supported when using OverlayFS
  • c05dc26: 8274435: EXCEPTION_ACCESS_VIOLATION in BFSClosure::closure_impl
  • cc14c6f: 8274227: Remove "impl.prefix" jdk system property usage from InetAddress
  • 292d7bb: 8274363: Transitively sealed classes not considered exhaustive in switches
  • 1887028: 8269113: Javac throws when compiling switch (null)
  • b7b78ff: 8274561: sun/net/ftp/TestFtpTimeValue.java timed out on slow machines
  • 5e4b514: 8274550: c2i entry barriers read int as long on PPC
  • 2e690ba: 8274322: Problems with oopDesc construction
  • a8edd1b: 8274527: Minimal VM build fails after JDK-8273459
  • ... and 24 more: https://git.openjdk.java.net/jdk/compare/c4d115701d102c33af937ca25dda8ac50117ac6b...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 1, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 1, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 1, 2021

@aivanov-jdk Pushed as commit bb4500d.

💡 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
3 participants