test/jdk/javax/swing/JLabel/6596966/bug6596966.java

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

@@ -25,23 +25,23 @@
  * @test
  * @key headful
  * @bug 6596966
  * @summary Some JFileChooser mnemonics do not work with sticky keys
  * @library ../../regtesthelpers
- * @library ../../../../lib/testlibrary
- * @build Util jdk.testlibrary.OSInfo
+ * @library /test/lib
+ * @build Util jdk.test.lib.Platform
  * @run main bug6596966
  * @author Pavel Porvatov
  */
 
 import java.awt.*;
 import java.awt.event.KeyEvent;
 import java.awt.event.InputEvent;
 import java.util.ArrayList;
 import javax.swing.*;
 
-import jdk.testlibrary.OSInfo;
+import jdk.test.lib.Platform;
 
 public class bug6596966 {
     private static JFrame frame;
 
     private static JLabel label;

@@ -76,11 +76,11 @@
 
         robot.waitForIdle();
 
 
         int keyMask = InputEvent.ALT_MASK;
-        if (OSInfo.getOSType() == OSInfo.OSType.MACOSX) {
+        if (Platform.isOSX()) {
             keyMask = InputEvent.CTRL_MASK | InputEvent.ALT_MASK;
         }
         ArrayList<Integer> keys = Util.getKeyCodesFromKeyMask(keyMask);
         for (int i = 0; i < keys.size(); ++i) {
             robot.keyPress(keys.get(i));