changeset 49653:eb15e0ca2208

8196435: Regression automated Test 'java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java' fails Reviewed-by: mhalder, ssadetsky, serb
author pkbalakr
date Wed, 07 Mar 2018 16:52:19 +0530
parents d8d1061ce34c
children 2cebce5e0ecc
files test/jdk/ProblemList.txt test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java
diffstat 2 files changed, 66 insertions(+), 61 deletions(-) [+]
line wrap: on
line diff
--- a/test/jdk/ProblemList.txt	Mon Mar 05 13:11:21 2018 -0800
+++ b/test/jdk/ProblemList.txt	Wed Mar 07 16:52:19 2018 +0530
@@ -398,7 +398,6 @@
 java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java 8198665 macosx-all
 java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java 8198665 macosx-all
 java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java 8198665 macosx-all
-java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java 8196435 linux-all
 java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java 8177326 macosx-all
 java/awt/Mouse/EnterExitEvents/DragWindowTest.java 8023562 macosx-all
 java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java 8005021 macosx-all
--- a/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java	Mon Mar 05 13:11:21 2018 -0800
+++ b/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java	Wed Mar 07 16:52:19 2018 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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,89 +21,95 @@
  * questions.
  */
 
-import test.java.awt.regtesthelpers.Util;
+import java.awt.Frame;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.Rectangle;
 
-import javax.swing.*;
-import java.awt.*;
-import java.util.concurrent.atomic.AtomicReference;
-
-/**
+/*
  * @test
  * @key headful
- * @bug 8012026
+ * @bug 8012026 8196435
  * @summary Component.getMousePosition() does not work in an applet on MacOS
- * @author Petr Pchelko
- * @library ../../regtesthelpers
- * @build Util
- * @compile GetMousePositionWithOverlay.java
- * @run main/othervm GetMousePositionWithOverlay
+ * @run main GetMousePositionWithOverlay
  */
 
 public class GetMousePositionWithOverlay {
 
-    static Frame backFrame;
-    static Frame frontFrame;
+    private static Frame backFrame;
+    private static Frame frontFrame;
+    private static Robot robot;
 
     public static void main(String[] args) throws Throwable {
-        try {
-            SwingUtilities.invokeAndWait(new Runnable() {
-                @Override
-                public void run() {
-                    constructTestUI();
-                }
-            });
-            Util.waitForIdle(null);
+        robot = new Robot();
 
-            Robot r = new Robot();
-            Util.pointOnComp(frontFrame, r);
-            Util.waitForIdle(null);
+        try{
+            constructTestUI();
+        } catch (Exception e) {
+            dispose();
+            throw new RuntimeException("Unexpected Exception!");
+        }
 
-            Point pos = getMousePosition(backFrame);
-            if (pos != null) {
-                throw new RuntimeException("Test failed. Mouse position should be null but was" + pos);
-            }
+        robot.waitForIdle();
 
-            pos = getMousePosition(frontFrame);
-            if (pos == null) {
-                throw new RuntimeException("Test failed. Mouse position should not be null");
-            }
-
-            r.mouseMove(189, 189);
-            Util.waitForIdle(null);
-
-            pos = getMousePosition(backFrame);
-            if (pos == null) {
-                throw new RuntimeException("Test failed. Mouse position should not be null");
-            }
-        } finally {
-            SwingUtilities.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    backFrame.dispose();
-                    frontFrame.dispose();
-                }
-            });
-        }
+        doTest();
+        dispose();
     }
 
-    private static Point getMousePosition(final Component component) throws Exception {
-        final AtomicReference<Point> pos = new AtomicReference<Point>();
-        SwingUtilities.invokeAndWait(new Runnable() {
-            @Override
-            public void run() {
-                pos.set(component.getMousePosition());
-            }
-        });
-        return pos.get();
+    private static void doTest() {
+
+        frontFrame.toFront();
+        robot.waitForIdle();
+
+        Rectangle bounds = new Rectangle(frontFrame.getLocationOnScreen(), frontFrame.getSize());
+        robot.mouseMove(bounds.x + bounds.width / 2, bounds.y + bounds.height / 2);
+        robot.waitForIdle();
+
+        Point pos = backFrame.getMousePosition();
+        if (pos != null) {
+            dispose();
+            throw new RuntimeException("Test failed. Mouse position should be null but was " + pos);
+        }
+
+        pos = frontFrame.getMousePosition();
+        if (pos == null) {
+            dispose();
+            throw new RuntimeException("Test failed. Mouse position should not be null");
+        }
+
+        robot.mouseMove(189, 189);
+        robot.waitForIdle();
+
+        pos = backFrame.getMousePosition();
+        if (pos == null) {
+            dispose();
+            throw new RuntimeException("Test failed. Mouse position should not be null");
+        }
+
+    }
+
+    private static void dispose() {
+
+        if (backFrame != null) {
+            backFrame.dispose();
+        }
+
+        if (frontFrame != null) {
+            frontFrame.dispose();
+        }
     }
 
     private static void constructTestUI() {
         backFrame = new Frame();
         backFrame.setBounds(100, 100, 100, 100);
+        backFrame.setResizable(false);
         backFrame.setVisible(true);
 
         frontFrame = new Frame();
         frontFrame.setBounds(120, 120, 60, 60);
+        frontFrame.setResizable(false);
         frontFrame.setVisible(true);
+
     }
 }
+