# HG changeset patch # User goetz # Date 1550060837 -3600 # Node ID c13bb5bceaaf6c20e49a4b9d5c17f3d0bb422946 # Parent 0eca4e6a00377088f43bc58ece3019b6285f844d 8219095: [testbug] Add @key headful to com/sun/java/swing/plaf/windows/AltFocusIssueTest.java diff --git a/test/jdk/com/sun/java/swing/plaf/windows/AltFocusIssueTest.java b/test/jdk/com/sun/java/swing/plaf/windows/AltFocusIssueTest.java --- a/test/jdk/com/sun/java/swing/plaf/windows/AltFocusIssueTest.java +++ b/test/jdk/com/sun/java/swing/plaf/windows/AltFocusIssueTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, 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,13 +21,15 @@ * questions. */ -/* @test - @bug 8211987 - @requires (os.family == "windows") - @summary Verify if Menu bar gets input focus even if Alt-released event is consumed. - @modules java.desktop/com.sun.java.swing.plaf.windows - @run main AltFocusIssueTest -*/ +/** + * @test + * @bug 8211987 + * @key headful + * @requires (os.family == "windows") + * @summary Verify if Menu bar gets input focus even if Alt-released event is consumed. + * @modules java.desktop/com.sun.java.swing.plaf.windows + * @run main AltFocusIssueTest + */ import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; @@ -145,7 +147,9 @@ try { testAltEvents(); } finally { - SwingUtilities.invokeAndWait(() -> frame.dispose()); + if (frame != null) { + SwingUtilities.invokeAndWait(() -> frame.dispose()); + } } } }