8327401: Some jtreg tests fail on Wayland without any tracking bug

8312111: open/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java fails on ubuntu 23.04

Backport-of: 286cc163fd4f8361a633dcb6494965020d02b506

Author: Andrew Lu

test/jdk/java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -113,6 +113,8 @@ private static void openPopup(final Choice choice) throws Exception {
         robot.setAutoDelay(100);
         robot.setAutoWaitForIdle(true);
         robot.waitForIdle();
+        robot.delay(500);
+
         Point pt = choice.getLocationOnScreen();
         robot.mouseMove(pt.x + choice.getWidth() / 2,
                         pt.y + choice.getHeight() / 2);

test/jdk/java/awt/Choice/PopupPosTest/PopupPosTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,8 +30,18 @@
   @run main PopupPosTest
 */
 
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.BorderLayout;
+import java.awt.Choice;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Frame;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.Toolkit;
+import java.awt.event.InputEvent;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.KeyEvent;
 
 public class PopupPosTest {
 
@@ -66,6 +76,7 @@ public TestFrame() {
             robot = new Robot();
             robot.setAutoDelay(50);
             robot.waitForIdle();
+            robot.delay(500);
             // fix for 6175418. When we take "choice.getHeight()/2"
             // divider 2 is not sufficiently big to hit into the
             // small box Choice. We should use bigger divider to get
@@ -108,9 +119,9 @@ public void itemStateChanged(ItemEvent ie) {
     public void mouseMoveAndPressOnChoice(int x, int y){
         openChoice();
         robot.mouseMove(x, y);
-        robot.mousePress(InputEvent.BUTTON1_MASK);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
         robot.delay(30);
-        robot.mouseRelease(InputEvent.BUTTON1_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
         robot.waitForIdle();
         //should close choice after each test stage
         closeChoice();
@@ -121,9 +132,9 @@ public void openChoice(){
         Point pt = choice.getLocationOnScreen();
         robot.mouseMove(pt.x + choice.getWidth() - choice.getHeight()/4,
                         pt.y + choice.getHeight()/2);
-        robot.mousePress(InputEvent.BUTTON1_MASK);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
         robot.delay(30);
-        robot.mouseRelease(InputEvent.BUTTON1_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
         robot.waitForIdle();
     }
     public void closeChoice(){

test/jdk/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,6 +79,7 @@ public void run() {
         }
 
         waitTillShown(dialog);
+        robot.delay(500);
         clickOn(button);
         if (frame == KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow()) {
             throw new RuntimeException("Test failed!");

test/jdk/java/awt/Focus/RowToleranceTransitivityTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,15 +28,14 @@
   @summary   Tests for a transitivity problem with ROW_TOLERANCE in SortingFTP.
   @run       main RowToleranceTransitivityTest
 */
-import java.awt.BorderLayout;
+
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.EventQueue;
 import java.awt.Frame;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.KeyboardFocusManager;
-import java.awt.Panel;
 import java.awt.Point;
 import java.awt.Robot;
 import java.awt.event.FocusAdapter;
@@ -49,8 +48,6 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.lang.reflect.InvocationTargetException;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 public class RowToleranceTransitivityTest {
     static JFrame frame;
@@ -60,7 +57,7 @@ public class RowToleranceTransitivityTest {
     static GridBagConstraints gc;
     static Robot robot;
 
-    static AtomicBoolean focusGained = new AtomicBoolean(false);
+    static final AtomicBoolean focusGained = new AtomicBoolean(false);
 
     public static void main(String[] args) throws Exception {
         robot = new Robot();
@@ -121,6 +118,7 @@ public void focusGained(FocusEvent e) {
             robot.delay(1000);
             test();
         } finally {
+            robot.keyRelease(KeyEvent.VK_TAB);
             if (frame != null) {
                 frame.dispose();
             }

test/jdk/java/awt/Focus/WrongKeyTypedConsumedTest/WrongKeyTypedConsumedTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,6 +75,7 @@ public void start ()
         frame.setLocationRelativeTo(null);
         frame.setVisible(true);
         Util.waitForIdle(robot);
+        robot.delay(500);
 
         if (!frame.isActive()) {
             throw new RuntimeException("Test Fialed: frame isn't active");

test/jdk/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,17 +40,27 @@ public class ActiveAWTWindowTest {
     private Frame frame, frame2;
     private Button button, button2;
     private TextField textField, textField2;
-    private int eventType, eventType1;
-    private ExtendedRobot robot;
-    private Object lock1 = new Object();
-    private Object lock2 = new Object();
-    private Object lock3 = new Object();
+    private volatile int eventType;
+    private final Object lock1 = new Object();
+    private final Object lock2 = new Object();
+    private final Object lock3 = new Object();
     private boolean passed = true;
-    private int delay = 150;
+    private final int delay = 150;
 
     public static void main(String[] args) {
         ActiveAWTWindowTest test = new ActiveAWTWindowTest();
-        test.doTest();
+        try {
+            test.doTest();
+        } finally {
+            EventQueue.invokeLater(() -> {
+                if (test.frame != null) {
+                    test.frame.dispose();
+                }
+                if (test.frame2 != null) {
+                    test.frame2.dispose();
+                }
+            });
+        }
     }
 
     public ActiveAWTWindowTest() {
@@ -105,7 +115,7 @@ public void windowDeactivated(WindowEvent e) {
                 System.out.println("Undecorated Frame got Deactivated\n");
                 synchronized (lock2) {
                     try {
-                            lock2.notifyAll();
+                        lock2.notifyAll();
                     } catch (Exception ex) {
                         ex.printStackTrace();
                     }
@@ -146,20 +156,22 @@ public void actionPerformed(ActionEvent e) {
     }
 
     public void doTest() {
+        ExtendedRobot robot;
         try {
             robot = new ExtendedRobot();
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("Cannot create robot");
         }
 
+        robot.setAutoDelay(delay);
+        robot.setAutoWaitForIdle(true);
+
         robot.waitForIdle(5*delay);
         robot.mouseMove(button.getLocationOnScreen().x + button.getSize().width / 2,
                         button.getLocationOnScreen().y + button.getSize().height / 2);
-        robot.waitForIdle(delay);
-        robot.mousePress(InputEvent.BUTTON1_MASK);
-        robot.waitForIdle(delay);
-        robot.mouseRelease(InputEvent.BUTTON1_MASK);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
 
         if (eventType != WindowEvent.WINDOW_ACTIVATED) {
             synchronized (lock1) {
@@ -176,15 +188,12 @@ public void doTest() {
                     "undecorated frame is activated!");
         }
 
-        eventType1 = -1;
         eventType = -1;
 
         robot.mouseMove(button2.getLocationOnScreen().x + button2.getSize().width / 2,
                         button2.getLocationOnScreen().y + button2.getSize().height / 2);
-        robot.waitForIdle(delay);
-        robot.mousePress(InputEvent.BUTTON1_MASK);
-        robot.waitForIdle(delay);
-        robot.mouseRelease(InputEvent.BUTTON1_MASK);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
 
         if (eventType != WindowEvent.WINDOW_DEACTIVATED) {
             synchronized (lock2) {