test/jdk/javax/swing/JPopupMenu/6827786/bug6827786.java

rev 51542 : 8210039: move OSInfo to top level testlibrary
Reviewed-by: duke

*** 26,42 ****
   * @key headful
   * @bug 6827786
   * @summary Tests duplicate mnemonics
   * @author Peter Zhelezniakov
   * @library ../../regtesthelpers
!  * @library ../../../../lib/testlibrary
   * @modules java.desktop/sun.awt
!  * @build jdk.testlibrary.OSInfo
   * @build Util
   * @run main bug6827786
   */
! import jdk.testlibrary.OSInfo;
  import java.awt.*;
  import java.awt.event.KeyEvent;
  import javax.swing.*;
  
  public class bug6827786 {
--- 26,43 ----
   * @key headful
   * @bug 6827786
   * @summary Tests duplicate mnemonics
   * @author Peter Zhelezniakov
   * @library ../../regtesthelpers
!  * @library /test/lib
   * @modules java.desktop/sun.awt
!  * @build jdk.test.lib.Platform
   * @build Util
   * @run main bug6827786
   */
! 
! import jdk.test.lib.Platform;
  import java.awt.*;
  import java.awt.event.KeyEvent;
  import javax.swing.*;
  
  public class bug6827786 {
*** 68,78 ****
  
          robot.waitForIdle();
          checkfocus();
  
          // select menu
!         if (OSInfo.getOSType() == 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
--- 69,79 ----
  
          robot.waitForIdle();
          checkfocus();
  
          // select menu
!         if (Platform.isOSX()) {
              Util.hitKeys(robot, KeyEvent.VK_CONTROL, KeyEvent.VK_ALT, KeyEvent.VK_F);
          } else {
              Util.hitKeys(robot, KeyEvent.VK_ALT, KeyEvent.VK_F);
          }
          // select submenu