8225045: javax/swing/JInternalFrame/8146321/JInternalFrameIconTest.java fails on linux-x64

Backport-of: a483869

Author: Amos Shi

test/jdk/ProblemList.txt

@@ -710,7 +710,6 @@ javax/swing/JComboBox/8182031/ComboPopupTest.java 8196465 linux-all,macosx-all
 javax/swing/JFileChooser/6738668/bug6738668.java 8194946 generic-all
 javax/swing/JFileChooser/8062561/bug8062561.java 8196466 linux-all,macosx-all
 javax/swing/JInternalFrame/Test6325652.java 8196467 macosx-all
-javax/swing/JInternalFrame/8146321/JInternalFrameIconTest.java 8225045 linux-all
 javax/swing/JLabel/6596966/bug6596966.java 8040914 macosx-all
 javax/swing/JPopupMenu/4870644/bug4870644.java 8194130 macosx-all
 javax/swing/JSpinner/8223788/JSpinnerButtonFocusTest.java 8238085 macosx-all

test/jdk/javax/swing/JInternalFrame/8146321/JInternalFrameIconTest.java

@@ -30,13 +30,15 @@
  * @build Util
  * @run main JInternalFrameIconTest
  */
+import java.io.File;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.Robot;
 import java.awt.image.BufferedImage;
+import javax.imageio.ImageIO;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import javax.swing.JDesktopPane;
@@ -61,7 +63,6 @@ public class JInternalFrameIconTest {
 
     public static void main(String[] args) throws Exception {
         robot = new Robot();
-        robot.delay(2000);
         UIManager.LookAndFeelInfo[] lookAndFeelArray
                 = UIManager.getInstalledLookAndFeels();
         for (UIManager.LookAndFeelInfo lookAndFeelItem : lookAndFeelArray) {
@@ -76,21 +77,28 @@ public static void main(String[] args) throws Exception {
     private static void executeCase(String lookAndFeelString) throws Exception {
         if (tryLookAndFeel(lookAndFeelString)) {
             createImageIconUI(lookAndFeelString);
+            robot.waitForIdle();
             robot.delay(1000);
             getImageIconBufferedImage();
+            robot.waitForIdle();
             robot.delay(1000);
             cleanUp();
             robot.waitForIdle();
+            robot.delay(1000);
 
             createIconUI(lookAndFeelString);
+            robot.waitForIdle();
             robot.delay(1000);
             getIconBufferedImage();
+            robot.waitForIdle();
             robot.delay(1000);
             cleanUp();
             robot.waitForIdle();
+            robot.delay(1000);
 
             testIfSame(lookAndFeelString);
             robot.waitForIdle();
+            robot.delay(1000);
         }
 
     }
@@ -208,6 +216,8 @@ private static void getIconBufferedImage() throws Exception {
     private static void testIfSame(final String lookAndFeelString)
             throws Exception {
         if (!bufferedImagesEqual(imageIconImage, iconImage)) {
+            ImageIO.write(imageIconImage, "png", new File("imageicon-fail.png"));
+            ImageIO.write(iconImage, "png", new File("iconImage-fail.png"));
             String error ="[" + lookAndFeelString
                     + "] : ERROR: icon and imageIcon not same.";
             errorString += error;