# HG changeset patch # User kshefov # Date 1365427096 -14400 # Node ID 7a5dc946731564ef73130cc5b8402e5541f9dfae # Parent f041f82cdeac32847e71547b5e694d505aeed0e2 7153702: [TEST_BUG] [macosx] Synchronization problem in test javax/swing/JPopupMenu/6827786/bug6827786.java Reviewed-by: serb, alexsch diff -r f041f82cdeac -r 7a5dc9467315 jdk/test/javax/swing/JPopupMenu/6827786/bug6827786.java --- a/jdk/test/javax/swing/JPopupMenu/6827786/bug6827786.java Fri Apr 05 18:29:53 2013 +0100 +++ b/jdk/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();