test/jdk/java/awt/datatransfer/HTMLDataFlavors/HTMLDataFlavorTest.java

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

*** 26,42 ****
   * @key headful
   * @bug 7075105
   * @summary WIN: Provide a way to format HTML on drop
   * @author Denis Fokin: area=datatransfer
   * @requires (os.family == "windows")
!  * @library ../../../../lib/testlibrary
   * @build HtmlTransferable PutAllHtmlFlavorsOnClipboard
   * @build PutOnlyAllHtmlFlavorOnClipboard PutSelectionAndFragmentHtmlFlavorsOnClipboard
!  * @build jdk.testlibrary.OSInfo
   * @run main HTMLDataFlavorTest
   */
  
  import java.awt.*;
  import java.awt.datatransfer.*;
  import java.io.*;
  import java.util.HashMap;
  
--- 26,44 ----
   * @key headful
   * @bug 7075105
   * @summary WIN: Provide a way to format HTML on drop
   * @author Denis Fokin: area=datatransfer
   * @requires (os.family == "windows")
!  * @library /test/lib
   * @build HtmlTransferable PutAllHtmlFlavorsOnClipboard
   * @build PutOnlyAllHtmlFlavorOnClipboard PutSelectionAndFragmentHtmlFlavorsOnClipboard
!  * @build jdk.test.lib.Platform
   * @run main HTMLDataFlavorTest
   */
  
+ import jdk.test.lib.Platform;
+ 
  import java.awt.*;
  import java.awt.datatransfer.*;
  import java.io.*;
  import java.util.HashMap;
  
*** 45,55 ****
      private static HashMap<DataFlavor, String> dataFlavors = new HashMap<DataFlavor, String>();
  
  
      public static void main(String[] args) throws IOException, UnsupportedFlavorException {
  
!         if (jdk.testlibrary.OSInfo.getOSType() != jdk.testlibrary.OSInfo.OSType.WINDOWS) {
              System.err.println("This test is for MS Windows only. Considered passed.");
              return;
          }
  
          dataFlavors.put(DataFlavor.allHtmlFlavor, HtmlTransferable.ALL_HTML_AS_STRING);
--- 47,57 ----
      private static HashMap<DataFlavor, String> dataFlavors = new HashMap<DataFlavor, String>();
  
  
      public static void main(String[] args) throws IOException, UnsupportedFlavorException {
  
!         if (!Platform.isWindows()) {
              System.err.println("This test is for MS Windows only. Considered passed.");
              return;
          }
  
          dataFlavors.put(DataFlavor.allHtmlFlavor, HtmlTransferable.ALL_HTML_AS_STRING);