From 2fbd3680908e426bbb795202dc1297f5b4f883d4 Mon Sep 17 00:00:00 2001 From: kshefov Date: Mon, 8 Apr 2013 17:18:16 +0400 Subject: [PATCH] 7153702: [TEST_BUG] [macosx] Synchronization problem in test javax/swing/JPopupMenu/6827786/bug6827786.java Reviewed-by: serb, alexsch --- test/javax/swing/JPopupMenu/6827786/bug6827786.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/javax/swing/JPopupMenu/6827786/bug6827786.java b/test/javax/swing/JPopupMenu/6827786/bug6827786.java index 7255ccb20..075f60032 100644 --- a/test/javax/swing/JPopupMenu/6827786/bug6827786.java +++ b/test/javax/swing/JPopupMenu/6827786/bug6827786.java @@ -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 @@ public class bug6827786 { 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(); -- GitLab