Skip to content

Commit

Permalink
8274296: Update or Problem List tests which may fail with uiScale=2 o…
Browse files Browse the repository at this point in the history
…n macOS

Backport-of: 753b25633bf07eed40fd25b4b89313644763cd56
  • Loading branch information
GoeLin committed Sep 22, 2022
1 parent 6e40c5c commit c59f741
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 7 deletions.
6 changes: 6 additions & 0 deletions test/jdk/ProblemList.txt
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,12 @@ javax/swing/Popup/TaskbarPositionTest.java 8065097 macosx-all,linux-all
javax/swing/JEditorPane/6917744/bug6917744.java 8213124 macosx-all
javax/swing/JRootPane/4670486/bug4670486.java 8042381 macosx-all

# Several tests which fail on some hidpi systems
java/awt/GraphicsDevice/DisplayModes/CycleDMImage.java 8274106 macosx-aarch64
java/awt/Window/8159168/SetShapeTest.java 8274106 macosx-aarch64
java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java 8274106 macosx-aarch64
javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java 8274106 macosx-aarch64

sanity/client/SwingSet/src/ToolTipDemoTest.java 8225012 windows-all,macosx-all
sanity/client/SwingSet/src/ScrollPaneDemoTest.java 8225013 linux-all
sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java 8265770 macosx-all
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* @bug 8190230 8196360
* @summary [macosx] Order of overlapping of modal dialogs is wrong
* @key headful
* @run main SiblingChildOrderTest
* @run main/othervm -Dsun.java2d.uiScale=1 SiblingChildOrderTest
*/

import java.awt.Color;
Expand Down
2 changes: 1 addition & 1 deletion test/jdk/java/awt/Paint/PaintNativeOnUpdate.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* @library /lib/client
* @build ExtendedRobot
* @author Sergey Bylokhov
* @run main PaintNativeOnUpdate
* @run main/othervm -Dsun.java2d.uiScale=1 PaintNativeOnUpdate
*/
public final class PaintNativeOnUpdate extends Label {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
* @author Sergey Bylokhov
* @library /lib/client
* @build ExtendedRobot
* @run main BackgroundIsNotUpdated
* @run main/othervm -Dsun.java2d.uiScale=1 BackgroundIsNotUpdated
*/
public final class BackgroundIsNotUpdated extends Window {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* certain scenarios
* @bug 8021961
* @author Semyon Sadetsky
* @run main ChildAlwaysOnTopTest
* @run main/othervm -Dsun.java2d.uiScale=1 ChildAlwaysOnTopTest
*/

import javax.swing.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* @bug 6683728
* @summary Tests that a JApplet in a translucent JFrame works properly
* @compile -XDignore.symbol.file=true TranslucentJAppletTest.java
* @run main TranslucentJAppletTest
* @run main/othervm -Dsun.java2d.uiScale=1 TranslucentJAppletTest
*/

import java.awt.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* @key headful
* @bug 8172269 8244557
* @summary Tests JTabbedPane background for SCROLL_TAB_LAYOUT
* @run main TestBackgroundScrollPolicy
* @run main/othervm -Dsun.java2d.uiScale=1 TestBackgroundScrollPolicy
*/

public class TestBackgroundScrollPolicy {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* @build Util
* @author Romain Guy
* @summary Tests PRESSED and MOUSE_OVER and FOCUSED state for buttons with Synth.
* @run main bug6276188
* @run main/othervm -Dsun.java2d.uiScale=1 bug6276188
*/
import java.awt.*;
import java.awt.image.*;
Expand Down

3 comments on commit c59f741

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented on c59f741 Oct 24, 2022

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on c59f741 Oct 24, 2022

Choose a reason for hiding this comment

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

@GoeLin the backport was successfully created on the branch GoeLin-backport-c59f7412 in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit c59f7412 from the openjdk/jdk17u-dev repository.

The commit being backported was authored by Goetz Lindenmaier on 22 Sep 2022 and had no reviewers.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev:

$ git fetch https://github.com/openjdk-bots/jdk11u-dev GoeLin-backport-c59f7412:GoeLin-backport-c59f7412
$ git checkout GoeLin-backport-c59f7412
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk11u-dev GoeLin-backport-c59f7412

Please sign in to comment.