test/jdk/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java

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

*** 32,51 ****
  import java.awt.TextArea;
  import java.awt.Toolkit;
  import java.awt.image.BaseMultiResolutionImage;
  import java.awt.image.BufferedImage;
  import javax.swing.JApplet;
! import jdk.testlibrary.OSInfo;
  
  /**
   * @test
   * @bug 8028212
   * @summary [macosx] Custom Cursor HiDPI support
   * @author Alexander Scherbatiy
!  * @library ../../../../lib/testlibrary
   * @modules java.desktop/sun.awt.image
!  * @build jdk.testlibrary.OSInfo
   * @run applet/manual=yesno MultiResolutionCursorTest.html
   */
  public class MultiResolutionCursorTest extends JApplet {
      //Declare things used in the test, like buttons and labels here
  
--- 32,52 ----
  import java.awt.TextArea;
  import java.awt.Toolkit;
  import java.awt.image.BaseMultiResolutionImage;
  import java.awt.image.BufferedImage;
  import javax.swing.JApplet;
! 
! import jdk.test.lib.Platform;
  
  /**
   * @test
   * @bug 8028212
   * @summary [macosx] Custom Cursor HiDPI support
   * @author Alexander Scherbatiy
!  * @library /test/lib
   * @modules java.desktop/sun.awt.image
!  * @build jdk.test.lib.Platform
   * @run applet/manual=yesno MultiResolutionCursorTest.html
   */
  public class MultiResolutionCursorTest extends JApplet {
      //Declare things used in the test, like buttons and labels here
  
*** 56,66 ****
          //Create instructions for the user here, as well as set up
          // the environment -- set the layout manager, add buttons,
          // etc.
          this.setLayout(new BorderLayout());
  
!         if (OSInfo.getOSType().equals(OSInfo.OSType.MACOSX)) {
              String[] instructions = {
                  "Verify that high resolution custom cursor is used"
                  + " on HiDPI displays.",
                  "1) Run the test on Retina display or enable the Quartz Debug"
                  + " and select the screen resolution with (HiDPI) label",
--- 57,67 ----
          //Create instructions for the user here, as well as set up
          // the environment -- set the layout manager, add buttons,
          // etc.
          this.setLayout(new BorderLayout());
  
!         if (Platform.isOSX()) {
              String[] instructions = {
                  "Verify that high resolution custom cursor is used"
                  + " on HiDPI displays.",
                  "1) Run the test on Retina display or enable the Quartz Debug"
                  + " and select the screen resolution with (HiDPI) label",