test/jdk/javax/swing/JFileChooser/6840086/bug6840086.java

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

@@ -23,17 +23,17 @@
 
 /* @test
    @bug 6840086
    @summary JFileChooser lacks icons on top right when running on Windows 7
    @author Pavel Porvatov
-   @library ../../../../lib/testlibrary
+   @library /test/lib
    @modules java.desktop/sun.awt.shell
-   @build jdk.testlibrary.OSInfo
+   @build jdk.test.lib.Platform
    @run main bug6840086
 */
 
-import jdk.testlibrary.OSInfo;
+import jdk.test.lib.Platform;
 import sun.awt.shell.ShellFolder;
 
 import java.awt.*;
 
 public class bug6840086 {

@@ -44,11 +44,11 @@
         "fileChooserIcon UpFolder",
         "fileChooserIcon NewFolder",
     };
 
     public static void main(String[] args) {
-        if (OSInfo.getOSType() != OSInfo.OSType.WINDOWS) {
+        if (!Platform.isWindows()) {
             System.out.println("The test was skipped because it is sensible only for Windows.");
 
             return;
         }