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

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

@@ -24,15 +24,17 @@
 /*
   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
+  @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,19 +116,19 @@
         robot.delay(100);
         robot.keyRelease(KeyEvent.VK_BACK_SPACE);
 
         robot.waitForIdle();
 
-        if (jdk.testlibrary.OSInfo.getOSType() == jdk.testlibrary.OSInfo.OSType.MACOSX) {
+        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 (jdk.testlibrary.OSInfo.getOSType() == jdk.testlibrary.OSInfo.OSType.MACOSX) {
+        if (Platform.isOSX()) {
             robot.keyRelease(KeyEvent.VK_CONTROL);
         }
 
         robot.waitForIdle();