--- old/test/jdk/java/awt/TrayIcon/AddPopupAfterShowTest/AddPopupAfterShowTest.java 2020-02-27 16:37:00.929292451 +0530
+++ new/test/jdk/java/awt/TrayIcon/AddPopupAfterShowTest/AddPopupAfterShowTest.java 2020-02-27 16:37:00.669292455 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, 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
@@ -21,63 +21,149 @@
* questions.
*/
+/*
+ * @test
+ * @key headful
+ * @bug 8007220 8204161
+ * @summary The popup menu is not added to the tray icon after it was added to tray
+ * @run main/manual AddPopupAfterShowTest
+ */
-import test.java.awt.regtesthelpers.Sysout;
-
-import java.applet.Applet;
-import java.awt.*;
+import java.awt.AWTException;
+import java.awt.Button;
+import java.awt.Color;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
import java.awt.image.BufferedImage;
+import java.awt.Frame;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.Image;
+import java.awt.Graphics2D;
+import java.awt.event.ActionEvent;
+import java.awt.TextArea;
+import java.awt.TrayIcon;
+import java.awt.Panel;
+import java.awt.PopupMenu;
+import java.awt.RenderingHints;
+import java.awt.MenuItem;
+import java.awt.SystemTray;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class AddPopupAfterShowTest {
+
+ private static final Frame instructionFrame = new Frame();
+ private static TrayIcon trayIcon = null;
+
+ private static volatile boolean testResult = false;
+ private static volatile CountDownLatch countDownLatch;
+ private static final String INSTRUCTIONS = "INSTRUCTIONS:\n\n" +
+ "1) The red circle icon was added to the system tray.\n"+
+ "2) Check that a popup menu is opened when the icon is clicked.\n"+
+ "3) If true the test is passed, otherwise failed.";
-public class AddPopupAfterShowTest extends Applet {
- @Override
- public void init() {
+ public static void main(String[] args) throws Exception {
if (!SystemTray.isSupported()) {
- Sysout.createDialogWithInstructions(new String[]{
- "Press PASS, the System Tray is not supported"});
+ System.out.println("The System Tray is not supported," +
+ "so this test can not be run in this scenario.");
return;
}
+ countDownLatch = new CountDownLatch(1);
-
- String[] instructions = {
- "1) The red circle icon was added to the system tray.",
- "2) Check that a popup menu is opened when the icon is clicked.",
- "3) If true the test is passed, otherwise failed."};
- Sysout.createDialogWithInstructions(instructions);
+ createInstructionUI();
+ createTestUI();
+ countDownLatch.await(15, TimeUnit.MINUTES);
+ disposeUI();
+ if (!testResult) {
+ throw new RuntimeException("Test failed!");
+ }
}
- @Override
- public void start() {
- setSize(200, 200);
- show();
-
- createSystemTrayIcon();
+ private static void createInstructionUI() {
+ GridBagLayout layout = new GridBagLayout();
+ Panel mainControlPanel = new Panel(layout);
+ Panel resultButtonPanel = new Panel(layout);
+
+ GridBagConstraints gbc = new GridBagConstraints();
+
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.insets = new Insets(5, 15, 5, 15);
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+
+ TextArea instructionTextArea = new TextArea();
+ instructionTextArea.setText(INSTRUCTIONS);
+ instructionTextArea.setEditable(false);
+ instructionTextArea.setBackground(Color.white);
+ mainControlPanel.add(instructionTextArea, gbc);
+
+ Button passButton = new Button("Pass");
+ passButton.setActionCommand("Pass");
+ passButton.addActionListener((ActionEvent e) -> {
+ testResult = true;
+ countDownLatch.countDown();
+ });
+
+ Button failButton = new Button("Fail");
+ failButton.setActionCommand("Fail");
+ failButton.addActionListener(e -> {
+ countDownLatch.countDown();
+ });
+
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+
+ resultButtonPanel.add(passButton, gbc);
+
+ gbc.gridx = 1;
+ gbc.gridy = 0;
+ resultButtonPanel.add(failButton, gbc);
+
+ gbc.gridx = 0;
+ gbc.gridy = 2;
+ mainControlPanel.add(resultButtonPanel, gbc);
+
+ instructionFrame.addWindowListener(new WindowAdapter() {
+ @Override
+ public void windowClosing(WindowEvent e) {
+ super.windowClosing(e);
+ countDownLatch.countDown();
+ }
+ });
+ instructionFrame.pack();
+ instructionFrame.add(mainControlPanel);
+ instructionFrame.pack();
+ instructionFrame.setVisible(true);
}
- private static void createSystemTrayIcon() {
- final TrayIcon trayIcon = new TrayIcon(createTrayIconImage());
+ private static void createTestUI() throws Exception {
+ trayIcon = new TrayIcon(createTrayIconImage());
trayIcon.setImageAutoSize(true);
-
- try {
- // Add tray icon to system tray *before* adding popup menu to demonstrate buggy behaviour
- SystemTray.getSystemTray().add(trayIcon);
- trayIcon.setPopupMenu(createTrayIconPopupMenu());
- } catch (final AWTException awte) {
- awte.printStackTrace();
- }
+ // Add tray icon to system tray *before* adding popup menu
+ // to demonstrate buggy behaviour
+ SystemTray.getSystemTray().add(trayIcon);
+ trayIcon.setPopupMenu(createTrayIconPopupMenu());
}
private static Image createTrayIconImage() {
/**
- * Create a small image of a red circle to use as the icon for the tray icon
+ * Create a small image of a red circle to use as the icon
+ * for the tray icon
*/
int trayIconImageSize = 32;
- final BufferedImage trayImage = new BufferedImage(trayIconImageSize, trayIconImageSize, BufferedImage.TYPE_INT_ARGB);
- final Graphics2D trayImageGraphics = (Graphics2D) trayImage.getGraphics();
+ final BufferedImage trayImage = new BufferedImage(trayIconImageSize,
+ trayIconImageSize, BufferedImage.TYPE_INT_ARGB);
+ final Graphics2D trayImageGraphics =
+ (Graphics2D) trayImage.getGraphics();
- trayImageGraphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+ trayImageGraphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
trayImageGraphics.setColor(new Color(255, 255, 255, 0));
- trayImageGraphics.fillRect(0, 0, trayImage.getWidth(), trayImage.getHeight());
+ trayImageGraphics.fillRect(0, 0, trayImage.getWidth(),
+ trayImage.getHeight());
trayImageGraphics.setColor(Color.red);
@@ -103,4 +189,9 @@
trayIconPopupMenu.add(popupMenuItem);
return trayIconPopupMenu;
}
+
+ private static void disposeUI() {
+ SystemTray.getSystemTray().remove(trayIcon);
+ instructionFrame.dispose();
+ }
}
--- /dev/null 2020-02-27 12:08:55.107999930 +0530
+++ new/test/jdk/java/awt/TrayIcon/MiddleButtonEventTest/MiddleButtonEventTest.java 2020-02-27 16:37:01.321292445 +0530
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2013, 2020, 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.
+ */
+
+/*
+ * @test
+ * @key headful
+ * @bug 6272324 8204161
+ * @summary Tests that clicking TrayIcon with middle button generates events.
+ * @run main/manual MiddleButtonEventTest
+ */
+
+import java.awt.Button;
+import java.awt.Color;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.image.BufferedImage;
+import java.awt.Frame;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.Graphics;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.TextArea;
+import java.awt.Toolkit;
+import java.awt.TrayIcon;
+import java.awt.Panel;
+import java.awt.SystemTray;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class MiddleButtonEventTest {
+
+ private static final Frame instructionFrame = new Frame();
+ private static TrayIcon trayIcon = null;
+ private static final String INSTRUCTIONS = "INSTRUCTIONS:\n\n" +
+ "Tests that clicking TrayIcon with middle button generates events.\n"+
+ "When the test is started you will see three-color icon in the " +
+ "system tray.\n Click on it with the middle mouse button:\n" +
+ "- MOUSE_PRESSED, MOUSE_RELEASED, MOUSE_CLICKED events should be\n"+
+ " generated for the middle button.\n" +
+ " If so, the test passed, otherwise failed.";
+ private static final TextArea eventOutputArea = new TextArea("", 5, 50,
+ TextArea.SCROLLBARS_BOTH);
+ private static volatile boolean testResult = false;
+ private static volatile CountDownLatch countDownLatch;
+
+ public static void main(String[] args) throws Exception {
+ if (!SystemTray.isSupported()) {
+ System.out.println("The System Tray is not supported, " +
+ "so this test can not be run in this scenario.");
+ return;
+ }
+ countDownLatch = new CountDownLatch(1);
+
+ createInstructionUI();
+ createTestUI();
+ countDownLatch.await(15, TimeUnit.MINUTES);
+ disposeUI();
+ if (!testResult) {
+ throw new RuntimeException("Test failed!");
+ }
+ }
+
+ private static void createInstructionUI() {
+ GridBagLayout layout = new GridBagLayout();
+ Panel mainControlPanel = new Panel(layout);
+ Panel resultButtonPanel = new Panel(layout);
+
+ GridBagConstraints gbc = new GridBagConstraints();
+
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.insets = new Insets(5, 15, 5, 15);
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+
+ TextArea instructionTextArea = new TextArea();
+ instructionTextArea.setText(INSTRUCTIONS);
+ instructionTextArea.setEditable(false);
+ instructionTextArea.setBackground(Color.white);
+ mainControlPanel.add(instructionTextArea, gbc);
+
+ Button passButton = new Button("Pass");
+ passButton.setActionCommand("Pass");
+ passButton.addActionListener((ActionEvent e) -> {
+ testResult = true;
+ countDownLatch.countDown();
+ });
+
+ Button failButton = new Button("Fail");
+ failButton.setActionCommand("Fail");
+ failButton.addActionListener(e -> {
+ countDownLatch.countDown();
+ });
+
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+
+ resultButtonPanel.add(passButton, gbc);
+
+ gbc.gridx = 1;
+ gbc.gridy = 0;
+ resultButtonPanel.add(failButton, gbc);
+
+ gbc.gridx = 0;
+ gbc.gridy = 2;
+ mainControlPanel.add(resultButtonPanel, gbc);
+
+ gbc.gridx = 0;
+ gbc.gridy = 3;
+ mainControlPanel.add(eventOutputArea, gbc);
+
+ instructionFrame.addWindowListener(new WindowAdapter() {
+ @Override
+ public void windowClosing(WindowEvent e) {
+ super.windowClosing(e);
+ countDownLatch.countDown();
+ }
+ });
+ instructionFrame.pack();
+ instructionFrame.add(mainControlPanel);
+ instructionFrame.pack();
+ instructionFrame.setVisible(true);
+ }
+
+ private static void createTestUI() throws Exception {
+ BufferedImage im = new BufferedImage(16, 16,
+ BufferedImage.TYPE_INT_ARGB);
+ Graphics gr = im.createGraphics();
+ gr.setColor(Color.white);
+ gr.fillRect(0, 0, 16, 5);
+ gr.setColor(Color.blue);
+ gr.fillRect(0, 5, 16, 10);
+ gr.setColor(Color.red);
+ gr.fillRect(0, 10, 16, 16);
+
+ trayIcon = new TrayIcon(im);
+ trayIcon.setImageAutoSize(true);
+ trayIcon.addMouseListener(new MouseAdapter() {
+ public void mousePressed(MouseEvent e) {
+ printEventStr(e.toString());
+ }
+
+ public void mouseReleased(MouseEvent e) {
+ printEventStr(e.toString());
+ }
+
+ public void mouseClicked(MouseEvent e) {
+ printEventStr(e.toString());
+ }
+ });
+ SystemTray.getSystemTray().add(trayIcon);
+ }
+
+ private static void disposeUI() {
+ SystemTray.getSystemTray().remove(trayIcon);
+ instructionFrame.dispose();
+ }
+
+ private static void printEventStr(String msg) {
+ eventOutputArea.append(msg + "\n");
+ System.out.println(msg);
+ }
+}
--- old/test/jdk/java/awt/TrayIcon/AddPopupAfterShowTest/AddPopupAfterShowTest.html 2020-02-27 16:37:02.297292431 +0530
+++ /dev/null 2020-02-27 12:08:55.107999930 +0530
@@ -1,45 +0,0 @@
-
-
-
-
-
- AddPopupAfterShowTest
-
-
-
-AddPopupAfterShowTest
Bug ID: 8007220
-
- See the dialog box (usually in upper left corner) for instructions
-
-
-
-