8342602: Remove JButton/PressedButtonRightClickTest test

Backport-of: 8647c00114

test/jdk/TEST.groups

@@ -1105,7 +1105,6 @@ jdk_swing_wayland= \
     -javax/swing/event/FocusEventCauseTest.java \
     -javax/swing/JButton/4368790/bug4368790.java \
     -javax/swing/JButton/8151303/PressedIconTest.java \
-    -javax/swing/JButton/PressedButtonRightClickTest.java \
     -javax/swing/JColorChooser/Test6541987.java \
     -javax/swing/JColorChooser/Test6707406.java \
     -javax/swing/JColorChooser/Test6827032.java \

test/jdk/javax/swing/JButton/PressedButtonRightClickTest.java

@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2016, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import java.awt.AWTException;
-import java.awt.BorderLayout;
-import java.awt.EventQueue;
-import java.awt.Point;
-import java.awt.Robot;
-import java.awt.event.InputEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.SwingUtilities;
-
-/*
- * @test
- * @key headful
- * @bug  8049069
- * @summary Tests whether right mouse click releases a pressed JButton
- */
-
-public class PressedButtonRightClickTest {
-
-    private static Robot testRobot;
-    private static JFrame myFrame;
-    private static JButton myButton;
-
-    public static void main(String[] args) throws Throwable {
-
-        SwingUtilities.invokeAndWait(PressedButtonRightClickTest::constructTestUI);
-
-        try {
-            testRobot = new Robot();
-        } catch (AWTException ex) {
-            throw new RuntimeException("Exception in Robot creation");
-        }
-
-        testRobot.waitForIdle();
-        testRobot.delay(500);
-
-        // Method performing auto test operation
-        try {
-            test();
-        } finally {
-            EventQueue.invokeAndWait(PressedButtonRightClickTest::disposeTestUI);
-        }
-    }
-
-    private static void test() {
-        Point loc = myFrame.getLocationOnScreen();
-
-        testRobot.mouseMove((loc.x + 100), (loc.y + 100));
-
-        // Press the left mouse button
-        System.out.println("press BUTTON1_DOWN_MASK");
-        testRobot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
-        myButton.setText("Left button pressed");
-        testRobot.delay(500);
-
-        // Press the right mouse button
-        System.out.println("press BUTTON3_DOWN_MASK");
-        testRobot.mousePress(InputEvent.BUTTON3_DOWN_MASK);
-        myButton.setText("Left button pressed + Right button pressed");
-        testRobot.delay(500);
-
-        // Release the right mouse button
-        System.out.println("release BUTTON3_DOWN_MASK");
-        testRobot.mouseRelease(InputEvent.BUTTON3_DOWN_MASK);
-        myButton.setText("Right button released");
-        testRobot.waitForIdle();
-        testRobot.delay(500);
-
-        // Test whether the button is still pressed
-        boolean pressed = myButton.getModel().isPressed();
-        System.out.println("release BUTTON1_DOWN_MASK");
-        testRobot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
-        if (!pressed) {
-            disposeTestUI();
-            throw new RuntimeException("Test Failed!");
-        }
-    }
-
-    private static void disposeTestUI() {
-        myFrame.setVisible(false);
-        myFrame.dispose();
-    }
-
-    public static void constructTestUI() {
-        myFrame = new JFrame();
-        myFrame.setLayout(new BorderLayout());
-        myButton = new JButton("Whatever");
-        myButton.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mouseClicked(MouseEvent e) {
-                System.out.println(e);
-            }
-
-            @Override
-            public void mousePressed(MouseEvent e) {
-                System.out.println(e);
-            }
-
-            @Override
-            public void mouseReleased(MouseEvent e) {
-                System.out.println(e);
-            }
-
-            @Override
-            public void mouseEntered(MouseEvent e) {
-                System.out.println(e);
-            }
-
-            @Override
-            public void mouseExited(MouseEvent e) {
-                System.out.println(e);
-            }
-        });
-        myFrame.add(myButton, BorderLayout.CENTER);
-        myFrame.setSize(400, 300);
-        myFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        myFrame.setLocationRelativeTo(null);
-        myFrame.setVisible(true);
-    }
-}
-

test/jdk/javax/swing/JButton/bug4490179.java

@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4490179
+ * @bug 4490179 8049069
  * @summary Tests that JButton only responds to left mouse clicks.
  * @key headful
  * @run main bug4490179