From dc239793208e7462fd6c3545db013eff962836e5 Mon Sep 17 00:00:00 2001 From: Shashidhara Veerabhadraiah Date: Fri, 22 Jun 2018 10:29:14 +0530 Subject: [PATCH] 8204946: Clean-up problem list for JDK-8202933 and JDK-8202934 Reviewed-by: prr --- test/jdk/ProblemList.txt | 2 - .../grab/MenuDragEvents/MenuDragEvents.html | 45 ------------------ .../grab/MenuDragEvents/MenuDragEvents.java | 46 +++++++------------ 3 files changed, 17 insertions(+), 76 deletions(-) delete mode 100644 test/jdk/java/awt/grab/MenuDragEvents/MenuDragEvents.html diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt index 31de1ffadce..47fc4e2c4a6 100644 --- a/test/jdk/ProblemList.txt +++ b/test/jdk/ProblemList.txt @@ -485,8 +485,6 @@ java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java 8202931 macosx-all, java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.html 7124275 macosx-all java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java 6848810 macosx-all java/awt/Component/NativeInLightShow/NativeInLightShow.java 8202932 linux-all -java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java 8202933 linux-all -java/awt/grab/MenuDragEvents/MenuDragEvents.html 8202934 linux-all java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java 8194751 linux-all java/awt/image/VolatileImage/BitmaskVolatileImage.java 8133102 linux-all java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java 8203004 linux-all diff --git a/test/jdk/java/awt/grab/MenuDragEvents/MenuDragEvents.html b/test/jdk/java/awt/grab/MenuDragEvents/MenuDragEvents.html deleted file mode 100644 index e6a13935a5e..00000000000 --- a/test/jdk/java/awt/grab/MenuDragEvents/MenuDragEvents.html +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - -

MenuDragEvents
Bug ID: 6390326

- -

This is an AUTOMATIC test, simply wait for completion

- - - - - diff --git a/test/jdk/java/awt/grab/MenuDragEvents/MenuDragEvents.java b/test/jdk/java/awt/grab/MenuDragEvents/MenuDragEvents.java index f1c97318aeb..8c645e93691 100644 --- a/test/jdk/java/awt/grab/MenuDragEvents/MenuDragEvents.java +++ b/test/jdk/java/awt/grab/MenuDragEvents/MenuDragEvents.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,20 +21,13 @@ * questions. */ /* - test - @bug 6390326 + @test + @bug 6390326 8204946 + @key headful @summary REGRESSION: Broken mouse behaviour of menus partially outside the main window. - @author oleg.sukhodolsky: area=awt-drab - @run applet AutomaticAppletTest.html + @run main MenuDragEvents */ -/** - * MenuDragEvents.java - * - * summary: REGRESSION: Broken mouse behaviour of menus partially outside the main window. - */ - -import java.applet.Applet; import java.awt.AWTEvent; import java.awt.AWTException; import java.awt.BorderLayout; @@ -58,7 +51,7 @@ import javax.swing.WindowConstants; import javax.swing.event.MenuDragMouseEvent; import javax.swing.event.MenuDragMouseListener; -public class MenuDragEvents extends Applet +public class MenuDragEvents { //Declare things used in the test, like buttons and labels here boolean mouseDragged = false; @@ -66,22 +59,13 @@ public class MenuDragEvents extends Applet boolean mouseReleased = false; boolean actionReceived = false; - public void init() + public static void main(String[] args) { + MenuDragEvents test = new MenuDragEvents(); + test.doTest(); + } + + public void doTest () { - // Set up the environment -- set the layout manager, add - // buttons, etc. - - setLayout (new BorderLayout ()); - - }//End init() - - public void start () - { - //Get things going. Request focus, set size, et cetera - setSize (200,200); - setVisible(true); - validate(); - Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener() { public void eventDispatched(AWTEvent event) { int id = event.getID(); @@ -130,6 +114,7 @@ public class MenuDragEvents extends Applet }); JFrame frame = new JFrame("Menu"); + frame.setLayout (new BorderLayout ()); frame.setJMenuBar(mb); frame.setSize(200, 200); frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); @@ -172,7 +157,10 @@ public class MenuDragEvents extends Applet } System.out.println("Test passed"); - }// start() + + // dispose off the frame + frame.dispose(); + }// doTest() void dragMouse(Robot r, Point from, Point to) { final int n_step = 10;