java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.java

*** 1,18 ****
  /*
    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
    @run       applet ConsumeNextMnemonicKeyTypedTest.html
  */
  
  import java.awt.*;
  import javax.swing.*;
  import java.awt.event.*;
  import java.applet.Applet;
- import sun.awt.SunToolkit;
  
  
  public class ConsumeNextMnemonicKeyTypedTest extends Applet {
      Robot robot;
      JFrame frame = new JFrame("Test Frame");
--- 1,19 ----
  /*
    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;
  
  
  public class ConsumeNextMnemonicKeyTypedTest extends Applet {
      Robot robot;
      JFrame frame = new JFrame("Test Frame");
*** 28,37 ****
--- 29,39 ----
      }
  
      public void init() {
          try {
              robot = new Robot();
+             robot.setAutoDelay(50);
          } catch (AWTException e) {
              throw new RuntimeException("Error: unable to create robot", e);
          }
          // Create instructions for the user here, as well as set up
          // the environment -- set the layout manager, add buttons,
*** 56,68 ****
  
          test();
      }
  
      void test() {
-         SunToolkit toolkit = (SunToolkit)Toolkit.getDefaultToolkit();
  
!         toolkit.realSync();
  
          if (!text.isFocusOwner()) {
              robot.mouseMove(text.getLocationOnScreen().x + 5, text.getLocationOnScreen().y + 5);
              robot.delay(100);
              robot.mousePress(MouseEvent.BUTTON1_MASK);
--- 58,69 ----
  
          test();
      }
  
      void test() {
  
!         robot.waitForIdle();
  
          if (!text.isFocusOwner()) {
              robot.mouseMove(text.getLocationOnScreen().x + 5, text.getLocationOnScreen().y + 5);
              robot.delay(100);
              robot.mousePress(MouseEvent.BUTTON1_MASK);
*** 81,116 ****
  
          robot.keyPress(KeyEvent.VK_A);
          robot.delay(100);
          robot.keyRelease(KeyEvent.VK_A);
  
!         toolkit.realSync();
  
          String charA = text.getText();
          System.err.println("Test: character typed with VK_A: " + charA);
  
          robot.keyPress(KeyEvent.VK_BACK_SPACE);
          robot.delay(100);
          robot.keyRelease(KeyEvent.VK_BACK_SPACE);
  
!         toolkit.realSync();
  
          robot.keyPress(KeyEvent.VK_ALT);
          robot.keyPress(KeyEvent.VK_F);
          robot.delay(100);
          robot.keyRelease(KeyEvent.VK_F);
          robot.keyRelease(KeyEvent.VK_ALT);
  
!         toolkit.realSync();
  
          String string = text.getText();
  
          robot.keyPress(KeyEvent.VK_I);
          robot.delay(100);
          robot.keyRelease(KeyEvent.VK_I);
  
!         toolkit.realSync();
  
          Sysout.println("Test: character typed after mnemonic key press: " + text.getText());
  
          if (!text.getText().equals(string)) {
              throw new RuntimeException("Test failed!");
--- 82,123 ----
  
          robot.keyPress(KeyEvent.VK_A);
          robot.delay(100);
          robot.keyRelease(KeyEvent.VK_A);
  
!         robot.waitForIdle();
  
          String charA = text.getText();
          System.err.println("Test: character typed with VK_A: " + charA);
  
          robot.keyPress(KeyEvent.VK_BACK_SPACE);
          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();
  
          String string = text.getText();
  
          robot.keyPress(KeyEvent.VK_I);
          robot.delay(100);
          robot.keyRelease(KeyEvent.VK_I);
  
!         robot.waitForIdle();
  
          Sysout.println("Test: character typed after mnemonic key press: " + text.getText());
  
          if (!text.getText().equals(string)) {
              throw new RuntimeException("Test failed!");
*** 118,128 ****
  
          robot.keyPress(KeyEvent.VK_A);
          robot.delay(100);
          robot.keyRelease(KeyEvent.VK_A);
  
!         toolkit.realSync();
  
          System.err.println("Test: chracter typed with VK_A: " + text.getText());
  
          if (!charA.equals(text.getText())) {
              throw new RuntimeException("Test failed!");
--- 125,135 ----
  
          robot.keyPress(KeyEvent.VK_A);
          robot.delay(100);
          robot.keyRelease(KeyEvent.VK_A);
  
!         robot.waitForIdle();
  
          System.err.println("Test: chracter typed with VK_A: " + text.getText());
  
          if (!charA.equals(text.getText())) {
              throw new RuntimeException("Test failed!");