test/jdk/javax/swing/JOptionPane/8024926/bug8024926.java

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

*** 25,43 ****
  import java.awt.EventQueue;
  import java.awt.Frame;
  import java.awt.TextArea;
  import javax.swing.JApplet;
  import javax.swing.JOptionPane;
! import jdk.testlibrary.OSInfo;
  
  /**
   * @test
   * @bug 8024926 8040279
   * @summary [macosx] AquaIcon HiDPI support
   * @author Alexander Scherbatiy
!  * @library ../../../../lib/testlibrary
!  * @build jdk.testlibrary.OSInfo
   * @run applet/manual=yesno bug8024926.html
   */
  public class bug8024926 extends JApplet {
      //Declare things used in the test, like buttons and labels here
  
--- 25,44 ----
  import java.awt.EventQueue;
  import java.awt.Frame;
  import java.awt.TextArea;
  import javax.swing.JApplet;
  import javax.swing.JOptionPane;
! 
! import jdk.test.lib.Platform;
  
  /**
   * @test
   * @bug 8024926 8040279
   * @summary [macosx] AquaIcon HiDPI support
   * @author Alexander Scherbatiy
!  * @library /test/lib
!  * @build jdk.test.lib.Platform
   * @run applet/manual=yesno bug8024926.html
   */
  public class bug8024926 extends JApplet {
      //Declare things used in the test, like buttons and labels here
  
*** 46,56 ****
          // 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 system icons are used"
                  + " in JOptionPane on HiDPI displays.",
                  "1) Run the test on Retina display or enable the Quartz Debug"
                  + " and select the screen resolution with (HiDPI) label",
--- 47,57 ----
          // the environment -- set the layout manager, add buttons,
          // etc.
          this.setLayout(new BorderLayout());
  
  
!         if (Platform.isOSX()) {
              String[] instructions = {
                  "Verify that high resolution system icons are used"
                  + " in JOptionPane on HiDPI displays.",
                  "1) Run the test on Retina display or enable the Quartz Debug"
                  + " and select the screen resolution with (HiDPI) label",