Mercurial > hg > openjdk > jigsaw > jdk

changeset 7218:0b083b0e8e63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7153702: [TEST_BUG] [macosx] Synchronization problem in test javax/swing/JPopupMenu/6827786/bug6827786.java Reviewed-by: serb, alexsch
author kshefov
date Mon, 08 Apr 2013 17:18:16 +0400
parents 2c36899500a0
children 981142561d1b d241f117ff46
files test/javax/swing/JPopupMenu/6827786/bug6827786.java
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/test/javax/swing/JPopupMenu/6827786/bug6827786.java	Fri Apr 05 18:29:53 2013 +0100
+++ b/test/javax/swing/JPopupMenu/6827786/bug6827786.java	Mon Apr 08 17:18:16 2013 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, 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
@@ -65,7 +65,11 @@
         checkfocus();
 
         // select menu
-        Util.hitKeys(robot, KeyEvent.VK_ALT, KeyEvent.VK_F);
+        if (sun.awt.OSInfo.getOSType() == sun.awt.OSInfo.OSType.MACOSX) {
+            Util.hitKeys(robot, KeyEvent.VK_CONTROL, KeyEvent.VK_ALT, KeyEvent.VK_F);
+        } else {
+            Util.hitKeys(robot, KeyEvent.VK_ALT, KeyEvent.VK_F);
+        }
         // select submenu
         Util.hitKeys(robot, KeyEvent.VK_S);
         toolkit.realSync();