test/jdk/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.java

@@ -111,19 +111,21 @@
         if (c instanceof Frame) {
             robot.mouseMove(p.x + (int)(d.getWidth()/2), p.y + ((Frame)c).getInsets().top/2);
         } else {
             robot.mouseMove(p.x + (int)(d.getWidth()/2), p.y + (int)(d.getHeight()/2));
         }
+        waitForIdle();
         robot.mousePress(InputEvent.BUTTON1_MASK);
         robot.mouseRelease(InputEvent.BUTTON1_MASK);
         waitForIdle();
     }
     void waitTillShown(Component c) {
         while (true) {
             try {
                 Thread.sleep(100);
-                c.getLocationOnScreen();
+                Point p = c.getLocationOnScreen();
+                if (p != null)
                 break;
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             } catch (IllegalComponentStateException e) {}
         }