Skip to content

Commit

Permalink
8276058: Some swing test fails on specific CI macos system
Browse files Browse the repository at this point in the history 
Reviewed-by: prr, kizune
  • Loading branch information
@prsadhuk
prsadhuk committed Nov 18, 2021
1 parent 8193800 commit 9160743
Show file tree
Hide file tree
Showing 5 changed files with 119 additions and 47 deletions.
2 changes: 1 addition & 1 deletion test/jdk/ProblemList.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ java/awt/Toolkit/RealSync/Test.java 6849383 linux-all
java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java 8159252 windows-all
java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java 8072110 macosx-all
java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java 8073636 macosx-all
java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java 7019055,8266245 windows-all,linux-all,macosx-aarch64
java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java 7019055,8266245 windows-all,linux-all,macosx-all
java/awt/Focus/8013611/JDK8013611.java 8175366 windows-all,macosx-all
java/awt/Focus/6981400/Test1.java 8029675 windows-all,macosx-all
java/awt/Focus/6981400/Test3.java 8173264 generic-all
Expand Down
6 changes: 5 additions & 1 deletion test/jdk/java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ public class MakeWindowAlwaysOnTop
private static Frame f;
private static Dialog d;

// move away from cursor
private final static int OFFSET_X = -20;
private final static int OFFSET_Y = -20;

public static void main(String[] args) throws Exception
{
Robot r = Util.createRobot();
Expand Down Expand Up @@ -101,7 +105,7 @@ public static void main(String[] args) throws Exception
Util.waitForIdle(r);


Color c = r.getPixelColor(p.x + f.getWidth() / 2, p.y + f.getHeight() / 2);
Color c = r.getPixelColor(p.x + f.getWidth() / 2 - OFFSET_X, p.y + f.getHeight() / 2 - OFFSET_Y);
System.out.println("Color = " + c);

String exceptionMessage = null;
Expand Down
41 changes: 32 additions & 9 deletions test/jdk/javax/swing/JButton/8151303/PressedIconTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Robot;
import java.awt.Toolkit;
import java.awt.event.InputEvent;
import java.awt.image.BaseMultiResolutionImage;
import java.awt.image.BufferedImage;
Expand Down Expand Up @@ -56,37 +58,56 @@ public class PressedIconTest {
private static volatile double scale = -1;
private static volatile int centerX;
private static volatile int centerY;
private static volatile Point location;
// move away from cursor
private final static int OFFSET_X = -20;
private final static int OFFSET_Y = -20;

public static void main(String[] args) throws Exception {
Robot robot = new Robot();
robot.setAutoDelay(50);
robot.setAutoDelay(100);

SwingUtilities.invokeAndWait(() -> createAndShowGUI());
robot.waitForIdle();
robot.delay(1000);

SwingUtilities.invokeAndWait(() -> {
scale = frame.getGraphicsConfiguration().getDefaultTransform()
.getScaleX();
Point location = frame.getLocation();
location = frame.getLocation();
Dimension size = frame.getSize();
centerX = location.x + size.width / 2;
centerY = location.y + size.height / 2;
});
robot.waitForIdle();

System.out.println("scale " + scale);

robot.mouseMove(centerX, centerY);
robot.mousePress(InputEvent.BUTTON1_MASK);
robot.waitForIdle();
Thread.sleep(100);
Color color = robot.getPixelColor(centerX, centerY);
robot.mouseRelease(InputEvent.BUTTON1_MASK);
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
robot.waitForIdle();
Color color = robot.getPixelColor(centerX - OFFSET_X, centerY - OFFSET_Y);

Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
Rectangle screen = new Rectangle(0, 0, (int) screenSize.getWidth(), (int) screenSize.getHeight());
BufferedImage img = robot.createScreenCapture(screen);
javax.imageio.ImageIO.write(img, "png", new java.io.File("image.png"));

robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);


SwingUtilities.invokeAndWait(() -> frame.dispose());

if ((scale == 1 && !similar(color, COLOR_1X))
|| (scale == 2 && !similar(color, COLOR_2X))) {
throw new RuntimeException("Colors are different!");
if (scale == 1 && !similar(color, COLOR_1X)) {
System.out.println("color " + color + " COLOR_1X " + COLOR_1X);
throw new RuntimeException("Colors is different for scale=1!");
}
if (scale == 2 && !similar(color, COLOR_2X)) {
System.out.println("color " + color + " COLOR_2X " + COLOR_2X);
throw new RuntimeException("Colors is different for scale=2!");
}
System.out.println("Test Passed");
}

private static void createAndShowGUI() {
Expand All @@ -108,6 +129,8 @@ private static void createAndShowGUI() {
panel.add(button, BorderLayout.CENTER);

frame.getContentPane().add(panel);
frame.setUndecorated(true);
frame.setLocationRelativeTo(null);
frame.setVisible(true);
}

Expand Down
38 changes: 31 additions & 7 deletions test/jdk/javax/swing/JInternalFrame/8069348/bug8069348.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,12 @@

import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Rectangle;
import java.awt.Robot;
import java.awt.Toolkit;
import java.awt.image.BufferedImage;
import java.awt.event.InputEvent;
import javax.swing.JDesktopPane;
import javax.swing.JFrame;
Expand All @@ -52,6 +55,10 @@ public class bug8069348 {
private static final Color DESKTOPPANE_COLOR = Color.YELLOW;
private static final Color FRAME_COLOR = Color.ORANGE;

// move away from cursor
private final static int OFFSET_X = -20;
private final static int OFFSET_Y = -20;

private static JFrame frame;
private static JInternalFrame internalFrame;

Expand All @@ -66,7 +73,7 @@ public static void main(String[] args) throws Exception {
SwingUtilities.invokeAndWait(bug8069348::createAndShowGUI);

Robot robot = new Robot();
robot.setAutoDelay(50);
robot.setAutoDelay(100);
robot.waitForIdle();

Rectangle screenBounds = getInternalFrameScreenBounds();
Expand All @@ -79,27 +86,43 @@ public static void main(String[] args) throws Exception {
robot.mouseMove(x, y);
robot.waitForIdle();

robot.mousePress(InputEvent.BUTTON1_MASK);
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
robot.mouseMove(x + dx, y + dy);
robot.mouseRelease(InputEvent.BUTTON1_MASK);
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
robot.waitForIdle();

int cx = screenBounds.x + screenBounds.width + dx / 2;
int cy = screenBounds.y + screenBounds.height + dy / 2;

robot.mouseMove(cx, cy);
if (!FRAME_COLOR.equals(robot.getPixelColor(cx, cy))) {
robot.waitForIdle();
Color color = robot.getPixelColor(cx - OFFSET_X, cy - OFFSET_Y);

if (!FRAME_COLOR.equals(color)) {
System.out.println("cx " + cx + " cy " + cy);
System.err.println("FRAME_COLOR Red: " + FRAME_COLOR.getRed() + "; Green: " + FRAME_COLOR.getGreen() + "; Blue: " + FRAME_COLOR.getBlue());
System.err.println("Pixel color Red: " + color.getRed() + "; Green: " + color.getGreen() + "; Blue: " + color.getBlue());

Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
Rectangle screen = new Rectangle(0, 0, (int) screenSize.getWidth(), (int) screenSize.getHeight());
BufferedImage img = robot.createScreenCapture(screen);
javax.imageio.ImageIO.write(img, "png", new java.io.File("image.png"));

throw new RuntimeException("Internal frame is not correctly dragged!");
}
} finally {
if (frame != null) {
frame.dispose();
}
SwingUtilities.invokeAndWait(() -> {
if (frame != null) {
frame.dispose();
}
});
}
System.out.println("Test Passed");
}

private static boolean isSupported() {
String d3d = System.getProperty("sun.java2d.d3d");
System.out.println("d3d " + d3d);
return !Boolean.getBoolean(d3d) || getOSType() == OSType.WINDOWS;
}

Expand Down Expand Up @@ -138,6 +161,7 @@ public void paint(Graphics g) {
panel.add(desktopPane, BorderLayout.CENTER);
frame.add(panel);
frame.setSize(WIN_WIDTH, WIN_HEIGHT);
frame.setLocationRelativeTo(null);
frame.setVisible(true);
frame.requestFocus();
}
Expand Down
79 changes: 50 additions & 29 deletions test/jdk/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,46 +37,67 @@
import javax.swing.*;
import javax.swing.plaf.synth.*;

public class bug6276188 extends JFrame {
public class bug6276188 {

private static JButton button;
private static Point p;
private static JFrame testFrame;

// move away from cursor
private final static int OFFSET_X = -20;
private final static int OFFSET_Y = -20;

public static void main(String[] args) throws Throwable {
SynthLookAndFeel lookAndFeel = new SynthLookAndFeel();
lookAndFeel.load(bug6276188.class.getResourceAsStream("bug6276188.xml"), bug6276188.class);
try {
Robot robot = new Robot();
robot.setAutoDelay(100);

UIManager.setLookAndFeel(lookAndFeel);
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
JFrame testFrame = new JFrame();
testFrame.setLayout(new BorderLayout());
testFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
testFrame.add(BorderLayout.CENTER, button = new JButton());
SynthLookAndFeel lookAndFeel = new SynthLookAndFeel();
lookAndFeel.load(bug6276188.class.getResourceAsStream("bug6276188.xml"), bug6276188.class);
UIManager.setLookAndFeel(lookAndFeel);

testFrame.setSize(new Dimension(320, 200));
testFrame.setVisible(true);
}
});
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
testFrame = new JFrame();
testFrame.setLayout(new BorderLayout());
testFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
testFrame.add(BorderLayout.CENTER, button = new JButton());

Robot robot = new Robot();
robot.setAutoDelay(50);
robot.waitForIdle();
robot.delay(200);
testFrame.setSize(new Dimension(320, 200));
testFrame.setLocationRelativeTo(null);
testFrame.setVisible(true);
}
});

p = Util.getCenterPoint(button);
robot.waitForIdle();
robot.delay(1000);

robot.mouseMove(p.x , p.y);
robot.mousePress(InputEvent.BUTTON1_MASK);
robot.waitForIdle();
robot.delay(1000);
p = Util.getCenterPoint(button);
System.out.println("Button center point: " + p);

Color color = robot.getPixelColor(p.x, p.y);
robot.mouseRelease(InputEvent.BUTTON1_MASK);
boolean red = color.getRed() > 0 && color.getGreen() == 0 && color.getBlue() == 0;
if (!red) {
System.err.println("Red: " + color.getRed() + "; Green: " + color.getGreen() + "; Blue: " + color.getBlue());
throw new RuntimeException("Synth ButtonUI does not handle PRESSED & MOUSE_OVER state");
robot.mouseMove(p.x , p.y);
robot.waitForIdle();
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
robot.waitForIdle();

Color color = robot.getPixelColor(p.x - OFFSET_X, p.y - OFFSET_y);
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
robot.waitForIdle();
boolean red = color.getRed() > 0 && color.getGreen() == 0 && color.getBlue() == 0;
if (!red) {
System.err.println("Red: " + color.getRed() + "; Green: " + color.getGreen() + "; Blue: " + color.getBlue());
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
Rectangle screen = new Rectangle(0, 0, (int) screenSize.getWidth(), (int) screenSize.getHeight());
BufferedImage img = robot.createScreenCapture(screen);
javax.imageio.ImageIO.write(img, "png", new java.io.File("image.png"));
throw new RuntimeException("Synth ButtonUI does not handle PRESSED & MOUSE_OVER state");
}
} finally {
SwingUtilities.invokeAndWait(() -> {
if (testFrame != null) {
testFrame.dispose();
}
});
}
}
}

3 comments on commit 9160743

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@RealCLanger
Copy link
Contributor

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 9160743 May 9, 2023

Choose a reason for hiding this comment

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

@RealCLanger the backport was successfully created on the branch RealCLanger-backport-91607436 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-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 91607436 from the openjdk/jdk repository.

The commit being backported was authored by Prasanta Sadhukhan on 18 Nov 2021 and was reviewed by Phil Race and Alexander Zuev.

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/jdk17u-dev:

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

Please sign in to comment.