test/jdk/javax/swing/JComboBox/4199622/bug4199622.java

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

*** 26,43 ****
     @key headful
     @bug 4199622
     @requires (os.family == "windows")
     @summary RFE: JComboBox shouldn't send ActionEvents for keyboard navigation
     @author Vladislav Karnaukhov
!    @library ../../../../lib/testlibrary
     @modules java.desktop/com.sun.java.swing.plaf.windows
!    @build jdk.testlibrary.OSInfo
     @run main bug4199622
   */
  
  import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
! import jdk.testlibrary.OSInfo;
  
  import javax.swing.*;
  import javax.swing.plaf.metal.MetalLookAndFeel;
  import java.awt.*;
  import java.awt.event.ActionEvent;
--- 26,43 ----
     @key headful
     @bug 4199622
     @requires (os.family == "windows")
     @summary RFE: JComboBox shouldn't send ActionEvents for keyboard navigation
     @author Vladislav Karnaukhov
!    @library /test/lib
     @modules java.desktop/com.sun.java.swing.plaf.windows
!    @build jdk.test.libr.Platform
     @run main bug4199622
   */
  
  import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
! import jdk.test.lib.Platform;
  
  import javax.swing.*;
  import javax.swing.plaf.metal.MetalLookAndFeel;
  import java.awt.*;
  import java.awt.event.ActionEvent;
*** 227,237 ****
          } catch (InvocationTargetException e) {
              throw new RuntimeException("Test failed", e);
          }
          doTest();
  
!         if (OSInfo.getOSType() == OSInfo.OSType.WINDOWS) {
              try {
                  SwingUtilities.invokeAndWait(new Runnable() {
                      @Override
                      public void run() {
                          bug4199622 test = new bug4199622(new WindowsLookAndFeel());
--- 227,237 ----
          } catch (InvocationTargetException e) {
              throw new RuntimeException("Test failed", e);
          }
          doTest();
  
!         if (Platform.isWindows()) {
              try {
                  SwingUtilities.invokeAndWait(new Runnable() {
                      @Override
                      public void run() {
                          bug4199622 test = new bug4199622(new WindowsLookAndFeel());