test/jdk/java/awt/Menu/OpensWithNoGrab/OpensWithNoGrab.java

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

*** 26,55 ****
    @key headful
    @bug 6354721
    @summary REG: Menu does not disappear when clicked, keeping Choice's drop-down open, XToolkit
    @author andrei.dmitriev: area=awt.menu
    @library ../../regtesthelpers
!   @library ../../../../lib/testlibrary
    @modules java.desktop/sun.awt
!   @build jdk.testlibrary.OSInfo
    @build Util
    @run main OpensWithNoGrab
  */
  
  import java.awt.*;
  import java.awt.event.*;
  
! import jdk.testlibrary.OSInfo;
  import test.java.awt.regtesthelpers.Util;
  
  public class OpensWithNoGrab
  {
      final static int delay = 50;
      private static void init()
      {
!         if (!(OSInfo.getOSType().equals(OSInfo.OSType.LINUX)
!                 || OSInfo.getOSType().equals(OSInfo.OSType.SOLARIS))) {
              System.out.println("This test is for XAWT/Motif only");
              OpensWithNoGrab.pass();
          }
  
          Choice ch = new Choice ();
--- 26,54 ----
    @key headful
    @bug 6354721
    @summary REG: Menu does not disappear when clicked, keeping Choice's drop-down open, XToolkit
    @author andrei.dmitriev: area=awt.menu
    @library ../../regtesthelpers
!   @library /test/lib
    @modules java.desktop/sun.awt
!   @build jdk.test.lib.Platform
    @build Util
    @run main OpensWithNoGrab
  */
  
  import java.awt.*;
  import java.awt.event.*;
  
! import jdk.test.lib.Platform;
  import test.java.awt.regtesthelpers.Util;
  
  public class OpensWithNoGrab
  {
      final static int delay = 50;
      private static void init()
      {
!         if (!(Platform.isLinux() || Platform.isSolaris())) {
              System.out.println("This test is for XAWT/Motif only");
              OpensWithNoGrab.pass();
          }
  
          Choice ch = new Choice ();