--- 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();
+    }
 }