test/jdk/java/awt/dnd/ImageTransferTest/ImageTransferTest.java

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

*** 25,44 ****
   * @test
   * @key headful
   * @bug 4397404 4720930 8197926
   * @summary tests that images of all supported native image formats are
   * transferred properly
!  * @library ../../../../lib/testlibrary
   * @library ../../regtesthelpers/process/
!  * @build jdk.testlibrary.OSInfo ProcessResults ProcessCommunicator
   * @author gas@sparc.spb.su area=Clipboard
   * @run main/timeout=240 ImageTransferTest
   */
  
  import test.java.awt.regtesthelpers.process.ProcessCommunicator;
  import test.java.awt.regtesthelpers.process.ProcessResults;
- import jdk.testlibrary.OSInfo;
  
  import java.awt.*;
  import java.awt.datatransfer.DataFlavor;
  import java.awt.datatransfer.SystemFlavorMap;
  import java.awt.datatransfer.Transferable;
--- 25,44 ----
   * @test
   * @key headful
   * @bug 4397404 4720930 8197926
   * @summary tests that images of all supported native image formats are
   * transferred properly
!  * @library /test/lib
   * @library ../../regtesthelpers/process/
!  * @build jdk.test.lib.Platform ProcessResults ProcessCommunicator
   * @author gas@sparc.spb.su area=Clipboard
   * @run main/timeout=240 ImageTransferTest
   */
  
+ import jdk.test.lib.Platform;
  import test.java.awt.regtesthelpers.process.ProcessCommunicator;
  import test.java.awt.regtesthelpers.process.ProcessResults;
  
  import java.awt.*;
  import java.awt.datatransfer.DataFlavor;
  import java.awt.datatransfer.SystemFlavorMap;
  import java.awt.datatransfer.Transferable;
*** 172,183 ****
      static String[] retrieveFormatsToTest() {
          SystemFlavorMap sfm =
                  (SystemFlavorMap) SystemFlavorMap.getDefaultFlavorMap();
          java.util.List<String> ln =
                  sfm.getNativesForFlavor(DataFlavor.imageFlavor);
!         if (OSInfo.OSType.WINDOWS.equals(OSInfo.getOSType()) &&
!             !ln.contains("METAFILEPICT"))
          {
              // for test failing on JDK without this fix
              ln.add("METAFILEPICT");
          }
          return ln.toArray(new String[ln.size()]);
--- 172,182 ----
      static String[] retrieveFormatsToTest() {
          SystemFlavorMap sfm =
                  (SystemFlavorMap) SystemFlavorMap.getDefaultFlavorMap();
          java.util.List<String> ln =
                  sfm.getNativesForFlavor(DataFlavor.imageFlavor);
!         if (Platform.isWindows() &&  !ln.contains("METAFILEPICT"))
          {
              // for test failing on JDK without this fix
              ln.add("METAFILEPICT");
          }
          return ln.toArray(new String[ln.size()]);