Skip to content

8356061: [macos] com/apple/laf/RootPane/RootPaneDefaultButtonTest.java test fails on macosx-aarch64 machine #25244

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

8356061: [macos] com/apple/laf/RootPane/RootPaneDefaultButtonTest.java test fails on macosx-aarch64 machine #25244

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5dbf0a6
Merge pull request #1 from openjdk/master
mickleness May 22, 2022
333c87c
Merge pull request #2 from openjdk/master
mickleness May 24, 2022
57346a4
Merge pull request #3 from openjdk/master
mickleness May 29, 2022
69481fc
Merge pull request #4 from openjdk/master
mickleness Mar 11, 2023
81085d4
Merge pull request #5 from openjdk/master
mickleness Oct 13, 2024
93ef96a
Merge branch 'openjdk:master' into master
mickleness Dec 18, 2024
026c3db
Merge branch 'openjdk:master' into master
mickleness Mar 3, 2025
cc97808
Merge branch 'openjdk:master' into master
mickleness Mar 21, 2025
86b7944
Merge branch 'master' of https://github.com/mickleness/jdk
mickleness Apr 4, 2025
b9f767b
Merge branch 'master' of https://github.com/mickleness/jdk
mickleness Apr 20, 2025
15cef1c
Merge branch 'master' of https://github.com/mickleness/jdk
mickleness Apr 27, 2025
bf967a1
Merge branch 'master' of https://github.com/mickleness/jdk
mickleness May 15, 2025
f57716f
8356061: slowing down RootPaneDefaultButtonTest
mickleness May 15, 2025
b727092
8356061: additional output in the event of failure
mickleness May 15, 2025
9b92690
8356061: adding 1000ms pause after window construction
mickleness May 15, 2025
b076c96
8356061: restructuring to move things to EDT
mickleness May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
259 changes: 141 additions & 118 deletions test/jdk/com/apple/laf/RootPane/RootPaneDefaultButtonTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import javax.swing.border.*;
import java.awt.*;
import java.awt.event.*;
import java.lang.reflect.InvocationTargetException;

/**
* This presents two dialogs, each with two possible default buttons. The
Expand All @@ -45,37 +46,124 @@
* to double-check that the removed code didn't negatively affect how default
* buttons are repainted.
*/
public class RootPaneDefaultButtonTest extends JDialog {
public class RootPaneDefaultButtonTest {

record ButtonRenderingExpectation(JButton button,
boolean appearAsDefault) {}

static class TestDialog extends JDialog {
JRadioButton radioButton1 = new JRadioButton(
"\"Button 1\" is the default button");
JRadioButton radioButton2 = new JRadioButton(
"\"Button 2\" is the default button");
JRadioButton radioButton3 = new JRadioButton("No default button");

JButton button1 = new JButton("Button 1");
JButton button2 = new JButton("Button 2");

TestDialog() {
getContentPane().setLayout(new BorderLayout());
getContentPane().add(createRadioButtonPanel(), BorderLayout.NORTH);
getContentPane().add(createPushButtonRow(), BorderLayout.SOUTH);
pack();

radioButton1.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
getRootPane().setDefaultButton(button1);
}
});

radioButton2.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
getRootPane().setDefaultButton(button2);
}
});

radioButton3.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
getRootPane().setDefaultButton(null);
}
});

ButtonGroup g = new ButtonGroup();
g.add(radioButton1);
g.add(radioButton2);
g.add(radioButton3);
radioButton1.doClick();
}

private JPanel createPushButtonRow() {
JPanel p = new JPanel(new GridLayout(1, 2));
p.add(button1);
p.add(button2);
p.setBorder(new EmptyBorder(5,5,5,5));
return p;
}

private JPanel createRadioButtonPanel() {
JPanel p = new JPanel(new GridLayout(3, 1));
p.add(radioButton1);
p.add(radioButton2);
p.add(radioButton3);
p.setBorder(new EmptyBorder(5,5,5,5));
return p;
}
}

private static boolean isSimilar(Color c1, Color c2) {
if (Math.abs(c1.getRed() - c2.getRed()) > 15) {
return false;
}
if (Math.abs(c1.getGreen() - c2.getGreen()) > 15) {
return false;
}
if (Math.abs(c1.getBlue() - c2.getBlue()) > 15) {
return false;
}
return true;
}

public static void main(String[] args) throws Exception {
if (!System.getProperty("os.name").contains("OS X")) {
System.out.println("This test is for MacOS only.");
return;
}

RootPaneDefaultButtonTest window1 = new RootPaneDefaultButtonTest();
RootPaneDefaultButtonTest window2 = new RootPaneDefaultButtonTest();
RootPaneDefaultButtonTest test = new RootPaneDefaultButtonTest();
test.run();
}

SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
Rectangle r1 = new Rectangle(0, 20,
window1.getWidth(), window1.getHeight());
window1.setBounds(r1);
TestDialog window1, window2;
Robot robot;

Rectangle r2 = new Rectangle((int) (r1.getMaxX() + 10), 20,
window2.getWidth(), window2.getHeight());
window2.setBounds(r2);
public RootPaneDefaultButtonTest() throws Exception {
SwingUtilities.invokeAndWait(() -> {
window1 = new TestDialog();
window2 = new TestDialog();

window1.setVisible(true);
window2.setVisible(true);
}
Rectangle r1 = new Rectangle(0, 20,
window1.getWidth(), window1.getHeight());
window1.setBounds(r1);

Rectangle r2 = new Rectangle((int) (r1.getMaxX() + 10), 20,
window2.getWidth(), window2.getHeight());
window2.setBounds(r2);

window1.setVisible(true);
window2.setVisible(true);
});
robot = new Robot();
}


Robot robot = new Robot();
/**
* This is not run on the EDT; once it finishes this test is complete.
*/
private void run() throws Exception {
robot.delay(1000);

test(robot, window1.radioButton1,
new ButtonRenderingExpectation(window1.button1, true),
Expand Down Expand Up @@ -116,8 +204,8 @@ public void run() {
System.out.println("Test passed successfully");
}

private static void test(Robot robot, AbstractButton buttonToClick,
ButtonRenderingExpectation... expectations)
private void test(Robot robot, AbstractButton buttonToClick,
ButtonRenderingExpectation... expectations)
throws Exception {
robot.delay(100);

Expand All @@ -128,7 +216,7 @@ private static void test(Robot robot, AbstractButton buttonToClick,
robot.delay(20);
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);

robot.delay(100);
robot.delay(1000);
Copy link
Member

Choose a reason for hiding this comment

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

it will be useful to add the same delay before the first call to test, right after invokeAndWait.....setVisible(...)
Also please move creation and access_to all Swing components to EDT(button, radioButton1)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added an additional delay. I'm not sure exactly what refactor you're looking for, but I rewrote the test to put more in the EDT.

(I double-checked that the test still passes, but that doesn't prove much since I've never reproduced a failure.)

I did try at one point blocking the testing thread until the EDT had a chance to complete an invokeLater runnable, but that didn't seem to make a difference so I didn't commit it.


// the colors may change depending on your system's appearance.
// Depending on how you've configured "Appearance" in the
Expand All @@ -139,111 +227,46 @@ private static void test(Robot robot, AbstractButton buttonToClick,
Color defaultColor = null;
Color nonDefaultColor = null;

for (ButtonRenderingExpectation expectation : expectations) {
int x = expectation.button.getLocationOnScreen().x + 20;
int y = expectation.button.getLocationOnScreen().y + 10;

// this mouseMove is optional, but it helps debug this test to see
// where we're sampling the pixel color from:
robot.mouseMove(x, y);

Color c = robot.getPixelColor(x, y);
if (expectation.appearAsDefault) {
if (defaultColor == null) {
defaultColor = c;
for (int a = 0; a < expectations.length; a++) {
try {
ButtonRenderingExpectation expectation = expectations[a];
int x = expectation.button.getLocationOnScreen().x + 20;
int y = expectation.button.getLocationOnScreen().y + 10;

// this mouseMove is optional, but it helps debug this test to see
// where we're sampling the pixel color from:
robot.mouseMove(x, y);

Color c = robot.getPixelColor(x, y);
if (expectation.appearAsDefault) {
if (defaultColor == null) {
defaultColor = c;
} else {
throw new IllegalStateException(
"there should only be at most 1 default button");
}
} else {
throw new IllegalStateException(
"there should only be at most 1 default button");
if (nonDefaultColor == null) {
nonDefaultColor = c;
} else if (!isSimilar(nonDefaultColor, c)) {
throw new IllegalStateException(
"these two colors should match: " + c + ", " +
nonDefaultColor);
}
}
} else {
if (nonDefaultColor == null) {
nonDefaultColor = c;
} else if (!isSimilar(nonDefaultColor, c)) {

if (defaultColor != null && nonDefaultColor != null &&
isSimilar(defaultColor, nonDefaultColor)) {
throw new IllegalStateException(
"these two colors should match: " + c + ", " +
"The default button and non-default buttons should " +
"look different: " + defaultColor + " matches " +
nonDefaultColor);
}
} catch(Exception e) {
System.err.println("a = " + a + " defaultColor = " +
defaultColor + " nonDefaultColor = " + nonDefaultColor);
throw e;
}
}

if (defaultColor != null && isSimilar(defaultColor, nonDefaultColor)) {
throw new IllegalStateException(
"The default button and non-default buttons should " +
"look different: " + defaultColor + " matches " +
nonDefaultColor);
}
}

private static boolean isSimilar(Color c1, Color c2) {
if (Math.abs(c1.getRed() - c2.getRed()) > 15) {
return false;
}
if (Math.abs(c1.getGreen() - c2.getGreen()) > 15) {
return false;
}
if (Math.abs(c1.getBlue() - c2.getBlue()) > 15) {
return false;
}
return true;
}

JRadioButton radioButton1 = new JRadioButton(
"\"Button 1\" is the default button");
JRadioButton radioButton2 = new JRadioButton(
"\"Button 2\" is the default button");
JRadioButton radioButton3 = new JRadioButton("No default button");

JButton button1 = new JButton("Button 1");
JButton button2 = new JButton("Button 2");

public RootPaneDefaultButtonTest() {
getContentPane().setLayout(new BorderLayout());
getContentPane().add(createRadioButtonPanel(), BorderLayout.NORTH);
getContentPane().add(createPushButtonRow(), BorderLayout.SOUTH);
pack();

radioButton1.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
getRootPane().setDefaultButton(button1);
}
});

radioButton2.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
getRootPane().setDefaultButton(button2);
}
});

radioButton3.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
getRootPane().setDefaultButton(null);
}
});

ButtonGroup g = new ButtonGroup();
g.add(radioButton1);
g.add(radioButton2);
g.add(radioButton3);
radioButton1.doClick();
}

private JPanel createPushButtonRow() {
JPanel p = new JPanel(new GridLayout(1, 2));
p.add(button1);
p.add(button2);
p.setBorder(new EmptyBorder(5,5,5,5));
return p;
}

private JPanel createRadioButtonPanel() {
JPanel p = new JPanel(new GridLayout(3, 1));
p.add(radioButton1);
p.add(radioButton2);
p.add(radioButton3);
p.setBorder(new EmptyBorder(5,5,5,5));
return p;
}
}