On Wed, 28 May 2025 20:25:23 GMT, Daniel Gredler <dgred...@openjdk.org> wrote:
>>> @prrace Please don't approve yet. I was able to fix the code conflicts >>> caused by PR #23665, but it looks like the logic does not layer nicely as >>> there is now a test failure on macOS after the merge. I'm having a look and >>> will let you know what I find. >> >> And indeed the tests just finished and a test (not the new one, a previous >> one : IgnoredWhitespaceTest.java) failed on macOS x64 and ARM .. >> >> java.lang.RuntimeException: for text '\t\t\t\t\tXXXXX' with font >> java.awt.Font[family=Dialog,name=Dialog,style=plain,size=40]: >> java.awt.Rectangle[x=300,y=271,width=123,height=28] != >> java.awt.Rectangle[x=365,y=271,width=123,height=28] >> at IgnoredWhitespaceTest.assertEqual(IgnoredWhitespaceTest.java:127) >> at IgnoredWhitespaceTest.test(IgnoredWhitespaceTest.java:103) >> at IgnoredWhitespaceTest.test(IgnoredWhitespaceTest.java:69) >> at IgnoredWhitespaceTest.main(IgnoredWhitespaceTest.java:49) >> at >> java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:104) >> at java.base/java.lang.reflect.Method.invoke(Method.java:565) >> at >> com.sun.javatest.regtest.agent.MainWrapper$MainTask.run(MainWrapper.java:138) >> at java.base/java.lang.Thread.run(Thread.java:1447) >> >> JavaTest Message: Test threw exception: java.lang.RuntimeException: for text >> '\t\t\t\t\tXXXXX' with font >> java.awt.Font[family=Dialog,name=Dialog,style=plain,size=40]: >> java.awt.Rectangle[x=300,y=271,width=123,height=28] != >> java.awt.Rectangle[x=365,y=271,width=123,height=28] >> JavaTest Message: shutting down test > > @prrace This is ready for review again. I've updated the code to combine > nicely with the recent whitespace fixes. The `test/jdk/java/awt/font`, > `test/jdk/java/awt/print` and `test/jdk/java/awt/Graphics2D/DrawString` tests > all pass for me locally on Windows, Linux and macOS. > > Once these changes are integrated it should be relatively simple to address > JDK-8356803 ("Test TextLayout/TestControls fails on windows & linux: line and > paragraph separator show non-zero advance") and JDK-8356812 ("Create an > automated version of TextLayout/TestControls"). @gredler In the process of reviewing this PR. Just a headsup, JDK 25 RDP1 is next week (https://openjdk.org/projects/jdk/25/) in case you are planning to get the following fixes into 25: [JDK-8356803](https://bugs.openjdk.org/browse/JDK-8356803) - Test TextLayout/TestControls fails on windows & linux: line and paragraph separator show non-zero advance [JDK-8356812](https://bugs.openjdk.org/browse/JDK-8356812) - Create an automated version of TextLayout/TestControls ------------- PR Comment: https://git.openjdk.org/jdk/pull/24412#issuecomment-2922880879