test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.java

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

*** 24,38 ****
  /*
    test
    @bug       6346690
    @summary   Tests that key_typed is consumed after mnemonic key_pressed is handled for a menu item.
    @author    anton.tarasov@sun.com: area=awt-focus
!   @library   ../../../../lib/testlibrary
!   @build jdk.testlibrary.OSInfo
    @run       applet ConsumeNextMnemonicKeyTypedTest.html
  */
  
  import java.awt.*;
  import javax.swing.*;
  import java.awt.event.*;
  import java.applet.Applet;
  
--- 24,40 ----
  /*
    test
    @bug       6346690
    @summary   Tests that key_typed is consumed after mnemonic key_pressed is handled for a menu item.
    @author    anton.tarasov@sun.com: area=awt-focus
!   @library   /test/lib
!   @build     jdk.test.lib.Platform
    @run       applet ConsumeNextMnemonicKeyTypedTest.html
  */
  
+ import jdk.test.lib.Platform;
+ 
  import java.awt.*;
  import javax.swing.*;
  import java.awt.event.*;
  import java.applet.Applet;
  
*** 114,132 ****
          robot.delay(100);
          robot.keyRelease(KeyEvent.VK_BACK_SPACE);
  
          robot.waitForIdle();
  
!         if (jdk.testlibrary.OSInfo.getOSType() == jdk.testlibrary.OSInfo.OSType.MACOSX) {
              robot.keyPress(KeyEvent.VK_CONTROL);
          }
          robot.keyPress(KeyEvent.VK_ALT);
          robot.keyPress(KeyEvent.VK_F);
          robot.delay(100);
          robot.keyRelease(KeyEvent.VK_F);
          robot.keyRelease(KeyEvent.VK_ALT);
!         if (jdk.testlibrary.OSInfo.getOSType() == jdk.testlibrary.OSInfo.OSType.MACOSX) {
              robot.keyRelease(KeyEvent.VK_CONTROL);
          }
  
          robot.waitForIdle();
  
--- 116,134 ----
          robot.delay(100);
          robot.keyRelease(KeyEvent.VK_BACK_SPACE);
  
          robot.waitForIdle();
  
!         if (Platform.isOSX()) {
              robot.keyPress(KeyEvent.VK_CONTROL);
          }
          robot.keyPress(KeyEvent.VK_ALT);
          robot.keyPress(KeyEvent.VK_F);
          robot.delay(100);
          robot.keyRelease(KeyEvent.VK_F);
          robot.keyRelease(KeyEvent.VK_ALT);
!         if (Platform.isOSX()) {
              robot.keyRelease(KeyEvent.VK_CONTROL);
          }
  
          robot.waitForIdle();