Skip to content

8335470: [XWayland] JavaFX tests that use AWT Robot fail on Wayland #1661

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.

Sign up for GitHub

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

Closed
wants to merge 2 commits into from
Closed

8335470: [XWayland] JavaFX tests that use AWT Robot fail on Wayland #1661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcb8a83
8335470: [XWayland] JavaFX tests that use AWT Robot fail on Wayland
azvegint Dec 10, 2024
f63f0be
check JDK version
azvegint Dec 10, 2024
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
2 changes: 1 addition & 1 deletion tests/system/src/test/java/test/robot/javafx/embed/swing/LinuxScreencastHangCrashTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ public class LinuxScreencastHangCrashTest {

@BeforeAll
public static void init() throws Exception {
Assumptions.assumeTrue(!Util.isOnWayland()); // JDK-8335470
Assumptions.assumeTrue(Util.isOnWayland());
Assumptions.assumeTrue(Runtime.version().feature() >= 24);
robot = new Robot();
}

Expand Down
16 changes: 9 additions & 7 deletions tests/system/src/test/java/test/robot/javafx/embed/swing/SwingNodeJDialogTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,24 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import javax.swing.SwingUtilities;

import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import test.util.Util;

@Timeout(value=15000, unit=TimeUnit.MILLISECONDS)
public class SwingNodeJDialogTest extends SwingNodeBase {

@BeforeAll
public static void init() throws Exception {
if (Util.isOnWayland()) {
assumeTrue(Runtime.version().feature() >= 24);
}
}

@Test
public void testJDialogAbove() throws InterruptedException, InvocationTargetException {
assumeTrue(!Util.isOnWayland()); // JDK-8335470
myApp.createStageAndDialog();
myApp.showDialog();

Expand All @@ -50,7 +58,6 @@ public void testJDialogAbove() throws InterruptedException, InvocationTargetExce

@Test
public void testNodeRemovalAfterShow() throws InterruptedException, InvocationTargetException {
assumeTrue(!Util.isOnWayland()); // JDK-8335470
myApp.createStageAndDialog();
myApp.showDialog();

Expand All @@ -65,7 +72,6 @@ public void testNodeRemovalAfterShow() throws InterruptedException, InvocationTa

@Test
public void testNodeRemovalBeforeShow() throws InterruptedException, InvocationTargetException {
assumeTrue(!Util.isOnWayland()); // JDK-8335470
myApp.createStageAndDialog();
myApp.detachSwingNode();
myApp.showDialog();
Expand All @@ -78,7 +84,6 @@ public void testNodeRemovalBeforeShow() throws InterruptedException, InvocationT

@Test
public void testStageCloseAfterShow() throws InvocationTargetException, InterruptedException {
assumeTrue(!Util.isOnWayland()); // JDK-8335470
myApp.createStageAndDialog();
myApp.showDialog();
testAbove(true);
Expand All @@ -88,7 +93,6 @@ public void testStageCloseAfterShow() throws InvocationTargetException, Interrup

@Test
public void testStageCloseBeforeShow() throws InvocationTargetException, InterruptedException {
assumeTrue(!Util.isOnWayland()); // JDK-8335470
myApp.createStageAndDialog();
myApp.closeStage();
myApp.showDialog();
Expand All @@ -99,7 +103,6 @@ public void testStageCloseBeforeShow() throws InvocationTargetException, Interru

@Test
public void testNodeRemovalBeforeShowHoldEDT() throws InterruptedException, InvocationTargetException {
assumeTrue(!Util.isOnWayland()); // JDK-8335470
myApp.createAndShowStage();
CountDownLatch latch = new CountDownLatch(1);
SwingUtilities.invokeLater(()-> {
Expand All @@ -117,7 +120,6 @@ public void testNodeRemovalBeforeShowHoldEDT() throws InterruptedException, Invo

@Test
public void testStageCloseBeforeShowHoldEDT() throws InvocationTargetException, InterruptedException {
assumeTrue(!Util.isOnWayland()); // JDK-8335470
myApp.createAndShowStage();
CountDownLatch latch = new CountDownLatch(1);
SwingUtilities.invokeLater(()-> {
Expand Down
5 changes: 4 additions & 1 deletion tests/system/src/test/java/test/robot/javafx/scene/SRGBTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,10 @@ public void screenCaptureTest() {
@Test
@Timeout(value=15)
public void sRGBPixelTest() throws Exception {
assumeTrue(!Util.isOnWayland()); // JDK-8335470
if (Util.isOnWayland()) {
assumeTrue(Runtime.version().feature() >= 24);
}

Rectangle swatch = prepareStage();

for (TestColor testColor : TestColor.values()) {
Expand Down