test/jdk/javax/swing/JFileChooser/8046391/bug8046391.java

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

*** 25,54 ****
   * @test
   * @bug 8046391
   * @requires (os.family == "windows")
   * @summary JFileChooser hangs if displayed in Windows L&F
   * @author Alexey Ivanov
!  * @library ../../../../lib/testlibrary
   * @modules java.desktop/com.sun.java.swing.plaf.windows
!  * @build jdk.testlibrary.OSInfo
   * @run main/othervm/timeout=10 bug8046391
  */
  
  import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
! import jdk.testlibrary.OSInfo;
! import jdk.testlibrary.OSInfo.OSType;
  
  import javax.swing.JFileChooser;
  import javax.swing.SwingUtilities;
  import javax.swing.UIManager;
  import javax.swing.UnsupportedLookAndFeelException;
  
  public class bug8046391  {
  
      public static void main(String[] args) throws Exception {
!         OSType type = OSInfo.getOSType();
!         if (type != OSType.WINDOWS) {
              System.out.println("This test is for Windows only... skipping!");
              return;
          }
  
          SwingUtilities.invokeAndWait(() -> {
--- 25,52 ----
   * @test
   * @bug 8046391
   * @requires (os.family == "windows")
   * @summary JFileChooser hangs if displayed in Windows L&F
   * @author Alexey Ivanov
!  * @library /test/lib
   * @modules java.desktop/com.sun.java.swing.plaf.windows
!  * @build jdk.test.lib.Platform
   * @run main/othervm/timeout=10 bug8046391
  */
  
  import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
! import jdk.test.lib.Platform;
  
  import javax.swing.JFileChooser;
  import javax.swing.SwingUtilities;
  import javax.swing.UIManager;
  import javax.swing.UnsupportedLookAndFeelException;
  
  public class bug8046391  {
  
      public static void main(String[] args) throws Exception {
!         if (!Platform.isWindows()) {
              System.out.println("This test is for Windows only... skipping!");
              return;
          }
  
          SwingUtilities.invokeAndWait(() -> {