From 7550870b737effe330ec7ec47db027e198e7d4e5 Mon Sep 17 00:00:00 2001
From: sunyaqi <sunyaqi@loongson.cn>
Date: Thu, 29 Feb 2024 20:23:27 +0800
Subject: [PATCH 01/15] Backport 34afeced211cd7115e2529b043c1e57dfa1291fe

---
 jdk/test/TEST.ROOT                            |  6 +++--
 .../DefaultMenuBar/DefaultMenuBarTest.java    |  5 ++--
 .../ScreenMenu/ScreenMenuMemoryLeakTest.java  |  9 ++++---
 .../DesktopGtkLoadTest.java                   |  4 ++-
 .../Dialog/CloseDialog/CloseDialogTest.java   |  3 ++-
 .../DisplayChangedTest.java                   | 27 +++++++++----------
 .../EmbeddedFrameGrabTest.java                | 24 ++++++++---------
 .../LoopRobustness/LoopRobustness.html        |  3 ++-
 .../awt/EventQueue/6980209/bug6980209.java    | 14 +++++-----
 .../FocusEmbeddedFrameTest.java               | 24 ++++++++++-------
 .../java/awt/FontClass/HelvLtOblTest.java     |  5 ++--
 .../FontClass/SurrogateTest/SuppCharTest.java |  5 ++--
 .../ExceptionOnSetExtendedStateTest.java      | 16 ++++++-----
 .../MaximizedByPlatform.java                  | 10 ++++---
 .../NormalToIconifiedTest.java                |  3 ++-
 .../SetMaximizedBounds.java                   |  5 ++--
 .../Frame/WindowDragTest/WindowDragTest.java  | 21 ++++++++-------
 .../DefaultPolicyChange_Swing.java            | 19 +++++++------
 .../java/awt/MenuBar/8007006/bug8007006.java  |  5 ++--
 .../FullscreenEnterEventTest.java             |  6 +++--
 .../FullScreenAfterSplash.java                |  4 ++-
 .../IOExceptionIfEncodedURLTest.java          | 21 ++++++++-------
 .../IOExceptionIfEncodedURLTest.sh            |  1 +
 .../MultiResolutionDragImageTest.java         |  3 ++-
 .../HTMLDataFlavors/HTMLDataFlavorTest.java   | 24 ++++++++++-------
 .../event/KeyEvent/8020209/bug8020209.java    |  5 ++--
 .../DeadKey/DeadKeyMacOSXInputText.java       |  6 +++--
 .../event/KeyEvent/DeadKey/deadKeyMacOSX.java |  5 ++--
 .../awt/font/TextLayout/TestSinhalaChar.java  |  4 ++-
 .../java/awt/im/6396526/IMLookAndFeel.java    | 11 ++++----
 jdk/test/java/awt/im/8041990/bug8041990.java  | 17 +++++++-----
 .../awt/image/MultiResolutionImageTest.java   |  4 ++-
 .../MultiResolutionToolkitImageTest.java      |  4 ++-
 .../AltPlusNumberKeyCombinationsTest.java     | 19 +++++++------
 .../awt/print/PrinterJob/CheckPrivilege.java  |  3 ++-
 .../awt/print/PrinterJob/ExceptionTest.java   |  1 +
 .../ImagePrinting/NullClipARGB.java           |  3 ++-
 .../java/awt/print/PrinterJob/Margins.java    |  3 ++-
 .../java/awt/print/PrinterJob/PaintText.java  |  3 ++-
 .../awt/print/PrinterJob/PrintCrashTest.java  |  4 +--
 .../awt/print/PrinterJob/PrintTextPane.java   | 15 ++++++-----
 .../awt/print/PrinterJob/PrtException.java    | 16 ++++++-----
 jdk/test/javax/print/CheckDupFlavor.java      |  6 +++--
 jdk/test/javax/print/PrintSE/PrintSE.sh       |  7 +++--
 .../javax/print/attribute/AttributeTest.java  |  6 +++--
 .../print/attribute/GetCopiesSupported.java   | 16 ++++++-----
 .../print/attribute/SidesPageRangesTest.java  |  9 ++++---
 .../attribute/SupportedPrintableAreas.java    |  5 ++--
 .../swing/JComboBox/8019180/Test8019180.java  |  5 ++--
 .../swing/JComponent/4337267/bug4337267.java  |  5 ++--
 .../swing/JComponent/8043610/bug8043610.java  | 19 +++++++------
 .../swing/JDialog/6639507/bug6639507.java     | 15 ++++++-----
 .../JFileChooser/6713352/bug6713352.java      | 17 +++++++-----
 .../JFileChooser/6817933/Test6817933.java     |  6 +++--
 .../JFileChooser/8013442/Test8013442.java     |  5 ++--
 .../swing/JFrame/8016356/bug8016356.java      | 19 ++++++++-----
 .../NSTexturedJFrame/NSTexturedJFrame.java    |  4 ++-
 .../swing/JInternalFrame/Test6325652.java     |  5 ++--
 .../javax/swing/JMenu/6538132/bug6538132.java | 22 ++++++++-------
 .../JMenuItem/8152981/MenuItemIconTest.java   |  6 +++--
 .../ActionListenerCalledTwiceTest.java        |  3 ++-
 .../swing/JPopupMenu/6217905/bug6217905.java  | 23 +++++++++-------
 .../swing/JPopupMenu/7154841/bug7154841.java  | 17 ++++++------
 .../swing/JTabbedPane/7170310/bug7170310.java |  6 +++--
 .../swing/JTextArea/6940863/bug6940863.java   |  7 +++--
 .../swing/Security/6938813/bug6938813.java    |  3 ++-
 .../ToolTipManager/7123767/bug7123767.java    |  1 +
 .../plaf/aqua/CustomComboBoxFocusTest.java    | 20 +++++++-------
 .../BasicComboPopup/8154069/Bug8154069.java   |  5 ++--
 .../basic/BasicHTML/4960629/bug4960629.java   | 18 +++++++------
 .../plaf/basic/BasicLabelUI/bug7172652.java   | 21 ++++++++-------
 .../8041642/ScrollBarThumbVisibleTest.java    | 16 ++++++-----
 .../WrongAltProcessing.java                   | 15 ++++++-----
 .../swing/system/6799345/TestShutdown.java    | 19 +++++++------
 .../javax/swing/text/FlowView/LayoutTest.java | 18 +++++++------
 .../swing/text/View/8015853/bug8015853.java   |  5 ++--
 .../javax/swing/text/html/Test4783068.java    | 12 +++++----
 .../IAEforEmptyFrameTest.java                 |  6 +++--
 78 files changed, 458 insertions(+), 324 deletions(-)

diff --git a/jdk/test/TEST.ROOT b/jdk/test/TEST.ROOT
index b2d2ba1bcc3..9cb3da188f2 100644
--- a/jdk/test/TEST.ROOT
+++ b/jdk/test/TEST.ROOT
@@ -10,9 +10,11 @@
 # randomness tests.
 #
 # A "headful" test requires a graphical environment to meaningfully
-# run. Tests that are not headful are "headless."
+# run. Tests that are not headful are "headless".
+# A test flagged with key "printer" requires a printer to succeed, else
+# throws a PrinterException or the like.
 
-keys=2d dnd i18n intermittent randomness headful jfr
+keys=2d dnd headful i18n intermittent printer randomness
 
 # Tests that must run in othervm mode
 othervm.dirs=java/awt java/beans java/rmi javax/accessibility javax/imageio javax/sound javax/print javax/management com/sun/awt sun/awt sun/java2d sun/pisces sun/rmi
diff --git a/jdk/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java b/jdk/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java
index 0ca31c4f6b7..943b494a3b3 100644
--- a/jdk/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java
+++ b/jdk/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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,8 +21,9 @@
  * questions.
  */
 
-/*
+/**
  * @test
+ * @key headful
  * @bug 8007267
  * @summary [macosx] com.apple.eawt.Application.setDefaultMenuBar is not working
  * @requires (os.family == "mac")
diff --git a/jdk/test/com/apple/laf/ScreenMenu/ScreenMenuMemoryLeakTest.java b/jdk/test/com/apple/laf/ScreenMenu/ScreenMenuMemoryLeakTest.java
index 8aabcae42c7..9971967bbb6 100644
--- a/jdk/test/com/apple/laf/ScreenMenu/ScreenMenuMemoryLeakTest.java
+++ b/jdk/test/com/apple/laf/ScreenMenu/ScreenMenuMemoryLeakTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
@@ -20,13 +20,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/*
+
+/**
  * @test
+ * @key headful
  * @bug 8158325
  * @summary Memory leak in com.apple.laf.ScreenMenu: removed JMenuItems are still referenced
  * @requires (os.family == "mac")
  * @run main/timeout=300/othervm -Xmx16m ScreenMenuMemoryLeakTest
  */
+
 import java.awt.EventQueue;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.InvocationTargetException;
@@ -102,4 +105,4 @@ private static void removeMenuItemFromMenu() {
         Objects.requireNonNull(menuItem, "The menu item should still be available at this point");
         sMenu.remove(menuItem);
     }
-}
\ No newline at end of file
+}
diff --git a/jdk/test/java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java b/jdk/test/java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java
index 8a463554ad2..61bd013b9d3 100644
--- a/jdk/test/java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java
+++ b/jdk/test/java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/**
+ * @test
+ * @key headful
  * @bug 8157827
  * @summary AWT_Desktop/Automated/Exceptions/BasicTest loads incorrect GTK
  * version when jdk.gtk.version=3
diff --git a/jdk/test/java/awt/Dialog/CloseDialog/CloseDialogTest.java b/jdk/test/java/awt/Dialog/CloseDialog/CloseDialogTest.java
index 0a6288d896d..694d6e3fbd7 100644
--- a/jdk/test/java/awt/Dialog/CloseDialog/CloseDialogTest.java
+++ b/jdk/test/java/awt/Dialog/CloseDialog/CloseDialogTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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
@@ -30,6 +30,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8043705
  * @summary Can't exit color chooser dialog when running as an applet
  * @run main CloseDialogTest
diff --git a/jdk/test/java/awt/EmbeddedFrame/DisplayChangedTest/DisplayChangedTest.java b/jdk/test/java/awt/EmbeddedFrame/DisplayChangedTest/DisplayChangedTest.java
index 04f2f24b414..44c3409e7db 100644
--- a/jdk/test/java/awt/EmbeddedFrame/DisplayChangedTest/DisplayChangedTest.java
+++ b/jdk/test/java/awt/EmbeddedFrame/DisplayChangedTest/DisplayChangedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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,21 +21,20 @@
  * questions.
  */
 
-/*
- @test
- @bug 4980592
- @summary   switching user in XP causes an NPE in
-            sun.awt.windows.WWindowPeer.displayChanged
- @requires (os.family == "windows")
- @author son@sparc.spb.su: area=embedded
- @run main DisplayChangedTest
- */
 /**
- * DisplayChangedTest.java
- *
- * summary: switching user in XP causes an NPE in
- * sun.awt.windows.WWindowPeer.displayChanged
+ * @test
+ * @key headful
+ * @bug 4980592 8171363
+ * @summary   switching user in XP causes an NPE in
+ *            sun.awt.windows.WWindowPeer.displayChanged
+ * @requires (os.family == "windows")
+ * @modules java.desktop/java.awt.peer
+ * @modules java.desktop/sun.awt.windows:open
+ * @modules java.desktop/sun.awt
+ * @author son@sparc.spb.su: area=embedded
+ * @run main DisplayChangedTest
  */
+
 import java.awt.Frame;
 import java.awt.Dialog;
 import java.awt.TextArea;
diff --git a/jdk/test/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java b/jdk/test/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java
index 1613a804263..e708c945c20 100644
--- a/jdk/test/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java
+++ b/jdk/test/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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,19 +21,19 @@
  * questions.
  */
 
-/*
- @test
- @bug 6345002
- @summary grab problems with EmbeddedFrame
- @requires (os.family == "windows")
- @author Oleg.Semenov@sun.com area=EmbeddedFrame
- @run main EmbeddedFrameGrabTest
- */
 /**
- * EmbeddedFrameGrabTest.java
- *
- * summary: grab problems with EmbeddedFrame
+ * @test
+ * @key headful
+ * @bug 6345003 8171363
+ * @summary grab problems with EmbeddedFrame
+ * @requires (os.family == "windows")
+ * @modules java.desktop/java.awt.peer
+ * @modules java.desktop/sun.awt
+ * @modules java.desktop/sun.awt.windows:open
+ * @author Oleg.Semenov@sun.com area=EmbeddedFrame
+ * @run main EmbeddedFrameGrabTest
  */
+
 import java.awt.Frame;
 import java.awt.peer.FramePeer;
 import javax.swing.JComboBox;
diff --git a/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html b/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html
index 3e8611d2e02..31e7015c17a 100644
--- a/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html
+++ b/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html
@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 2017, 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
@@ -23,6 +23,7 @@
 
 <HTML>
   <!--  @test
+        @key headful
         @bug 4023283
         @summary Checks that an Error which propogate up to the EventDispatch
         loop does not crash AWT.
diff --git a/jdk/test/java/awt/EventQueue/6980209/bug6980209.java b/jdk/test/java/awt/EventQueue/6980209/bug6980209.java
index 0f1080cba02..5e058ee4604 100644
--- a/jdk/test/java/awt/EventQueue/6980209/bug6980209.java
+++ b/jdk/test/java/awt/EventQueue/6980209/bug6980209.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, 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,11 +21,13 @@
  * questions.
  */
 
-/* @test
-   @bug 6980209
-   @summary Make tracking SecondaryLoop.enter/exit methods easier
-   @author Semyon Sadetsky
-  */
+/**
+ * @test
+ * @key headful
+ * @bug 6980209
+ * @summary Make tracking SecondaryLoop.enter/exit methods easier
+ * @author Semyon Sadetsky
+ */
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/jdk/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java b/jdk/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java
index 999d9ac3320..34d7e9525de 100644
--- a/jdk/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java
+++ b/jdk/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java
@@ -21,15 +21,21 @@
  * questions.
  */
 
-/*
-  @test
-  @bug       6516675
-  @summary   Tests that EmbeddedFrame can be focused.
-  @author    anton.tarasov: area=awt-focus
-  @library   ../../regtesthelpers
-  @build     Util UtilInternal
-  @run       main FocusEmbeddedFrameTest
-*/
+/**
+ * @test
+ * @key       headful
+ * @bug       6516675
+ * @summary   Tests that EmbeddedFrame can be focused.
+ * @author    anton.tarasov: area=awt-focus
+ * @requires (os.family == "windows")
+ * @modules   java.desktop/java.awt.peer
+ *            java.desktop/sun.awt
+ *            java.desktop/sun.awt.windows
+ * @library /java/awt/patchlib    ../../regtesthelpers
+ * @build java.desktop/java.awt.Helper
+ * @build     Util UtilInternal
+ * @run       main FocusEmbeddedFrameTest
+ */
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/jdk/test/java/awt/FontClass/HelvLtOblTest.java b/jdk/test/java/awt/FontClass/HelvLtOblTest.java
index 80f976a76f4..f57d3f0eacc 100644
--- a/jdk/test/java/awt/FontClass/HelvLtOblTest.java
+++ b/jdk/test/java/awt/FontClass/HelvLtOblTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, 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,8 +21,9 @@
  * questions.
  */
 
-/*
+/**
  * @test
+ * @key headful
  * @bug 8064833
  * @summary Test correct font is obtained via family+style
  * @run main HelvLtOblTest
diff --git a/jdk/test/java/awt/FontClass/SurrogateTest/SuppCharTest.java b/jdk/test/java/awt/FontClass/SurrogateTest/SuppCharTest.java
index 1011b741bba..98b02cd4192 100644
--- a/jdk/test/java/awt/FontClass/SurrogateTest/SuppCharTest.java
+++ b/jdk/test/java/awt/FontClass/SurrogateTest/SuppCharTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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,8 +21,9 @@
  * questions.
  */
 
-/*
+/**
  * @test
+ * @key headful
  * @bug 8015556
  * @summary Surrogate pairs do not render properly on MacOS X.
  */
diff --git a/jdk/test/java/awt/Frame/ExceptionOnSetExtendedStateTest/ExceptionOnSetExtendedStateTest.java b/jdk/test/java/awt/Frame/ExceptionOnSetExtendedStateTest/ExceptionOnSetExtendedStateTest.java
index 845138ab3bb..8d73915a8de 100644
--- a/jdk/test/java/awt/Frame/ExceptionOnSetExtendedStateTest/ExceptionOnSetExtendedStateTest.java
+++ b/jdk/test/java/awt/Frame/ExceptionOnSetExtendedStateTest/ExceptionOnSetExtendedStateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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,12 +21,14 @@
  * questions.
  */
 
-/* @test
-   @bug 8032078
-   @summary Frame.setExtendedState throws RuntimeException, if
-            windowState=ICONIFIED|MAXIMIZED_BOTH, on OS X
-   @author Anton Litvinov
-*/
+/**
+ * @test
+ * @key headful
+ * @bug 8032078
+ * @summary Frame.setExtendedState throws RuntimeException, if
+ *          windowState=ICONIFIED|MAXIMIZED_BOTH, on OS X
+ * @author Anton Litvinov
+ */
 
 import java.awt.*;
 
diff --git a/jdk/test/java/awt/Frame/MaximizedByPlatform/MaximizedByPlatform.java b/jdk/test/java/awt/Frame/MaximizedByPlatform/MaximizedByPlatform.java
index 224c10e7996..4554c618693 100644
--- a/jdk/test/java/awt/Frame/MaximizedByPlatform/MaximizedByPlatform.java
+++ b/jdk/test/java/awt/Frame/MaximizedByPlatform/MaximizedByPlatform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/**
+ * @test
+ * @key headful
  * @bug 8026143
  * @summary [macosx] Maximized state could be inconsistent between peer and frame
  * @author Petr Pchelko
@@ -70,7 +72,7 @@ public static void main(String[] args) {
                 throw new RuntimeException("Maximized state was not set for frame in setBounds");
             }
         } finally {
-            frame.dispose();
+            if (frame != null) frame.dispose();
         }
 
 
@@ -87,7 +89,7 @@ public static void main(String[] args) {
                 throw new RuntimeException("Maximized state was not set for frame in setVisible");
             }
         } finally {
-            frame.dispose();
+            if (frame != null) frame.dispose();
         }
     }
 
diff --git a/jdk/test/java/awt/Frame/NormalToIconified/NormalToIconifiedTest.java b/jdk/test/java/awt/Frame/NormalToIconified/NormalToIconifiedTest.java
index 31e85c2b58a..ef926c8fce2 100644
--- a/jdk/test/java/awt/Frame/NormalToIconified/NormalToIconifiedTest.java
+++ b/jdk/test/java/awt/Frame/NormalToIconified/NormalToIconifiedTest.java
@@ -21,8 +21,9 @@
  * questions.
  */
 
-/*
+/**
  * @test
+ * @key headful
  * @bug 8171949 8214046
  * @summary Tests that bitwise mask is set and state listener is notified during state transition.
  * @author Dmitry Markov
diff --git a/jdk/test/java/awt/Frame/SetMaximizedBounds/SetMaximizedBounds.java b/jdk/test/java/awt/Frame/SetMaximizedBounds/SetMaximizedBounds.java
index da5b3800eae..83473957692 100644
--- a/jdk/test/java/awt/Frame/SetMaximizedBounds/SetMaximizedBounds.java
+++ b/jdk/test/java/awt/Frame/SetMaximizedBounds/SetMaximizedBounds.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, 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
@@ -23,8 +23,9 @@
 
 import java.awt.*;
 
-/*
+/**
  * @test
+ * @key headful
  * @summary When Frame.setExtendedState(Frame.MAXIMIZED_BOTH)
  *          is called for a Frame after been called setMaximizedBounds() with
  *          certain value, Frame bounds must equal to this value.
diff --git a/jdk/test/java/awt/Frame/WindowDragTest/WindowDragTest.java b/jdk/test/java/awt/Frame/WindowDragTest/WindowDragTest.java
index e7b0970b0fc..ee21c1e169d 100644
--- a/jdk/test/java/awt/Frame/WindowDragTest/WindowDragTest.java
+++ b/jdk/test/java/awt/Frame/WindowDragTest/WindowDragTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, 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,15 +21,16 @@
  * questions.
  */
 
-/*
-  @test
-  @bug 7128738 7161759
-  @summary dragged dialog freezes system on dispose
-  @author Oleg Pekhovskiy: area=awt.toplevel
-  @library ../../regtesthelpers
-  @build Util
-  @run main WindowDragTest
-*/
+/**
+ * @test
+ * @key headful
+ * @bug 7128738 7161759
+ * @summary dragged dialog freezes system on dispose
+ * @author Oleg Pekhovskiy: area=awt.toplevel
+ * @library ../../regtesthelpers
+ * @build Util
+ * @run main WindowDragTest
+ */
 
 import java.awt.Frame;
 import java.awt.event.InputEvent;
diff --git a/jdk/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java b/jdk/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java
index 93f481ff020..b8dd218549f 100644
--- a/jdk/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java
+++ b/jdk/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, 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,15 +21,14 @@
  * questions.
  */
 
-/*
-  @test
-  @bug 6741526
-  @summary KeyboardFocusManager.setDefaultFocusTraversalPolicy(FocusTraversalPolicy) affects created components
-  @library ../../regtesthelpers
-  @build Sysout
-  @author Andrei Dmitriev : area=awt-focus
-  @run main DefaultPolicyChange_Swing
-*/
+/**
+ * @test
+ * @key headful
+ * @bug 6741526 8004693
+ * @summary KeyboardFocusManager.setDefaultFocusTraversalPolicy(FocusTraversalPolicy) affects created components
+ * @author Andrei Dmitriev : area=awt-focus
+ * @run main DefaultPolicyChange_Swing
+ */
 
 import java.awt.*;
 import javax.swing.*;
diff --git a/jdk/test/java/awt/MenuBar/8007006/bug8007006.java b/jdk/test/java/awt/MenuBar/8007006/bug8007006.java
index c443336195b..89658945665 100644
--- a/jdk/test/java/awt/MenuBar/8007006/bug8007006.java
+++ b/jdk/test/java/awt/MenuBar/8007006/bug8007006.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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,8 +21,9 @@
  * questions.
  */
 
-/*
+/**
  * @test
+ * @key headful
  * @bug 8007006
  * @summary [macosx] Closing subwindow loses main window menus.
  * @author Leonid Romanov
diff --git a/jdk/test/java/awt/Mouse/EnterExitEvents/FullscreenEnterEventTest.java b/jdk/test/java/awt/Mouse/EnterExitEvents/FullscreenEnterEventTest.java
index af5fa047699..6d2b1693433 100644
--- a/jdk/test/java/awt/Mouse/EnterExitEvents/FullscreenEnterEventTest.java
+++ b/jdk/test/java/awt/Mouse/EnterExitEvents/FullscreenEnterEventTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2017, 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
@@ -33,8 +33,9 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
-/*
+/**
  * @test
+ * @key headful
  * @bug 8013468
  * @summary Cursor does not update properly when in fullscreen mode on Mac
  *    The core reason of the issue was the lack of a mouse entered event in fullscreen
@@ -44,6 +45,7 @@
  * @author Petr Pchelko area=awt.event
  * @run main FullscreenEnterEventTest
  */
+
 public class FullscreenEnterEventTest {
 
     private static String OS = System.getProperty("os.name").toLowerCase();
diff --git a/jdk/test/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java b/jdk/test/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java
index 15acb699136..32e4be6e674 100644
--- a/jdk/test/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java
+++ b/jdk/test/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java
@@ -35,8 +35,9 @@
 import javax.swing.SwingUtilities;
 import javax.swing.WindowConstants;
 
-/*
+/**
  * @test
+ * @key headful
  * @bug 8024185
  * @summary Native Mac OS X full screen does not work after showing the splash
  * @requires (os.family == "mac")
@@ -46,6 +47,7 @@
  * @author Petr Pchelko area=awt.event
  * @run main/othervm -splash:test.png FullScreenAfterSplash
  */
+
 public class FullScreenAfterSplash {
 
     private static JFrame frame;
diff --git a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
index 83d5bc098ee..0db61d6db50 100644
--- a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
+++ b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, 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,15 +21,16 @@
  * questions.
  */
 
-/*
-  test
-  @bug 6193279
-  @summary REGRESSION: AppletViewer throws IOException when path is encoded URL
-  @author Dmitry Cherepanov: area=appletviewer
-  @run compile IOExceptionIfEncodedURLTest.java
-  @run main IOExceptionIfEncodedURLTest
-  @run shell IOExceptionIfEncodedURLTest.sh
-*/
+/**
+ * @test
+ * @key headful
+ * @bug 6193279
+ * @summary REGRESSION: AppletViewer throws IOException when path is encoded URL
+ * @author Dmitry Cherepanov: area=appletviewer
+ * @run compile IOExceptionIfEncodedURLTest.java
+ * @run main IOExceptionIfEncodedURLTest
+ * @run shell IOExceptionIfEncodedURLTest.sh
+ */
 
 import java.applet.Applet;
 import sun.net.www.ParseUtil;
diff --git a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
index c6ce7064ae7..3f8877c36af 100644
--- a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
+++ b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
@@ -24,6 +24,7 @@
 #!/bin/ksh -p
 #
 #   @test    IOExceptionIfEncodedURLTest.sh
+#   @key     headful
 #   @bug     6193279 6619458 8137087
 #   @summary REGRESSION: AppletViewer throws IOException when path is encoded URL
 #   @author  Dmitry Cherepanov: area=appletviewer
diff --git a/jdk/test/java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java b/jdk/test/java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java
index d47a7b0293d..aa49f4fcbdf 100644
--- a/jdk/test/java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java
+++ b/jdk/test/java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, 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
@@ -32,6 +32,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8076106
  * @author Hendrik Schreiber
  * @summary [macosx] Drag image of TransferHandler does not honor
diff --git a/jdk/test/java/awt/datatransfer/HTMLDataFlavors/HTMLDataFlavorTest.java b/jdk/test/java/awt/datatransfer/HTMLDataFlavors/HTMLDataFlavorTest.java
index 1fe616abbc5..65c185d782a 100644
--- a/jdk/test/java/awt/datatransfer/HTMLDataFlavors/HTMLDataFlavorTest.java
+++ b/jdk/test/java/awt/datatransfer/HTMLDataFlavors/HTMLDataFlavorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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,15 +21,19 @@
  * questions.
  */
 
-/*
-  @test
-  @bug 7075105
-  @summary WIN: Provide a way to format HTML on drop
-  @author Denis Fokin: area=datatransfer
-  @build HtmlTransferable PutAllHtmlFlavorsOnClipboard
-  @build PutOnlyAllHtmlFlavorOnClipboard PutSelectionAndFragmentHtmlFlavorsOnClipboard
-  @run main HTMLDataFlavorTest
-*/
+/**
+ * @test
+ * @key headful
+ * @bug 7075105
+ * @summary WIN: Provide a way to format HTML on drop
+ * @author Denis Fokin: area=datatransfer
+ * @requires (os.family == "windows")
+ * @library ../../../../lib/testlibrary
+ * @build HtmlTransferable PutAllHtmlFlavorsOnClipboard
+ * @build PutOnlyAllHtmlFlavorOnClipboard PutSelectionAndFragmentHtmlFlavorsOnClipboard
+ * @build jdk.testlibrary.OSInfo
+ * @run main HTMLDataFlavorTest
+ */
 
 import java.awt.*;
 import java.awt.datatransfer.*;
diff --git a/jdk/test/java/awt/event/KeyEvent/8020209/bug8020209.java b/jdk/test/java/awt/event/KeyEvent/8020209/bug8020209.java
index 21426bdf96b..bb3e68b9741 100644
--- a/jdk/test/java/awt/event/KeyEvent/8020209/bug8020209.java
+++ b/jdk/test/java/awt/event/KeyEvent/8020209/bug8020209.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, 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,8 +21,9 @@
  * questions.
  */
 
-/*
+/**
  * @test
+ * @key headful
  * @bug 8020209
  * @summary [macosx] Mac OS X key event confusion for "COMMAND PLUS"
  * @author leonid.romanov@oracle.com
diff --git a/jdk/test/java/awt/event/KeyEvent/DeadKey/DeadKeyMacOSXInputText.java b/jdk/test/java/awt/event/KeyEvent/DeadKey/DeadKeyMacOSXInputText.java
index 1a42a6e9199..a0f5c5a226d 100644
--- a/jdk/test/java/awt/event/KeyEvent/DeadKey/DeadKeyMacOSXInputText.java
+++ b/jdk/test/java/awt/event/KeyEvent/DeadKey/DeadKeyMacOSXInputText.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, 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,8 +21,9 @@
  * questions.
  */
 
-/*
+/**
  * @test
+ * @key headful
  * @bug 7199180
  * @summary [macosx] Dead keys handling for input methods
  * @author alexandr.scherbatiy area=awt.event
@@ -30,6 +31,7 @@
  * @build jdk.testlibrary.OSInfo
  * @run main DeadKeyMacOSXInputText
  */
+
 import java.awt.*;
 import java.awt.event.*;
 import java.awt.event.KeyEvent;
diff --git a/jdk/test/java/awt/event/KeyEvent/DeadKey/deadKeyMacOSX.java b/jdk/test/java/awt/event/KeyEvent/DeadKey/deadKeyMacOSX.java
index f5b9a96115c..c90a1131a0a 100644
--- a/jdk/test/java/awt/event/KeyEvent/DeadKey/deadKeyMacOSX.java
+++ b/jdk/test/java/awt/event/KeyEvent/DeadKey/deadKeyMacOSX.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, 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,8 +21,9 @@
  * questions.
  */
 
-/*
+/**
  * @test
+ * @key headful
  * @bug 7196547
  * @summary Dead Key implementation for KeyEvent on Mac OS X
  * @author alexandr.scherbatiy area=awt.event
diff --git a/jdk/test/java/awt/font/TextLayout/TestSinhalaChar.java b/jdk/test/java/awt/font/TextLayout/TestSinhalaChar.java
index d104b6a4c10..b73f68c5e2a 100644
--- a/jdk/test/java/awt/font/TextLayout/TestSinhalaChar.java
+++ b/jdk/test/java/awt/font/TextLayout/TestSinhalaChar.java
@@ -21,7 +21,9 @@
  *
  */
 
-/* @test
+/**
+ * @test @(#)TestSinhalaChar.java
+ * @key headful
  * @summary verify lack of crash on U+0DDD.
  * @bug 6795060
  */
diff --git a/jdk/test/java/awt/im/6396526/IMLookAndFeel.java b/jdk/test/java/awt/im/6396526/IMLookAndFeel.java
index e456048e385..179324b877a 100644
--- a/jdk/test/java/awt/im/6396526/IMLookAndFeel.java
+++ b/jdk/test/java/awt/im/6396526/IMLookAndFeel.java
@@ -21,12 +21,13 @@
  * questions.
  */
 
-/*
+/**
  * @test
- * @bug  6396526
- * @summary  Verify below-the-spot IM in the swing L&F JFrame.
- *           Although the swing component is decorated with L&F
- *           the IM window should have no decoration.
+ * @key headful
+ * @bug 6396526
+ * @summary Verify below-the-spot IM in the swing L&F JFrame.
+ *          Although the swing component is decorated with L&F
+ *          the IM window should have no decoration.
  * @author yuriko.yamasaki
  */
 
diff --git a/jdk/test/java/awt/im/8041990/bug8041990.java b/jdk/test/java/awt/im/8041990/bug8041990.java
index ee813e6715c..030289cb87c 100644
--- a/jdk/test/java/awt/im/8041990/bug8041990.java
+++ b/jdk/test/java/awt/im/8041990/bug8041990.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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
@@ -22,12 +22,15 @@
  */
 
 
-/*
-  @test
-  @bug 8041990
-  @summary Language specific keys does not work in applets when opened outside the browser
-  @author Petr Pchelko
-*/
+/**
+ * @test
+ * @key headful
+ * @bug 8041990
+ * @summary Language specific keys does not work in applets when opened outside the browser
+ * @author Petr Pchelko
+ * @modules java.desktop/sun.awt
+ */
+
 
 import sun.awt.SunToolkit;
 
diff --git a/jdk/test/java/awt/image/MultiResolutionImageTest.java b/jdk/test/java/awt/image/MultiResolutionImageTest.java
index 21864f9be52..e627bc3ae24 100644
--- a/jdk/test/java/awt/image/MultiResolutionImageTest.java
+++ b/jdk/test/java/awt/image/MultiResolutionImageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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
@@ -45,6 +45,7 @@
 /**
  * @test
  * @bug 8011059
+ * @key headful
  * @author Alexander Scherbatiy
  * @summary [macosx] Make JDK demos look perfect on retina displays
  * @run main MultiResolutionImageTest CUSTOM
@@ -52,6 +53,7 @@
  * @run main MultiResolutionImageTest TOOLKIT_LOAD
  * @run main MultiResolutionImageTest TOOLKIT
  */
+
 public class MultiResolutionImageTest {
 
     private static final int IMAGE_WIDTH = 300;
diff --git a/jdk/test/java/awt/image/multiresolution/MultiResolutionToolkitImageTest.java b/jdk/test/java/awt/image/multiresolution/MultiResolutionToolkitImageTest.java
index 57a54386f0c..9ff181922b2 100644
--- a/jdk/test/java/awt/image/multiresolution/MultiResolutionToolkitImageTest.java
+++ b/jdk/test/java/awt/image/multiresolution/MultiResolutionToolkitImageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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
@@ -36,11 +36,13 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8040291
  * @author Alexander Scherbatiy
  * @summary [macosx] Http-Images are not fully loaded when using ImageIcon
  * @run main MultiResolutionToolkitImageTest
  */
+
 public class MultiResolutionToolkitImageTest {
 
     private static final int IMAGE_WIDTH = 300;
diff --git a/jdk/test/java/awt/keyboard/AltPlusNumberKeyCombinationsTest/AltPlusNumberKeyCombinationsTest.java b/jdk/test/java/awt/keyboard/AltPlusNumberKeyCombinationsTest/AltPlusNumberKeyCombinationsTest.java
index 9088018e258..288b1bdadc5 100644
--- a/jdk/test/java/awt/keyboard/AltPlusNumberKeyCombinationsTest/AltPlusNumberKeyCombinationsTest.java
+++ b/jdk/test/java/awt/keyboard/AltPlusNumberKeyCombinationsTest/AltPlusNumberKeyCombinationsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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
@@ -25,16 +25,15 @@
 import java.awt.event.*;
 
 /**
- * Test that it is possible to type "Alt code" on Windows.
- * Windows-only test.
+ * @test
+ * @key headful
+ * @summary Test that it is possible to type "Alt code" on Windows.
+ * @requires (os.family == "windows")
+ * @library ../../../../lib/testlibrary
+ * @build ExtendedRobot
+ * @run main AltPlusNumberKeyCombinationsTest
  */
-/*
-@test
-@summary Test that it is possible to type "Alt code" on Windows.
-@library ../../../../lib/testlibrary
-@build ExtendedRobot
-@run main AltPlusNumberKeyCombinationsTest
-*/
+
 public class AltPlusNumberKeyCombinationsTest {
 
     private Frame frame;
diff --git a/jdk/test/java/awt/print/PrinterJob/CheckPrivilege.java b/jdk/test/java/awt/print/PrinterJob/CheckPrivilege.java
index 1645c58583f..de32d587ade 100644
--- a/jdk/test/java/awt/print/PrinterJob/CheckPrivilege.java
+++ b/jdk/test/java/awt/print/PrinterJob/CheckPrivilege.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, 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
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @key printer
  * @bug 4151151
  * @summary Confirm that low-level print code does doPrivilege.
  * @author Graham Hamilton
diff --git a/jdk/test/java/awt/print/PrinterJob/ExceptionTest.java b/jdk/test/java/awt/print/PrinterJob/ExceptionTest.java
index fbb22461c2a..aec97c9be19 100644
--- a/jdk/test/java/awt/print/PrinterJob/ExceptionTest.java
+++ b/jdk/test/java/awt/print/PrinterJob/ExceptionTest.java
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @key printer
  * @bug 6467557
  * @summary No exception should be thrown.
  * @run main ExceptionTest
diff --git a/jdk/test/java/awt/print/PrinterJob/ImagePrinting/NullClipARGB.java b/jdk/test/java/awt/print/PrinterJob/ImagePrinting/NullClipARGB.java
index 88d4e43cf98..f686e177018 100644
--- a/jdk/test/java/awt/print/PrinterJob/ImagePrinting/NullClipARGB.java
+++ b/jdk/test/java/awt/print/PrinterJob/ImagePrinting/NullClipARGB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @key printer
  * @bug 8061392
  * @summary Test no NPE when printing transparency with null clip.
  */
diff --git a/jdk/test/java/awt/print/PrinterJob/Margins.java b/jdk/test/java/awt/print/PrinterJob/Margins.java
index efdebe4c9ec..6803a5dc499 100644
--- a/jdk/test/java/awt/print/PrinterJob/Margins.java
+++ b/jdk/test/java/awt/print/PrinterJob/Margins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, 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
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 6543815
  * @summary Image should be sent to printer, no exceptions thrown.
  *    The 2 printouts should have a rectangle which is the minimum
diff --git a/jdk/test/java/awt/print/PrinterJob/PaintText.java b/jdk/test/java/awt/print/PrinterJob/PaintText.java
index 15a5c288f39..7f8047bd4c4 100644
--- a/jdk/test/java/awt/print/PrinterJob/PaintText.java
+++ b/jdk/test/java/awt/print/PrinterJob/PaintText.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, 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
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @key headful printer
  * @bug 6498340
  * @summary No exception when printing text with a paint.
  * @run main PaintText
diff --git a/jdk/test/java/awt/print/PrinterJob/PrintCrashTest.java b/jdk/test/java/awt/print/PrinterJob/PrintCrashTest.java
index a5f87cfce4d..3a1bc4c8c10 100644
--- a/jdk/test/java/awt/print/PrinterJob/PrintCrashTest.java
+++ b/jdk/test/java/awt/print/PrinterJob/PrintCrashTest.java
@@ -21,9 +21,9 @@
  * questions.
  */
 
-/*
+/**
  * @test
- * @key headful
+ * @key printer headful
  * @bug 8163889
  * @summary Printing crashes on OSX.
  * @run main PrintCrashTest
diff --git a/jdk/test/java/awt/print/PrinterJob/PrintTextPane.java b/jdk/test/java/awt/print/PrinterJob/PrintTextPane.java
index 878be7dd5a3..b06d5c5182f 100644
--- a/jdk/test/java/awt/print/PrinterJob/PrintTextPane.java
+++ b/jdk/test/java/awt/print/PrinterJob/PrintTextPane.java
@@ -21,14 +21,15 @@
  * questions.
  */
 
-/*
-  @test PrintTextPane.java
-  @bug 6452415 6570471
-  @summary Test that swing text prints using GDI printer fonts.
-  @author prr: area=PrinterJob
-  @run main PrintTextPane
-
+/**
+ * @test PrintTextPane.java
+ * @key headful printer
+ * @bug 6452415 6570471
+ * @summary Test that swing text prints using GDI printer fonts.
+ * @author prr: area=PrinterJob
+ * @run main PrintTextPane
  */
+
 import java.io.*;
 import java.net.*;
 import java.awt.*;
diff --git a/jdk/test/java/awt/print/PrinterJob/PrtException.java b/jdk/test/java/awt/print/PrinterJob/PrtException.java
index 0387a3beb1e..152fe70d485 100644
--- a/jdk/test/java/awt/print/PrinterJob/PrtException.java
+++ b/jdk/test/java/awt/print/PrinterJob/PrtException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2017, 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
@@ -20,12 +20,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/*
-  @test
-  @bug 4429544
-  @summary This test should not throw a printer exception. Test has been modified to correspond with the behavior of 1.5 and above.
-  @run main PrtException
-*/
+
+/**
+ * @test
+ * @key printer
+ * @bug 4429544
+ * @summary This test should not throw a printer exception. Test has been modified to correspond with the behavior of 1.5 and above.
+ * @run main PrtException
+ */
 
 import java.awt.*;
 import java.awt.print.*;
diff --git a/jdk/test/javax/print/CheckDupFlavor.java b/jdk/test/javax/print/CheckDupFlavor.java
index 6507ab2f07d..4e1bfd9ceff 100644
--- a/jdk/test/javax/print/CheckDupFlavor.java
+++ b/jdk/test/javax/print/CheckDupFlavor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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,12 +21,14 @@
  * questions.
  */
 
-/*
+/**
  * @test
+ * @key printer
  * @bug 4996318 6731937
  * @summary  There should be no duplicates returned by getSupportedDocFlavors.
  * @run main CheckDupFlavor
  */
+
 import javax.print.*;
 import javax.print.attribute.*;
 import javax.print.attribute.standard.*;
diff --git a/jdk/test/javax/print/PrintSE/PrintSE.sh b/jdk/test/javax/print/PrintSE/PrintSE.sh
index 9b555054f07..d4b3adabe46 100644
--- a/jdk/test/javax/print/PrintSE/PrintSE.sh
+++ b/jdk/test/javax/print/PrintSE/PrintSE.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2017, 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
@@ -24,8 +24,11 @@
 #
 
 # @test
+# @key printer
 # @bug 6662775
-# @summary Tests queuePrintJob is sufficient permission.
+# @summary Tests queuePrintJob is sufficient permission for printing. This test 
+#          prints a page to a printer. If a document printer is installed, a 
+#          popup can appear (to select the file location).
 # @run clean PrintSE
 # @run build PrintSE
 # @run compile PrintSE.java
diff --git a/jdk/test/javax/print/attribute/AttributeTest.java b/jdk/test/javax/print/attribute/AttributeTest.java
index 1bd23f8358d..e87ae44d777 100644
--- a/jdk/test/javax/print/attribute/AttributeTest.java
+++ b/jdk/test/javax/print/attribute/AttributeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2017, 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,12 +21,14 @@
  * questions.
  */
 
-/*
+/**
  * @test
+ * @key printer
  * @bug 6387255
  * @summary  Tests conflict of Media values returned by isAttrValueSupported and getSupportedAttrValues.  No runtime exception should be thrown.
  * @run main AttributeTest
  */
+
 import javax.print.*;
 import javax.print.attribute.standard.*;
 import javax.print.attribute.*;
diff --git a/jdk/test/javax/print/attribute/GetCopiesSupported.java b/jdk/test/javax/print/attribute/GetCopiesSupported.java
index ea366729f92..8a4080565f8 100644
--- a/jdk/test/javax/print/attribute/GetCopiesSupported.java
+++ b/jdk/test/javax/print/attribute/GetCopiesSupported.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2017, 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
@@ -20,12 +20,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/*
-  @test
-  @bug 4463280
-  @summary No ClassCastException should occur.
-  @run main GetCopiesSupported
-*/
+
+/**
+ * @test
+ * @key printer
+ * @bug 4463280
+ * @summary No ClassCastException should occur.
+ * @run main GetCopiesSupported
+ */
 
 import javax.print.*;
 import javax.print.attribute.*;
diff --git a/jdk/test/javax/print/attribute/SidesPageRangesTest.java b/jdk/test/javax/print/attribute/SidesPageRangesTest.java
index a5092cdfdea..476a6cf1f41 100644
--- a/jdk/test/javax/print/attribute/SidesPageRangesTest.java
+++ b/jdk/test/javax/print/attribute/SidesPageRangesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, 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
@@ -20,12 +20,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/*
+
+/**
  * @test
+ * @key printer
  * @bug 4903366
  * @summary No crash should occur.
  * @run main SidesPageRangesTest
-*/
+ */
+
 import java.awt.*;
 import javax.print.*;
 import javax.print.attribute.standard.*;
diff --git a/jdk/test/javax/print/attribute/SupportedPrintableAreas.java b/jdk/test/javax/print/attribute/SupportedPrintableAreas.java
index 9ae66db407a..84700c671d4 100644
--- a/jdk/test/javax/print/attribute/SupportedPrintableAreas.java
+++ b/jdk/test/javax/print/attribute/SupportedPrintableAreas.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, 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,8 +21,9 @@
  * questions.
  */
 
-/*
+/**
  * @test
+ * @key printer
  * @bug 4762773 6289206 6324049 6362765
  * @summary Tests that get non-null return list of printable areas.
  * @run main SupportedPrintableAreas
diff --git a/jdk/test/javax/swing/JComboBox/8019180/Test8019180.java b/jdk/test/javax/swing/JComboBox/8019180/Test8019180.java
index d089f998eb3..766400e3baf 100644
--- a/jdk/test/javax/swing/JComboBox/8019180/Test8019180.java
+++ b/jdk/test/javax/swing/JComboBox/8019180/Test8019180.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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
@@ -26,8 +26,9 @@
 import javax.swing.JFrame;
 import javax.swing.SwingUtilities;
 
-/*
+/**
  * @test
+ * @key headful
  * @bug 8019180
  * @summary Tests that combobox works if it is used as action listener
  * @author Sergey Malenkov
diff --git a/jdk/test/javax/swing/JComponent/4337267/bug4337267.java b/jdk/test/javax/swing/JComponent/4337267/bug4337267.java
index 1c316f85975..83a08f87b64 100644
--- a/jdk/test/javax/swing/JComponent/4337267/bug4337267.java
+++ b/jdk/test/javax/swing/JComponent/4337267/bug4337267.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2017, 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,8 +21,9 @@
  * questions.
  */
 
-/*
+/**
  * @test
+ * @key headful
  * @bug 4337267
  * @summary test that numeric shaping works in Swing components
  * @author Sergey Groznyh
diff --git a/jdk/test/javax/swing/JComponent/8043610/bug8043610.java b/jdk/test/javax/swing/JComponent/8043610/bug8043610.java
index b4fc89f0552..87d3965a51c 100644
--- a/jdk/test/javax/swing/JComponent/8043610/bug8043610.java
+++ b/jdk/test/javax/swing/JComponent/8043610/bug8043610.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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
@@ -22,13 +22,16 @@
  */
 
 
-/*
-  @test
-  @bug 8043610
-  @summary Tests that JComponent invalidate, revalidate and repaint methods could
-           be called from any thread
-  @author Petr Pchelko
-*/
+/**
+ * @test
+ * @key headful
+ * @bug 8043610
+ * @summary Tests that JComponent invalidate, revalidate and repaint methods could
+ *          be called from any thread
+ * @author Petr Pchelko
+ * @modules java.desktop/sun.awt
+ */
+
 
 import sun.awt.SunToolkit;
 
diff --git a/jdk/test/javax/swing/JDialog/6639507/bug6639507.java b/jdk/test/javax/swing/JDialog/6639507/bug6639507.java
index 13d1915a3b7..5c24c17a399 100644
--- a/jdk/test/javax/swing/JDialog/6639507/bug6639507.java
+++ b/jdk/test/javax/swing/JDialog/6639507/bug6639507.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, 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,11 +21,14 @@
  * questions.
  */
 
-/* @test
-   @bug 6639507
-   @summary Title of javax.swing.JDialog is null while spec says it's empty
-   @author Pavel Porvatov
-*/
+/**
+ * @test
+ * @key headful
+ * @bug 6639507
+ * @summary Title of javax.swing.JDialog is null while spec says it's empty
+ * @author Pavel Porvatov
+ */
+
 import javax.swing.*;
 import java.awt.*;
 
diff --git a/jdk/test/javax/swing/JFileChooser/6713352/bug6713352.java b/jdk/test/javax/swing/JFileChooser/6713352/bug6713352.java
index 6ec2e4fffcc..29e4580e8ef 100644
--- a/jdk/test/javax/swing/JFileChooser/6713352/bug6713352.java
+++ b/jdk/test/javax/swing/JFileChooser/6713352/bug6713352.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2017, 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,12 +21,15 @@
  * questions.
  */
 
-/* @test
-   @bug 6713352
-   @summary Deadlock in JFileChooser with synchronized custom FileSystemView
-   @author Pavel Porvatov
-   @run main bug6713352
-*/
+/**
+ * @test
+ * @key headful
+ * @bug 6713352
+ * @summary Deadlock in JFileChooser with synchronized custom FileSystemView
+ * @author Pavel Porvatov
+ * @modules java.desktop/sun.awt.shell
+ * @run main bug6713352
+ */
 
 import sun.awt.shell.ShellFolder;
 
diff --git a/jdk/test/javax/swing/JFileChooser/6817933/Test6817933.java b/jdk/test/javax/swing/JFileChooser/6817933/Test6817933.java
index 2b65f173a18..09b8f25fc28 100644
--- a/jdk/test/javax/swing/JFileChooser/6817933/Test6817933.java
+++ b/jdk/test/javax/swing/JFileChooser/6817933/Test6817933.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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,11 +21,13 @@
  * questions.
  */
 
-/*
+/**
  * @test
+ * @key headful
  * @bug 6817933
  * @summary Tests that HTMLEditorKit does not affect JFileChooser
  * @author Sergey Malenkov
+ * @requires (os.family == "windows")
  */
 
 import java.awt.Color;
diff --git a/jdk/test/javax/swing/JFileChooser/8013442/Test8013442.java b/jdk/test/javax/swing/JFileChooser/8013442/Test8013442.java
index e7b892ddaed..7232a3ce375 100644
--- a/jdk/test/javax/swing/JFileChooser/8013442/Test8013442.java
+++ b/jdk/test/javax/swing/JFileChooser/8013442/Test8013442.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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,8 +21,9 @@
  * questions.
  */
 
-/*
+/**
  * @test
+ * @key headful
  * @bug 8013442
  * @summary Tests that at least one file filter is selected
  * @author Sergey Malenkov
diff --git a/jdk/test/javax/swing/JFrame/8016356/bug8016356.java b/jdk/test/javax/swing/JFrame/8016356/bug8016356.java
index b5ee38ef3e0..60761a4f52b 100644
--- a/jdk/test/javax/swing/JFrame/8016356/bug8016356.java
+++ b/jdk/test/javax/swing/JFrame/8016356/bug8016356.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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,12 +21,17 @@
  * questions.
  */
 
-/* @test
-   @bug 8016356
-   @summary Any swing frame resizes ugly.
-   @run main bug8016356
-   @author Oleg Pekhovskiy
-*/
+/**
+ * @test
+ * @key headful
+ * @bug 8016356
+ * @summary Any swing frame resizes ugly.
+ * @author Oleg Pekhovskiy
+ * @requires (os.family == "windows")
+ * @library ../../../../lib/testlibrary
+ * @build jdk.testlibrary.OSInfo
+ * @run main bug8016356
+ */
 
 import java.awt.AWTException;
 import java.awt.Color;
diff --git a/jdk/test/javax/swing/JFrame/NSTexturedJFrame/NSTexturedJFrame.java b/jdk/test/javax/swing/JFrame/NSTexturedJFrame/NSTexturedJFrame.java
index 79cc40e5a7e..906bbd70d8e 100644
--- a/jdk/test/javax/swing/JFrame/NSTexturedJFrame/NSTexturedJFrame.java
+++ b/jdk/test/javax/swing/JFrame/NSTexturedJFrame/NSTexturedJFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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
@@ -31,6 +31,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 7124513
  * @summary We should support NSTexturedBackgroundWindowMask style on OSX.
  * @author Sergey Bylokhov
@@ -38,6 +39,7 @@
  * @build ExtendedRobot jdk.testlibrary.OSInfo
  * @run main NSTexturedJFrame
  */
+
 public final class NSTexturedJFrame {
 
     private static final String BRUSH = "apple.awt.brushMetalLook";
diff --git a/jdk/test/javax/swing/JInternalFrame/Test6325652.java b/jdk/test/javax/swing/JInternalFrame/Test6325652.java
index ad82ade4527..dd3a2d99ebc 100644
--- a/jdk/test/javax/swing/JInternalFrame/Test6325652.java
+++ b/jdk/test/javax/swing/JInternalFrame/Test6325652.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2017, 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,8 +21,9 @@
  * questions.
  */
 
-/*
+/**
  * @test
+ * @key headful
  * @bug 6325652
  * @summary Tests keyboard shortcuts
  * @author Sergey Malenkov
diff --git a/jdk/test/javax/swing/JMenu/6538132/bug6538132.java b/jdk/test/javax/swing/JMenu/6538132/bug6538132.java
index 73a61eaa6c9..3d2101e1b8d 100644
--- a/jdk/test/javax/swing/JMenu/6538132/bug6538132.java
+++ b/jdk/test/javax/swing/JMenu/6538132/bug6538132.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, 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
@@ -20,14 +20,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/* @test
-   @bug 6538132
-   @summary Regression: Pressing Escape key don't close the menu items from jdk7.0 b07 onwards
-   @author Alexander Potochkin
-   @library ../../../../lib/testlibrary
-   @build ExtendedRobot
-   @run main bug6538132
-*/
+
+/**
+ * @test
+ * @key headful
+ * @bug 6538132
+ * @summary Regression: Pressing Escape key don't close the menu items from jdk7.0 b07 onwards
+ * @author Alexander Potochkin
+ * @requires (os.family == "windows")
+ * @library ../../../../lib/testlibrary
+ * @build ExtendedRobot
+ * @run main bug6538132
+ */
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/jdk/test/javax/swing/JMenuItem/8152981/MenuItemIconTest.java b/jdk/test/javax/swing/JMenuItem/8152981/MenuItemIconTest.java
index 451da3cec4c..21c135f3270 100644
--- a/jdk/test/javax/swing/JMenuItem/8152981/MenuItemIconTest.java
+++ b/jdk/test/javax/swing/JMenuItem/8152981/MenuItemIconTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
+ * @key headful
  * @bug 8152981 8159135
  * @summary Double icons with JMenuItem setHorizontalTextPosition on Win 10
  * @requires (os.family == "windows")
  * @run main MenuItemIconTest
  */
+
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
diff --git a/jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java b/jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java
index 1a9f42120e2..f9bf8455154 100644
--- a/jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java
+++ b/jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java
@@ -21,8 +21,9 @@
  * questions.
  */
 
-/*
+/**
  * @test
+ * @key headful
  * @bug 7160951
  * @summary [macosx] ActionListener called twice for JMenuItem using ScreenMenuBar
  * @author vera.akulova@oracle.com
diff --git a/jdk/test/javax/swing/JPopupMenu/6217905/bug6217905.java b/jdk/test/javax/swing/JPopupMenu/6217905/bug6217905.java
index dcfab1da775..8f9b7b6b2a5 100644
--- a/jdk/test/javax/swing/JPopupMenu/6217905/bug6217905.java
+++ b/jdk/test/javax/swing/JPopupMenu/6217905/bug6217905.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, 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
@@ -20,15 +20,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/*
-@test
-@bug 6217905
-@summary JPopupMenu keyboard navigation stops working
-@author Alexander Potochkin
-@library ../../../../lib/testlibrary
-@build ExtendedRobot
-@run main bug6217905
-*/
+
+/**
+ * @test
+ * @key headful
+ * @bug 6217905
+ * @summary JPopupMenu keyboard navigation stops working
+ * @author Alexander Potochkin
+ * @requires (os.family == "windows")
+ * @library ../../../../lib/testlibrary
+ * @build ExtendedRobot
+ * @run main bug6217905
+ */
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/jdk/test/javax/swing/JPopupMenu/7154841/bug7154841.java b/jdk/test/javax/swing/JPopupMenu/7154841/bug7154841.java
index e2369914a71..0e0a8cfe391 100644
--- a/jdk/test/javax/swing/JPopupMenu/7154841/bug7154841.java
+++ b/jdk/test/javax/swing/JPopupMenu/7154841/bug7154841.java
@@ -21,14 +21,15 @@
  * questions.
  */
 
-/*
-  @test
-  @bug 7154841
-  @summary JPopupMenu is overlapped by a Dock on Mac OS X
-  @author Petr Pchelko
-  @library ../../../../lib/testlibrary
-  @build ExtendedRobot jdk.testlibrary.OSInfo
-  @run main bug7154841
+/**
+ * @test
+ * @key headful
+ * @bug 7154841
+ * @summary JPopupMenu is overlapped by a Dock on Mac OS X
+ * @author Petr Pchelko
+ * @library ../../../../lib/testlibrary
+ * @build ExtendedRobot jdk.testlibrary.OSInfo
+ * @run main bug7154841
  */
 
 import java.awt.*;
diff --git a/jdk/test/javax/swing/JTabbedPane/7170310/bug7170310.java b/jdk/test/javax/swing/JTabbedPane/7170310/bug7170310.java
index 94eaa6e3ce1..0c045ca33eb 100644
--- a/jdk/test/javax/swing/JTabbedPane/7170310/bug7170310.java
+++ b/jdk/test/javax/swing/JTabbedPane/7170310/bug7170310.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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
@@ -37,6 +37,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 7170310
  * @author Alexey Ivanov
  * @summary Selected tab should be scrolled into view.
@@ -44,6 +45,7 @@
  * @build ExtendedRobot
  * @run main bug7170310
  */
+
 public class bug7170310 {
     private static final int TABS_NUMBER = 3;
 
@@ -75,7 +77,7 @@ public static void main(String[] args) throws Exception {
                 System.out.printf("Test passed");
             }
         } finally {
-            frame.dispose();
+            if (frame != null) { frame.dispose(); }
         }
     }
 
diff --git a/jdk/test/javax/swing/JTextArea/6940863/bug6940863.java b/jdk/test/javax/swing/JTextArea/6940863/bug6940863.java
index b868d41adfc..6ece05d12f2 100644
--- a/jdk/test/javax/swing/JTextArea/6940863/bug6940863.java
+++ b/jdk/test/javax/swing/JTextArea/6940863/bug6940863.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, 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,10 +21,13 @@
  * questions.
  */
 
-/* @test
+/* *
+ * @test
+ * @key headful
  * @bug 6940863
  * @summary Textarea within scrollpane shows vertical scrollbar
  * @author Pavel Porvatov
+ * @requires (os.family == "windows")
  * @run main bug6940863
  */
 
diff --git a/jdk/test/javax/swing/Security/6938813/bug6938813.java b/jdk/test/javax/swing/Security/6938813/bug6938813.java
index 5bedf95e140..ab6121f095f 100644
--- a/jdk/test/javax/swing/Security/6938813/bug6938813.java
+++ b/jdk/test/javax/swing/Security/6938813/bug6938813.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, 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
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6938813
  * @summary Swing mutable statics
  * @author Pavel Porvatov
diff --git a/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java b/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java
index 143503861a1..5115d2ab83a 100644
--- a/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java
+++ b/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java
@@ -23,6 +23,7 @@
 
 /* @test
    @bug 7123767
+   @key headful randomness
    @summary Wrong tooltip location in Multi-Monitor configurations
    @author Vladislav Karnaukhov
    @run main bug7123767
diff --git a/jdk/test/javax/swing/plaf/aqua/CustomComboBoxFocusTest.java b/jdk/test/javax/swing/plaf/aqua/CustomComboBoxFocusTest.java
index 0c289835603..29b62136fea 100644
--- a/jdk/test/javax/swing/plaf/aqua/CustomComboBoxFocusTest.java
+++ b/jdk/test/javax/swing/plaf/aqua/CustomComboBoxFocusTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, 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,14 +21,16 @@
  * questions.
  */
 
-/* @test
-   @bug     8073001 8081764
-   @summary Test verifies that combo box with custom editor renders
-            focus ring around arrow button correctly.
-   @library /lib/testlibrary
-   @build jdk.testlibrary.OSInfo
-   @run     main CustomComboBoxFocusTest
-*/
+/**
+ * @test
+ * @key headful
+ * @bug     8073001 8081764
+ * @summary Test verifies that combo box with custom editor renders
+ *          focus ring around arrow button correctly.
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.OSInfo
+ * @run     main CustomComboBoxFocusTest
+ */
 
 import java.awt.AWTException;
 import java.awt.Component;
diff --git a/jdk/test/javax/swing/plaf/basic/BasicComboPopup/8154069/Bug8154069.java b/jdk/test/javax/swing/plaf/basic/BasicComboPopup/8154069/Bug8154069.java
index 35250a58705..2e60bf38384 100644
--- a/jdk/test/javax/swing/plaf/basic/BasicComboPopup/8154069/Bug8154069.java
+++ b/jdk/test/javax/swing/plaf/basic/BasicComboPopup/8154069/Bug8154069.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8154069
  * @summary Jaws reads wrong values from comboboxes when no element is selected
  * @run main Bug8154069
@@ -89,7 +90,7 @@ public static void main(String args[]) throws Exception {
             }
         } finally {
             SwingUtilities.invokeAndWait(() -> {
-                frame.dispose();
+                if (frame != null) { frame.dispose(); }
             });
         }
     }
diff --git a/jdk/test/javax/swing/plaf/basic/BasicHTML/4960629/bug4960629.java b/jdk/test/javax/swing/plaf/basic/BasicHTML/4960629/bug4960629.java
index 1e02204c4f9..5b7ff84fe7d 100644
--- a/jdk/test/javax/swing/plaf/basic/BasicHTML/4960629/bug4960629.java
+++ b/jdk/test/javax/swing/plaf/basic/BasicHTML/4960629/bug4960629.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, 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,12 +21,14 @@
  * questions.
  */
 
-/* @test
-   @bug 4960629 7124238
-   @summary  Tests if font for html text on widgets in correct.
-   @author Denis Sharypov
-   @run main bug4960629
-*/
+/**
+ * @test
+ * @key headful
+ * @bug 4960629 7124238
+ * @summary  Tests if font for html text on widgets in correct.
+ * @author Denis Sharypov
+ * @run main bug4960629
+ */
 
 import java.awt.Font;
 import java.lang.reflect.InvocationTargetException;
@@ -57,7 +59,7 @@ public void createAndShowGUI() throws Exception {
             f.setVisible(true);
             test();
         } finally {
-            f.dispose();
+            if (f != null) { f.dispose(); }
         }
     }
 
diff --git a/jdk/test/javax/swing/plaf/basic/BasicLabelUI/bug7172652.java b/jdk/test/javax/swing/plaf/basic/BasicLabelUI/bug7172652.java
index 8a06c48e90e..7fcbc5e78d1 100644
--- a/jdk/test/javax/swing/plaf/basic/BasicLabelUI/bug7172652.java
+++ b/jdk/test/javax/swing/plaf/basic/BasicLabelUI/bug7172652.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, 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,14 +21,17 @@
  * questions.
  */
 
-/* @test
-   @bug 7172652
-   @summary With JDK 1.7 text field does not obtain focus when using mnemonic Alt/Key combin
-   @author Semyon Sadetsky
-   @library /lib/testlibrary
-   @build jdk.testlibrary.OSInfo
-   @run main bug7172652
-  */
+/**
+ * @test
+ * @key headful
+ * @bug 7172652
+ * @summary With JDK 1.7 text field does not obtain focus when using mnemonic Alt/Key combin
+ * @author Semyon Sadetsky
+ * @requires (os.family == "windows")
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.OSInfo
+ * @run main bug7172652
+ */
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
diff --git a/jdk/test/javax/swing/plaf/nimbus/8041642/ScrollBarThumbVisibleTest.java b/jdk/test/javax/swing/plaf/nimbus/8041642/ScrollBarThumbVisibleTest.java
index 4d147ac8bd5..59fe7cb4fc4 100644
--- a/jdk/test/javax/swing/plaf/nimbus/8041642/ScrollBarThumbVisibleTest.java
+++ b/jdk/test/javax/swing/plaf/nimbus/8041642/ScrollBarThumbVisibleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, 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,11 +21,13 @@
  * questions.
  */
 
-/* @test
-   @bug 8134828
-   @summary Scrollbar thumb disappears with Nimbus L&F
-   @author Semyon Sadetsky
-*/
+/**
+ * @test
+ * @key headful
+ * @bug 8134828
+ * @summary Scrollbar thumb disappears with Nimbus L&F
+ * @author Semyon Sadetsky
+ */
 
 import javax.swing.*;
 import java.awt.*;
@@ -76,7 +78,7 @@ public void run() {
             SwingUtilities.invokeAndWait(new Runnable() {
                 @Override
                 public void run() {
-                    frame.dispose();
+                    if (frame != null) { frame.dispose(); }
                 }
             });
         }
diff --git a/jdk/test/javax/swing/plaf/windows/WindowsRootPaneUI/WrongAltProcessing/WrongAltProcessing.java b/jdk/test/javax/swing/plaf/windows/WindowsRootPaneUI/WrongAltProcessing/WrongAltProcessing.java
index 18f4498cfd6..9acfc17fd30 100644
--- a/jdk/test/javax/swing/plaf/windows/WindowsRootPaneUI/WrongAltProcessing/WrongAltProcessing.java
+++ b/jdk/test/javax/swing/plaf/windows/WindowsRootPaneUI/WrongAltProcessing/WrongAltProcessing.java
@@ -21,12 +21,15 @@
  * questions.
  */
 
-/* @test
-   @bug 8001633 8028271 8039888
-   @summary Wrong alt processing during switching between windows
-   @author mikhail.cherkasov@oracle.com
-   @run main WrongAltProcessing
-*/
+/**
+ * @test
+ * @key headful
+ * @bug 8001633 8028271 8039888
+ * @summary Wrong alt processing during switching between windows
+ * @author mikhail.cherkasov@oracle.com
+ * @requires (os.family == "windows")
+ * @run main WrongAltProcessing
+ */
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/jdk/test/javax/swing/system/6799345/TestShutdown.java b/jdk/test/javax/swing/system/6799345/TestShutdown.java
index 9a858f1f5bd..54ae1e227df 100644
--- a/jdk/test/javax/swing/system/6799345/TestShutdown.java
+++ b/jdk/test/javax/swing/system/6799345/TestShutdown.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2017, 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,16 @@
  * questions.
  */
 
-/* @test
-   @bug 6799345
-   @summary Tests that no exceptions are thrown from TimerQueue and
-SwingWorker on AppContext shutdown
-   @author art
-   @run main TestShutdown
-*/
+/**
+ * @test
+ * @bug 6799345
+ * @key headful
+ * @summary Tests that no exceptions are thrown from TimerQueue and
+ * SwingWorker on AppContext shutdown
+ * @author art
+ * @modules java.desktop/sun.awt
+ * @run main TestShutdown
+ */
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/jdk/test/javax/swing/text/FlowView/LayoutTest.java b/jdk/test/javax/swing/text/FlowView/LayoutTest.java
index 1cb9effba98..6b36bb3e643 100644
--- a/jdk/test/javax/swing/text/FlowView/LayoutTest.java
+++ b/jdk/test/javax/swing/text/FlowView/LayoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, 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 6452106 6606443 8161195
-   @author Peter Zhelezniakov
-   @library ../../regtesthelpers
-   @build Test JRobot SwingTestHelper
-   @run main/timeout=300 LayoutTest
-*/
+/**
+ * @test
+ * @key headful
+ * @bug 6452106 6606443 8161195
+ * @author Peter Zhelezniakov
+ * @library ../../regtesthelpers
+ * @build Test JRobot SwingTestHelper
+ * @run main/timeout=300 LayoutTest
+ */
 
 import javax.swing.text.*;
 import javax.swing.*;
diff --git a/jdk/test/javax/swing/text/View/8015853/bug8015853.java b/jdk/test/javax/swing/text/View/8015853/bug8015853.java
index f63210683be..c36469b830e 100644
--- a/jdk/test/javax/swing/text/View/8015853/bug8015853.java
+++ b/jdk/test/javax/swing/text/View/8015853/bug8015853.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, 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,8 +21,9 @@
  * questions.
  */
 
-/*
+/**
  * @test
+ * @key headful
  * @bug 8015853
  * @summary  Tests the rendering of a large HTML document
  * @author Dmitry Markov
diff --git a/jdk/test/javax/swing/text/html/Test4783068.java b/jdk/test/javax/swing/text/html/Test4783068.java
index b01d0420177..7001c7fc0e0 100644
--- a/jdk/test/javax/swing/text/html/Test4783068.java
+++ b/jdk/test/javax/swing/text/html/Test4783068.java
@@ -21,11 +21,13 @@
  * questions.
  */
 
-/* @test
-   @bug 4783068
-   @summary Disabled components should render grayed-out HTML
-   @author Peter Zhelezniakov
-   @run main Test4783068
+/**
+ * @test
+ * @key headful
+ * @bug 4783068
+ * @summary Disabled components should render grayed-out HTML
+ * @author Peter Zhelezniakov
+ * @run main Test4783068
 */
 
 import java.awt.*;
diff --git a/jdk/test/sun/java2d/DirectX/IAEforEmptyFrameTest/IAEforEmptyFrameTest.java b/jdk/test/sun/java2d/DirectX/IAEforEmptyFrameTest/IAEforEmptyFrameTest.java
index e0f54e37dab..39574caa98d 100644
--- a/jdk/test/sun/java2d/DirectX/IAEforEmptyFrameTest/IAEforEmptyFrameTest.java
+++ b/jdk/test/sun/java2d/DirectX/IAEforEmptyFrameTest/IAEforEmptyFrameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, 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,14 +21,16 @@
  * questions.
  */
 
-/*
+/**
  * @test
+ * @key headful
  * @bug 6668439
  * @summary Verifies that no exceptions are thrown when frame is resized to 0x0
  * @author Dmitri.Trembovetski@sun.com: area=Graphics
  * @run main/othervm IAEforEmptyFrameTest
  * @run main/othervm -Dsun.java2d.d3d=false IAEforEmptyFrameTest
  */
+
 import javax.swing.JFrame;
 
 public class IAEforEmptyFrameTest {

From 54766dd3ed7d6bff1aec4a48043a7e608a2eb448 Mon Sep 17 00:00:00 2001
From: sunyaqi <sunyaqi@loongson.cn>
Date: Fri, 1 Mar 2024 14:17:26 +0800
Subject: [PATCH 02/15] Backport 34afeced211cd7115e2529b043c1e57dfa1291fe

---
 .../IOExceptionIfEncodedURLTest.java          |  65 -----
 .../IOExceptionIfEncodedURLTest.sh            | 262 ------------------
 2 files changed, 327 deletions(-)
 delete mode 100644 jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
 delete mode 100644 jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh

diff --git a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
deleted file mode 100644
index 0db61d6db50..00000000000
--- a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2008, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @key headful
- * @bug 6193279
- * @summary REGRESSION: AppletViewer throws IOException when path is encoded URL
- * @author Dmitry Cherepanov: area=appletviewer
- * @run compile IOExceptionIfEncodedURLTest.java
- * @run main IOExceptionIfEncodedURLTest
- * @run shell IOExceptionIfEncodedURLTest.sh
- */
-
-import java.applet.Applet;
-import sun.net.www.ParseUtil;
-import java.io.File;
-import java.net.MalformedURLException;
-
-public class IOExceptionIfEncodedURLTest extends Applet{
-    public void init(){
-    }
-
-    public void start(){
-        // We check that appletviewer writes this message to log file
-        System.err.println("the appletviewer started");
-    }
-
-    // We expect that sun.net.www.ParseUtil.fileToEncodedURL works like following
-    // if relative file URL, like this "file:index.html" is processed
-    static String url = "file:IOExceptionIfEncodedURLTest.java";
-    public static final void main(String args[])
-      throws MalformedURLException{
-        System.err.println("prior checking...");
-        String prefix = "file:";
-        String path = ParseUtil.fileToEncodedURL(new File(System.getProperty("user.dir"))).getPath();
-        String filename = url.substring(prefix.length());
-        System.err.println("url="+url+" -> path="+path+",filename="+filename);
-
-        if (!path.endsWith("/") && !filename.startsWith("/")) {
-            throw new RuntimeException("Incorrect '/' processing");
-        }
-    }
-
-}
diff --git a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
deleted file mode 100644
index 3f8877c36af..00000000000
--- a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
+++ /dev/null
@@ -1,262 +0,0 @@
-#
-# Copyright (c) 2008, 2017, 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#!/bin/ksh -p
-#
-#   @test    IOExceptionIfEncodedURLTest.sh
-#   @key     headful
-#   @bug     6193279 6619458 8137087
-#   @summary REGRESSION: AppletViewer throws IOException when path is encoded URL
-#   @author  Dmitry Cherepanov: area=appletviewer
-#   @run compile IOExceptionIfEncodedURLTest.java
-#   @run main IOExceptionIfEncodedURLTest
-#   @run shell IOExceptionIfEncodedURLTest.sh
-
-# Beginning of subroutines:
-status=1
-
-#Call this from anywhere to fail the test with an error message
-# usage: fail "reason why the test failed"
-fail()
- { echo "The test failed :-("
-   echo "$*" 1>&2
-   echo "exit status was $status"
-   exit $status
- } #end of fail()
-
-#Call this from anywhere to pass the test with a message
-# usage: pass "reason why the test passed if applicable"
-pass()
- { echo "The test passed!!!"
-   echo "$*" 1>&2
-   exit 0
- } #end of pass()
-
-#Call this to run the test with a file name
-test()
- {
-   "${TESTJAVA}"${FILESEP}bin${FILESEP}appletviewer -Xnosecurity ${URL} > err 2>&1 &
-   APPLET_ID=$!
-   sleep 15
-   kill -9 $APPLET_ID
-
-   # these exceptions will be thrown if the test fails
-   cat err | grep "I/O exception while reading"
-   exception=$?
-   if [ $exception = "0" ];
-       then fail "test failed for "${URL}", see err file and CRs #6193279,6329251,6376334"
-   fi
-
-   cat err | grep "java.lang.ClassNotFoundException"
-   exception=$?
-   if [ $exception = "0" ];
-       then fail "test failed for "${URL}", see err file and CRs #6193279,6329251,6376334"
-   fi
-
-   # the applet will log the same message
-   cat err | grep "the appletviewer started"
-   started=$?
-
-   echo $started | grep "2"
-   if [ $? = 0 ] ;
-       then fail "test failed for "${URL}": syntax errors or inaccessible files"
-   fi
-
-   if [ $started = "0" ];
-       then echo "the test passed for "${URL}
-       else fail "test failed for "${URL}": the appletviewer behaviour is unexpected: "$started", see err file"
-   fi
- }
-
-# end of subroutines
-
-
-# The beginning of the script proper
-
-# Checking for proper OS
-OS=`uname -s`
-case "$OS" in
-   SunOS )
-      VAR="One value for Sun"
-      DEFAULT_JDK=/
-      FILESEP="/"
-      PATHSEP=":"
-      TMP="/tmp"
-      ;;
-
-   Linux )
-      VAR="A different value for Linux"
-      DEFAULT_JDK=/
-      FILESEP="/"
-      PATHSEP=":"
-      TMP="/tmp"
-      ;;
-
-   Darwin )
-      VAR="A different value for MacOSX"
-      DEFAULT_JDK=/usr
-      FILESEP="/"
-      PATHSEP=":"
-      TMP="/tmp"
-      ;;
-
-   Windows* )
-      VAR="A different value for Win32"
-      DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0"
-      FILESEP="\\"
-      PATHSEP=";"
-      TMP=`cd "${SystemRoot}/Temp"; echo ${PWD}`
-      ;;
-
-    CYGWIN* )
-      VAR="A different value for Cygwin"
-      DEFAULT_JDK="/cygdrive/c/Program\ Files/Java/jdk1.8.0"
-      FILESEP="/"
-      PATHSEP=";"
-      TMP=`cd "${SYSTEMROOT}/Temp"; echo ${PWD}`
-      x="cygpath -m $PWD"
-      PWD=$(eval $x)
-      ;;
-
-    AIX )
-      VAR="A different value for AIX"
-      DEFAULT_JDK=/
-      FILESEP="/"
-      PATHSEP=":"
-      TMP="/tmp"
-      ;;
-
-   # catch all other OSs
-   * )
-      echo "Unrecognized system!  $OS"
-      fail "Unrecognized system!  $OS"
-      ;;
-esac
-
-# 6438730: Only a minimal set of env variables are set for shell tests.
-# To guarantee that env variable holds correct value we need to set it ourselves.
-if [ -z "${PWD}" ] ; then
-    PWD=`pwd`
-fi
-
-# check that some executable or other file you need is available, abort if not
-#  note that the name of the executable is in the fail string as well.
-# this is how to check for presence of the compiler, etc.
-#RESOURCE=`whence SomeProgramOrFileNeeded`
-#if [ "${RESOURCE}" = "" ] ;
-#   then fail "Need SomeProgramOrFileNeeded to perform the test" ;
-#fi
-
-# Want this test to run standalone as well as in the harness, so do the
-#  following to copy the test's directory into the harness's scratch directory
-#  and set all appropriate variables:
-
-if [ -z "${TESTJAVA}" ] ; then
-   # TESTJAVA is not set, so the test is running stand-alone.
-   # TESTJAVA holds the path to the root directory of the build of the JDK
-   # to be tested.  That is, any java files run explicitly in this shell
-   # should use TESTJAVA in the path to the java interpreter.
-   # So, we'll set this to the JDK spec'd on the command line.  If none
-   # is given on the command line, tell the user that and use a cheesy
-   # default.
-   # THIS IS THE JDK BEING TESTED.
-   if [ -n "$1" ] ;
-      then TESTJAVA=$1
-      else echo "no JDK specified on command line so using default!"
-     TESTJAVA=$DEFAULT_JDK
-   fi
-   TESTSRC=.
-   TESTCLASSES=.
-   STANDALONE=1;
-fi
-echo "JDK under test is: $TESTJAVA"
-
-#Deal with .class files:
-if [ -n "${STANDALONE}" ] ;
-   then
-   #if standalone, remind user to cd to dir. containing test before running it
-   echo "Just a reminder: cd to the dir containing this test when running it"
-   # then compile all .java files (if there are any) into .class files
-   if [ -a *.java ] ;
-      then echo "Reminder, this test should be in its own directory with all"
-      echo "supporting files it needs in the directory with it."
-      ${TESTJAVA}/bin/javac ./*.java ;
-   fi
-   # else in harness so copy all the class files from where jtreg put them
-   # over to the scratch directory this test is running in.
-   else cp ${TESTCLASSES}/*.class . ;
-fi
-
-#if in test harness, then copy the entire directory that the test is in over
-# to the scratch directory.  This catches any support files needed by the test.
-#if [ -z "${STANDALONE}" ] ;
-#   then cp ${TESTSRC}/* .
-#fi
-
-#Just before executing anything, make sure it has executable permission!
-chmod 777 ./*
-
-###############  YOUR TEST CODE HERE!!!!!!!  #############
-
-#All files required for the test should be in the same directory with
-# this file.  If converting a standalone test to run with the harness,
-# as long as all files are in the same directory and it returns 0 for
-# pass, you should be able to cut and paste it into here and it will
-# run with the test harness.
-
-# This is an example of running something -- test
-# The stuff below catches the exit status of test then passes or fails
-# this shell test as appropriate ( 0 status is considered a pass here )
-
-# The test verifies that appletviewer correctly works with the different
-# names of the files, including relative and absolute paths
-
-# 6619458: exclude left brace from the name of the files managed by the VCS
-NAME='test.html'
-
-ENCODED='te%7Bst.html'
-UNENCODED='te{st.html'
-
-# Copy needed files into the harness's scratch directory
-# or create a copy with the required name if the test is
-# running as stand-alone
-cp ${TESTSRC}${FILESEP}${NAME} ${UNENCODED}
-
-# the encoded name, the path is absolute
-URL="file:"${PWD}${FILESEP}${ENCODED}
-test
-
-# the encoded name, the path is relative
-URL="file:"${ENCODED}
-test
-
-# the unencoded name, the path is absolute
-URL="file:"${PWD}${FILESEP}${UNENCODED}
-test
-
-# the unencoded name, the path is relative
-URL="file:"${UNENCODED}
-test
-
-# pick up our toys from the scratch directory
-rm ${UNENCODED}

From 12dc34eeafc59b6221fba01806653503f6d483aa Mon Sep 17 00:00:00 2001
From: sunyaqi <sunyaqi@loongson.cn>
Date: Fri, 1 Mar 2024 16:06:39 +0800
Subject: [PATCH 03/15] Backport 34afeced211cd7115e2529b043c1e57dfa1291fe

---
 .../IOExceptionIfEncodedURLTest.java          |  64 +++++
 .../IOExceptionIfEncodedURLTest.sh            | 261 ++++++++++++++++++
 2 files changed, 325 insertions(+)
 create mode 100644 jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
 create mode 100644 jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh

diff --git a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
new file mode 100644
index 00000000000..40b55be2221
--- /dev/null
+++ b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2008, 2017, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+  test
+  @bug 6193279
+  @summary REGRESSION: AppletViewer throws IOException when path is encoded URL
+  @author Dmitry Cherepanov: area=appletviewer
+  @run compile IOExceptionIfEncodedURLTest.java
+  @run main IOExceptionIfEncodedURLTest
+  @run shell IOExceptionIfEncodedURLTest.sh
+*/
+
+import java.applet.Applet;
+import sun.net.www.ParseUtil;
+import java.io.File;
+import java.net.MalformedURLException;
+
+public class IOExceptionIfEncodedURLTest extends Applet{
+    public void init(){
+    }
+
+    public void start(){
+        // We check that appletviewer writes this message to log file
+        System.err.println("the appletviewer started");
+    }
+
+    // We expect that sun.net.www.ParseUtil.fileToEncodedURL works like following
+    // if relative file URL, like this "file:index.html" is processed
+    static String url = "file:IOExceptionIfEncodedURLTest.java";
+    public static final void main(String args[])
+      throws MalformedURLException{
+        System.err.println("prior checking...");
+        String prefix = "file:";
+        String path = ParseUtil.fileToEncodedURL(new File(System.getProperty("user.dir"))).getPath();
+        String filename = url.substring(prefix.length());
+        System.err.println("url="+url+" -> path="+path+",filename="+filename);
+
+        if (!path.endsWith("/") && !filename.startsWith("/")) {
+            throw new RuntimeException("Incorrect '/' processing");
+        }
+    }
+
+}
diff --git a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
new file mode 100644
index 00000000000..c6ce7064ae7
--- /dev/null
+++ b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
@@ -0,0 +1,261 @@
+#
+# Copyright (c) 2008, 2017, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#!/bin/ksh -p
+#
+#   @test    IOExceptionIfEncodedURLTest.sh
+#   @bug     6193279 6619458 8137087
+#   @summary REGRESSION: AppletViewer throws IOException when path is encoded URL
+#   @author  Dmitry Cherepanov: area=appletviewer
+#   @run compile IOExceptionIfEncodedURLTest.java
+#   @run main IOExceptionIfEncodedURLTest
+#   @run shell IOExceptionIfEncodedURLTest.sh
+
+# Beginning of subroutines:
+status=1
+
+#Call this from anywhere to fail the test with an error message
+# usage: fail "reason why the test failed"
+fail()
+ { echo "The test failed :-("
+   echo "$*" 1>&2
+   echo "exit status was $status"
+   exit $status
+ } #end of fail()
+
+#Call this from anywhere to pass the test with a message
+# usage: pass "reason why the test passed if applicable"
+pass()
+ { echo "The test passed!!!"
+   echo "$*" 1>&2
+   exit 0
+ } #end of pass()
+
+#Call this to run the test with a file name
+test()
+ {
+   "${TESTJAVA}"${FILESEP}bin${FILESEP}appletviewer -Xnosecurity ${URL} > err 2>&1 &
+   APPLET_ID=$!
+   sleep 15
+   kill -9 $APPLET_ID
+
+   # these exceptions will be thrown if the test fails
+   cat err | grep "I/O exception while reading"
+   exception=$?
+   if [ $exception = "0" ];
+       then fail "test failed for "${URL}", see err file and CRs #6193279,6329251,6376334"
+   fi
+
+   cat err | grep "java.lang.ClassNotFoundException"
+   exception=$?
+   if [ $exception = "0" ];
+       then fail "test failed for "${URL}", see err file and CRs #6193279,6329251,6376334"
+   fi
+
+   # the applet will log the same message
+   cat err | grep "the appletviewer started"
+   started=$?
+
+   echo $started | grep "2"
+   if [ $? = 0 ] ;
+       then fail "test failed for "${URL}": syntax errors or inaccessible files"
+   fi
+
+   if [ $started = "0" ];
+       then echo "the test passed for "${URL}
+       else fail "test failed for "${URL}": the appletviewer behaviour is unexpected: "$started", see err file"
+   fi
+ }
+
+# end of subroutines
+
+
+# The beginning of the script proper
+
+# Checking for proper OS
+OS=`uname -s`
+case "$OS" in
+   SunOS )
+      VAR="One value for Sun"
+      DEFAULT_JDK=/
+      FILESEP="/"
+      PATHSEP=":"
+      TMP="/tmp"
+      ;;
+
+   Linux )
+      VAR="A different value for Linux"
+      DEFAULT_JDK=/
+      FILESEP="/"
+      PATHSEP=":"
+      TMP="/tmp"
+      ;;
+
+   Darwin )
+      VAR="A different value for MacOSX"
+      DEFAULT_JDK=/usr
+      FILESEP="/"
+      PATHSEP=":"
+      TMP="/tmp"
+      ;;
+
+   Windows* )
+      VAR="A different value for Win32"
+      DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0"
+      FILESEP="\\"
+      PATHSEP=";"
+      TMP=`cd "${SystemRoot}/Temp"; echo ${PWD}`
+      ;;
+
+    CYGWIN* )
+      VAR="A different value for Cygwin"
+      DEFAULT_JDK="/cygdrive/c/Program\ Files/Java/jdk1.8.0"
+      FILESEP="/"
+      PATHSEP=";"
+      TMP=`cd "${SYSTEMROOT}/Temp"; echo ${PWD}`
+      x="cygpath -m $PWD"
+      PWD=$(eval $x)
+      ;;
+
+    AIX )
+      VAR="A different value for AIX"
+      DEFAULT_JDK=/
+      FILESEP="/"
+      PATHSEP=":"
+      TMP="/tmp"
+      ;;
+
+   # catch all other OSs
+   * )
+      echo "Unrecognized system!  $OS"
+      fail "Unrecognized system!  $OS"
+      ;;
+esac
+
+# 6438730: Only a minimal set of env variables are set for shell tests.
+# To guarantee that env variable holds correct value we need to set it ourselves.
+if [ -z "${PWD}" ] ; then
+    PWD=`pwd`
+fi
+
+# check that some executable or other file you need is available, abort if not
+#  note that the name of the executable is in the fail string as well.
+# this is how to check for presence of the compiler, etc.
+#RESOURCE=`whence SomeProgramOrFileNeeded`
+#if [ "${RESOURCE}" = "" ] ;
+#   then fail "Need SomeProgramOrFileNeeded to perform the test" ;
+#fi
+
+# Want this test to run standalone as well as in the harness, so do the
+#  following to copy the test's directory into the harness's scratch directory
+#  and set all appropriate variables:
+
+if [ -z "${TESTJAVA}" ] ; then
+   # TESTJAVA is not set, so the test is running stand-alone.
+   # TESTJAVA holds the path to the root directory of the build of the JDK
+   # to be tested.  That is, any java files run explicitly in this shell
+   # should use TESTJAVA in the path to the java interpreter.
+   # So, we'll set this to the JDK spec'd on the command line.  If none
+   # is given on the command line, tell the user that and use a cheesy
+   # default.
+   # THIS IS THE JDK BEING TESTED.
+   if [ -n "$1" ] ;
+      then TESTJAVA=$1
+      else echo "no JDK specified on command line so using default!"
+     TESTJAVA=$DEFAULT_JDK
+   fi
+   TESTSRC=.
+   TESTCLASSES=.
+   STANDALONE=1;
+fi
+echo "JDK under test is: $TESTJAVA"
+
+#Deal with .class files:
+if [ -n "${STANDALONE}" ] ;
+   then
+   #if standalone, remind user to cd to dir. containing test before running it
+   echo "Just a reminder: cd to the dir containing this test when running it"
+   # then compile all .java files (if there are any) into .class files
+   if [ -a *.java ] ;
+      then echo "Reminder, this test should be in its own directory with all"
+      echo "supporting files it needs in the directory with it."
+      ${TESTJAVA}/bin/javac ./*.java ;
+   fi
+   # else in harness so copy all the class files from where jtreg put them
+   # over to the scratch directory this test is running in.
+   else cp ${TESTCLASSES}/*.class . ;
+fi
+
+#if in test harness, then copy the entire directory that the test is in over
+# to the scratch directory.  This catches any support files needed by the test.
+#if [ -z "${STANDALONE}" ] ;
+#   then cp ${TESTSRC}/* .
+#fi
+
+#Just before executing anything, make sure it has executable permission!
+chmod 777 ./*
+
+###############  YOUR TEST CODE HERE!!!!!!!  #############
+
+#All files required for the test should be in the same directory with
+# this file.  If converting a standalone test to run with the harness,
+# as long as all files are in the same directory and it returns 0 for
+# pass, you should be able to cut and paste it into here and it will
+# run with the test harness.
+
+# This is an example of running something -- test
+# The stuff below catches the exit status of test then passes or fails
+# this shell test as appropriate ( 0 status is considered a pass here )
+
+# The test verifies that appletviewer correctly works with the different
+# names of the files, including relative and absolute paths
+
+# 6619458: exclude left brace from the name of the files managed by the VCS
+NAME='test.html'
+
+ENCODED='te%7Bst.html'
+UNENCODED='te{st.html'
+
+# Copy needed files into the harness's scratch directory
+# or create a copy with the required name if the test is
+# running as stand-alone
+cp ${TESTSRC}${FILESEP}${NAME} ${UNENCODED}
+
+# the encoded name, the path is absolute
+URL="file:"${PWD}${FILESEP}${ENCODED}
+test
+
+# the encoded name, the path is relative
+URL="file:"${ENCODED}
+test
+
+# the unencoded name, the path is absolute
+URL="file:"${PWD}${FILESEP}${UNENCODED}
+test
+
+# the unencoded name, the path is relative
+URL="file:"${UNENCODED}
+test
+
+# pick up our toys from the scratch directory
+rm ${UNENCODED}

From 5e28d1d7343f21a7870503e6732f7288e7153729 Mon Sep 17 00:00:00 2001
From: sunyaqi <sunyaqi@loongson.cn>
Date: Fri, 1 Mar 2024 16:15:26 +0800
Subject: [PATCH 04/15] Backport 34afeced211cd7115e2529b043c1e57dfa1291fe

---
 jdk/test/TEST.ROOT | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/test/TEST.ROOT b/jdk/test/TEST.ROOT
index 9cb3da188f2..b6aa2e693a3 100644
--- a/jdk/test/TEST.ROOT
+++ b/jdk/test/TEST.ROOT
@@ -14,7 +14,7 @@
 # A test flagged with key "printer" requires a printer to succeed, else
 # throws a PrinterException or the like.
 
-keys=2d dnd headful i18n intermittent printer randomness
+keys=2d dnd headful i18n intermittent printer randomness jfr
 
 # Tests that must run in othervm mode
 othervm.dirs=java/awt java/beans java/rmi javax/accessibility javax/imageio javax/sound javax/print javax/management com/sun/awt sun/awt sun/java2d sun/pisces sun/rmi

From 008dff40e13b04c95f4f641eee1e4047511316f7 Mon Sep 17 00:00:00 2001
From: sunyaqi <sunyaqi@loongson.cn>
Date: Fri, 1 Mar 2024 16:47:32 +0800
Subject: [PATCH 05/15] Backport 34afeced211cd7115e2529b043c1e57dfa1291fe

---
 .../IOExceptionIfEncodedURLTest.java                            | 2 +-
 jdk/test/javax/swing/JTextArea/6940863/bug6940863.java          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
index 40b55be2221..83d5bc098ee 100644
--- a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
+++ b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
diff --git a/jdk/test/javax/swing/JTextArea/6940863/bug6940863.java b/jdk/test/javax/swing/JTextArea/6940863/bug6940863.java
index 6ece05d12f2..5f70d4280cc 100644
--- a/jdk/test/javax/swing/JTextArea/6940863/bug6940863.java
+++ b/jdk/test/javax/swing/JTextArea/6940863/bug6940863.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/* *
+/**
  * @test
  * @key headful
  * @bug 6940863

From 5b8b0b82a9f031f0a94e815b2155180600209592 Mon Sep 17 00:00:00 2001
From: sunyaqi <sunyaqi@loongson.cn>
Date: Mon, 1 Apr 2024 13:49:28 +0800
Subject: [PATCH 06/15] Backport 34afeced211cd7115e2529b043c1e57dfa1291fe

---
 .../IOExceptionIfEncodedURLTest.java                            | 2 +-
 .../IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
index 83d5bc098ee..40b55be2221 100644
--- a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
+++ b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, 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
diff --git a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
index c6ce7064ae7..3f8877c36af 100644
--- a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
+++ b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
@@ -24,6 +24,7 @@
 #!/bin/ksh -p
 #
 #   @test    IOExceptionIfEncodedURLTest.sh
+#   @key     headful
 #   @bug     6193279 6619458 8137087
 #   @summary REGRESSION: AppletViewer throws IOException when path is encoded URL
 #   @author  Dmitry Cherepanov: area=appletviewer

From 232db3b3c46d3e9edd54d10ca05e1488574d870e Mon Sep 17 00:00:00 2001
From: sunyaqi <sunyaqi@loongson.cn>
Date: Thu, 18 Apr 2024 20:20:19 +0800
Subject: [PATCH 07/15] Backport 34afeced211cd7115e2529b043c1e57dfa1291fe

---
 .../ToolTipManager/7123767/bug7123767.java    | 174 ++++++++++++------
 1 file changed, 116 insertions(+), 58 deletions(-)

diff --git a/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java b/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java
index 5115d2ab83a..549f9ec57e2 100644
--- a/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java
+++ b/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
@@ -22,11 +22,25 @@
  */
 
 /* @test
-   @bug 7123767
-   @key headful randomness
-   @summary Wrong tooltip location in Multi-Monitor configurations
-   @author Vladislav Karnaukhov
-   @run main bug7123767
+* @bug      7123767
+*
+* @summary  Check if a tooltip location in Multi-Monitor
+*           configurations is correct.
+*           If the configurations number per device exceeds 5,
+*           then some 5 random configurations will be checked.
+*           Please Use -Dseed=X to set the random generator seed
+*           (if necessary).
+*
+* @author   Vladislav Karnaukhov
+*
+* @key      headful
+* @key      randomness
+*
+* @modules  java.desktop/sun.awt
+* @library  /lib/testlibrary/
+* @build    jdk.testlibrary.*
+*
+* @run      main/timeout=300 bug7123767
 */
 
 import javax.swing.*;
@@ -35,8 +49,50 @@
 import java.awt.event.MouseEvent;
 import java.lang.reflect.InvocationTargetException;
 
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Random;
+
+import jdk.testlibrary.RandomFactory;
+
+
 public class bug7123767 extends JFrame {
 
+    // maximum number of GraphicsConfigurations checked per GraphicsDevice
+    private static final int MAX_N_CONFIGS = 5;
+    private static final List<GraphicsConfiguration> CONFIGS = getConfigs();
+
+    private static List<GraphicsConfiguration> getConfigs() {
+
+        Random rnd = RandomFactory.getRandom();
+
+        List<GraphicsConfiguration> configs = new ArrayList<>();
+
+        GraphicsEnvironment ge =
+                GraphicsEnvironment.getLocalGraphicsEnvironment();
+        GraphicsDevice[] devices = ge.getScreenDevices();
+
+        for (GraphicsDevice device : devices) {
+            GraphicsConfiguration[] allConfigs = device.getConfigurations();
+            int nConfigs = allConfigs.length;
+            if (nConfigs <= MAX_N_CONFIGS) {
+                Collections.addAll(configs, allConfigs);
+            } else { // see JDK-8159454
+                System.out.println("check only " + MAX_N_CONFIGS +
+                    " configurations for device " + device);
+                configs.add(device.getDefaultConfiguration()); // check default
+                for (int j = 0; j < MAX_N_CONFIGS - 1; j++) {
+                    int k = rnd.nextInt(nConfigs);
+                    configs.add(allConfigs[k]);
+                }
+            }
+        }
+
+        return configs;
+    }
+
+
     private static class TestFactory extends PopupFactory {
 
         private static TestFactory newFactory = new TestFactory();
@@ -60,15 +116,21 @@ public static void uninstall() {
         }
 
         // Actual test happens here
+        @Override
         public Popup getPopup(Component owner, Component contents, int x, int y) {
-            GraphicsConfiguration mouseGC = testGC(MouseInfo.getPointerInfo().getLocation());
+
+            GraphicsConfiguration mouseGC =
+                testGC(MouseInfo.getPointerInfo().getLocation());
+
             if (mouseGC == null) {
-                throw new RuntimeException("Can't find GraphicsConfiguration that mouse pointer belongs to");
+                throw new RuntimeException("Can't find GraphicsConfiguration "
+                        + "that mouse pointer belongs to");
             }
 
             GraphicsConfiguration tipGC = testGC(new Point(x, y));
             if (tipGC == null) {
-                throw new RuntimeException("Can't find GraphicsConfiguration that tip belongs to");
+                throw new RuntimeException(
+                        "Can't find GraphicsConfiguration that tip belongs to");
             }
 
             if (!mouseGC.equals(tipGC)) {
@@ -79,17 +141,14 @@ public Popup getPopup(Component owner, Component contents, int x, int y) {
         }
 
         private static GraphicsConfiguration testGC(Point pt) {
-            GraphicsEnvironment environment = GraphicsEnvironment.getLocalGraphicsEnvironment();
-            GraphicsDevice[] devices = environment.getScreenDevices();
-            for (GraphicsDevice device : devices) {
-                GraphicsConfiguration[] configs = device.getConfigurations();
-                for (GraphicsConfiguration config : configs) {
-                    Rectangle rect = config.getBounds();
-                    Insets insets = Toolkit.getDefaultToolkit().getScreenInsets(config);
-                    adjustInsets(rect, insets);
-                    if (rect.contains(pt))
-                        return config;
-                }
+
+            for (GraphicsConfiguration config: CONFIGS) {
+
+                Rectangle rect = config.getBounds();
+                Insets insets =
+                    Toolkit.getDefaultToolkit().getScreenInsets(config);
+                adjustInsets(rect, insets);
+                if (rect.contains(pt)) { return config; }
             }
 
             return null;
@@ -101,15 +160,18 @@ private static GraphicsConfiguration testGC(Point pt) {
     private static Robot robot;
 
     public static void main(String[] args) throws Exception {
+
         UIManager.setLookAndFeel(new MetalLookAndFeel());
         setUp();
         testToolTip();
         TestFactory.uninstall();
+        if (frame != null) { frame.dispose(); }
     }
 
     // Creates a window that is stretched across all available monitors
     // and adds itself as ContainerListener to track tooltips drawing
     private bug7123767() {
+
         super();
 
         ToolTipManager.sharedInstance().setInitialDelay(0);
@@ -133,17 +195,16 @@ public Point getToolTipLocation(MouseEvent event) {
         pack();
 
         Rectangle rect = new Rectangle();
-        GraphicsEnvironment environment = GraphicsEnvironment.getLocalGraphicsEnvironment();
-        GraphicsDevice[] devices = environment.getScreenDevices();
-        for (GraphicsDevice device : devices) {
-            GraphicsConfiguration[] configs = device.getConfigurations();
-            for (GraphicsConfiguration config : configs) {
-                Insets localInsets = Toolkit.getDefaultToolkit().getScreenInsets(config);
-                Rectangle localRect = config.getBounds();
-                adjustInsets(localRect, localInsets);
-                rect.add(localRect);
-            }
+
+        for (GraphicsConfiguration config: CONFIGS) {
+
+            Insets localInsets =
+                Toolkit.getDefaultToolkit().getScreenInsets(config);
+            Rectangle localRect = config.getBounds();
+            adjustInsets(localRect, localInsets);
+            rect.add(localRect);
         }
+
         setBounds(rect);
     }
 
@@ -164,35 +225,32 @@ private static void testToolTip() throws AWTException {
         robot.setAutoDelay(20);
         robot.waitForIdle();
 
-        GraphicsEnvironment environment = GraphicsEnvironment.getLocalGraphicsEnvironment();
-        GraphicsDevice[] devices = environment.getScreenDevices();
-        for (GraphicsDevice device : devices) {
-            GraphicsConfiguration[] configs = device.getConfigurations();
-            for (GraphicsConfiguration config : configs) {
-                Rectangle rect = config.getBounds();
-                Insets insets = Toolkit.getDefaultToolkit().getScreenInsets(config);
-                adjustInsets(rect, insets);
+        for (GraphicsConfiguration config: CONFIGS) {
 
-                // Upper left
-                glide(rect.x + rect.width / 2, rect.y + rect.height / 2,
-                        rect.x + MARGIN, rect.y + MARGIN);
-                robot.waitForIdle();
-
-                // Lower left
-                glide(rect.x + rect.width / 2, rect.y + rect.height / 2,
-                        rect.x + MARGIN, rect.y + rect.height - MARGIN);
-                robot.waitForIdle();
-
-                // Upper right
-                glide(rect.x + rect.width / 2, rect.y + rect.height / 2,
-                        rect.x + rect.width - MARGIN, rect.y + MARGIN);
-                robot.waitForIdle();
-
-                // Lower right
-                glide(rect.x + rect.width / 2, rect.y + rect.height / 2,
-                        rect.x + rect.width - MARGIN, rect.y + rect.height - MARGIN);
-                robot.waitForIdle();
-            }
+            Rectangle rect = config.getBounds();
+            Insets insets = Toolkit.getDefaultToolkit().getScreenInsets(config);
+            adjustInsets(rect, insets);
+
+            // Upper left
+            glide(rect.x + rect.width / 2, rect.y + rect.height / 2,
+                    rect.x + MARGIN, rect.y + MARGIN);
+            robot.waitForIdle();
+
+            // Lower left
+            glide(rect.x + rect.width / 2, rect.y + rect.height / 2,
+                    rect.x + MARGIN, rect.y + rect.height - MARGIN);
+            robot.waitForIdle();
+
+            // Upper right
+            glide(rect.x + rect.width / 2, rect.y + rect.height / 2,
+                    rect.x + rect.width - MARGIN, rect.y + MARGIN);
+            robot.waitForIdle();
+
+            // Lower right
+            glide(rect.x + rect.width / 2, rect.y + rect.height / 2,
+                    rect.x + rect.width - MARGIN, rect.y + rect.height - MARGIN);
+
+            robot.waitForIdle();
         }
     }
 

From 8a0b148ed9c17b716c53b7d3a9558136d208edb4 Mon Sep 17 00:00:00 2001
From: sunyaqi <sunyaqi@loongson.cn>
Date: Tue, 11 Jun 2024 10:02:17 +0800
Subject: [PATCH 08/15] Backport 34afeced211cd7115e2529b043c1e57dfa1291fe

---
 jdk/test/javax/swing/system/6799345/TestShutdown.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jdk/test/javax/swing/system/6799345/TestShutdown.java b/jdk/test/javax/swing/system/6799345/TestShutdown.java
index 54ae1e227df..114c8beb3f3 100644
--- a/jdk/test/javax/swing/system/6799345/TestShutdown.java
+++ b/jdk/test/javax/swing/system/6799345/TestShutdown.java
@@ -28,7 +28,6 @@
  * @summary Tests that no exceptions are thrown from TimerQueue and
  * SwingWorker on AppContext shutdown
  * @author art
- * @modules java.desktop/sun.awt
  * @run main TestShutdown
  */
 

From ae71cd289dd890d4be45a18d901752072b6b440a Mon Sep 17 00:00:00 2001
From: sunyaqi <sunyaqi@loongson.cn>
Date: Tue, 11 Jun 2024 10:16:06 +0800
Subject: [PATCH 09/15] Backport 34afeced211cd7115e2529b043c1e57dfa1291fe

---
 .../EmbeddedFrame/DisplayChangedTest/DisplayChangedTest.java | 5 +----
 .../EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java         | 5 +----
 .../Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java | 3 ---
 jdk/test/java/awt/im/8041990/bug8041990.java                 | 1 -
 jdk/test/javax/swing/JComponent/8043610/bug8043610.java      | 1 -
 jdk/test/javax/swing/JFileChooser/6713352/bug6713352.java    | 1 -
 6 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/jdk/test/java/awt/EmbeddedFrame/DisplayChangedTest/DisplayChangedTest.java b/jdk/test/java/awt/EmbeddedFrame/DisplayChangedTest/DisplayChangedTest.java
index 44c3409e7db..5f347c8f0d5 100644
--- a/jdk/test/java/awt/EmbeddedFrame/DisplayChangedTest/DisplayChangedTest.java
+++ b/jdk/test/java/awt/EmbeddedFrame/DisplayChangedTest/DisplayChangedTest.java
@@ -24,13 +24,10 @@
 /**
  * @test
  * @key headful
- * @bug 4980592 8171363
+ * @bug 4980592
  * @summary   switching user in XP causes an NPE in
  *            sun.awt.windows.WWindowPeer.displayChanged
  * @requires (os.family == "windows")
- * @modules java.desktop/java.awt.peer
- * @modules java.desktop/sun.awt.windows:open
- * @modules java.desktop/sun.awt
  * @author son@sparc.spb.su: area=embedded
  * @run main DisplayChangedTest
  */
diff --git a/jdk/test/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java b/jdk/test/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java
index e708c945c20..cce03537750 100644
--- a/jdk/test/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java
+++ b/jdk/test/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java
@@ -24,12 +24,9 @@
 /**
  * @test
  * @key headful
- * @bug 6345003 8171363
+ * @bug 6345003
  * @summary grab problems with EmbeddedFrame
  * @requires (os.family == "windows")
- * @modules java.desktop/java.awt.peer
- * @modules java.desktop/sun.awt
- * @modules java.desktop/sun.awt.windows:open
  * @author Oleg.Semenov@sun.com area=EmbeddedFrame
  * @run main EmbeddedFrameGrabTest
  */
diff --git a/jdk/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java b/jdk/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java
index 34d7e9525de..b6eac572a04 100644
--- a/jdk/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java
+++ b/jdk/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java
@@ -28,9 +28,6 @@
  * @summary   Tests that EmbeddedFrame can be focused.
  * @author    anton.tarasov: area=awt-focus
  * @requires (os.family == "windows")
- * @modules   java.desktop/java.awt.peer
- *            java.desktop/sun.awt
- *            java.desktop/sun.awt.windows
  * @library /java/awt/patchlib    ../../regtesthelpers
  * @build java.desktop/java.awt.Helper
  * @build     Util UtilInternal
diff --git a/jdk/test/java/awt/im/8041990/bug8041990.java b/jdk/test/java/awt/im/8041990/bug8041990.java
index 030289cb87c..9398fa3aabd 100644
--- a/jdk/test/java/awt/im/8041990/bug8041990.java
+++ b/jdk/test/java/awt/im/8041990/bug8041990.java
@@ -28,7 +28,6 @@
  * @bug 8041990
  * @summary Language specific keys does not work in applets when opened outside the browser
  * @author Petr Pchelko
- * @modules java.desktop/sun.awt
  */
 
 
diff --git a/jdk/test/javax/swing/JComponent/8043610/bug8043610.java b/jdk/test/javax/swing/JComponent/8043610/bug8043610.java
index 87d3965a51c..d559e05411c 100644
--- a/jdk/test/javax/swing/JComponent/8043610/bug8043610.java
+++ b/jdk/test/javax/swing/JComponent/8043610/bug8043610.java
@@ -29,7 +29,6 @@
  * @summary Tests that JComponent invalidate, revalidate and repaint methods could
  *          be called from any thread
  * @author Petr Pchelko
- * @modules java.desktop/sun.awt
  */
 
 
diff --git a/jdk/test/javax/swing/JFileChooser/6713352/bug6713352.java b/jdk/test/javax/swing/JFileChooser/6713352/bug6713352.java
index 29e4580e8ef..a4cb739d94c 100644
--- a/jdk/test/javax/swing/JFileChooser/6713352/bug6713352.java
+++ b/jdk/test/javax/swing/JFileChooser/6713352/bug6713352.java
@@ -27,7 +27,6 @@
  * @bug 6713352
  * @summary Deadlock in JFileChooser with synchronized custom FileSystemView
  * @author Pavel Porvatov
- * @modules java.desktop/sun.awt.shell
  * @run main bug6713352
  */
 

From 1fc9217f21180278834a7e9603ccebe56ecad8d0 Mon Sep 17 00:00:00 2001
From: sunyaqi <sunyaqi@loongson.cn>
Date: Thu, 13 Jun 2024 15:26:29 +0800
Subject: [PATCH 10/15] Backport 34afeced211cd7115e2529b043c1e57dfa1291fe

---
 .../FocusEmbeddedFrameTest.java               |  3 +--
 .../DefaultPolicyChange_Swing.java            |  1 +
 .../IOExceptionIfEncodedURLTest.java          | 19 ++++++++++---------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/jdk/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java b/jdk/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java
index b6eac572a04..b6b1c8cea30 100644
--- a/jdk/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java
+++ b/jdk/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java
@@ -28,8 +28,7 @@
  * @summary   Tests that EmbeddedFrame can be focused.
  * @author    anton.tarasov: area=awt-focus
  * @requires (os.family == "windows")
- * @library /java/awt/patchlib    ../../regtesthelpers
- * @build java.desktop/java.awt.Helper
+ * @library ../../regtesthelpers
  * @build     Util UtilInternal
  * @run       main FocusEmbeddedFrameTest
  */
diff --git a/jdk/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java b/jdk/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java
index b8dd218549f..e10e4f0d6a3 100644
--- a/jdk/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java
+++ b/jdk/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java
@@ -26,6 +26,7 @@
  * @key headful
  * @bug 6741526 8004693
  * @summary KeyboardFocusManager.setDefaultFocusTraversalPolicy(FocusTraversalPolicy) affects created components
+ * @library ../../regtesthelpers
  * @author Andrei Dmitriev : area=awt-focus
  * @run main DefaultPolicyChange_Swing
  */
diff --git a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
index 40b55be2221..0db61d6db50 100644
--- a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
+++ b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
@@ -21,15 +21,16 @@
  * questions.
  */
 
-/*
-  test
-  @bug 6193279
-  @summary REGRESSION: AppletViewer throws IOException when path is encoded URL
-  @author Dmitry Cherepanov: area=appletviewer
-  @run compile IOExceptionIfEncodedURLTest.java
-  @run main IOExceptionIfEncodedURLTest
-  @run shell IOExceptionIfEncodedURLTest.sh
-*/
+/**
+ * @test
+ * @key headful
+ * @bug 6193279
+ * @summary REGRESSION: AppletViewer throws IOException when path is encoded URL
+ * @author Dmitry Cherepanov: area=appletviewer
+ * @run compile IOExceptionIfEncodedURLTest.java
+ * @run main IOExceptionIfEncodedURLTest
+ * @run shell IOExceptionIfEncodedURLTest.sh
+ */
 
 import java.applet.Applet;
 import sun.net.www.ParseUtil;

From 11d35aa955acccd535536c4d4cb67b66f23ad220 Mon Sep 17 00:00:00 2001
From: sunyaqi <sunyaqi@loongson.cn>
Date: Mon, 17 Jun 2024 15:18:49 +0800
Subject: [PATCH 11/15] backport 8186259: IOExceptionIfEncodedURLTest.sh versus
 IOExceptionIfEncodedURLTest.java

---
 .../IOExceptionIfEncodedURLTest.java                  | 11 -----------
 .../IOExceptionIfEncodedURLTest.sh                    |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
index 0db61d6db50..fc3945a7827 100644
--- a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
+++ b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
@@ -21,17 +21,6 @@
  * questions.
  */
 
-/**
- * @test
- * @key headful
- * @bug 6193279
- * @summary REGRESSION: AppletViewer throws IOException when path is encoded URL
- * @author Dmitry Cherepanov: area=appletviewer
- * @run compile IOExceptionIfEncodedURLTest.java
- * @run main IOExceptionIfEncodedURLTest
- * @run shell IOExceptionIfEncodedURLTest.sh
- */
-
 import java.applet.Applet;
 import sun.net.www.ParseUtil;
 import java.io.File;
diff --git a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
index 3f8877c36af..dd7a340ab23 100644
--- a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
+++ b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
@@ -25,7 +25,7 @@
 #
 #   @test    IOExceptionIfEncodedURLTest.sh
 #   @key     headful
-#   @bug     6193279 6619458 8137087
+#   @bug     6193279 6619458 8137087 8186259
 #   @summary REGRESSION: AppletViewer throws IOException when path is encoded URL
 #   @author  Dmitry Cherepanov: area=appletviewer
 #   @run compile IOExceptionIfEncodedURLTest.java

From 5ba12d7d003165b3138f1858fcb42e8a8fc28903 Mon Sep 17 00:00:00 2001
From: sunyaqi <sunyaqi@loongson.cn>
Date: Tue, 18 Jun 2024 11:13:49 +0800
Subject: [PATCH 12/15] Backport 34afeced211cd7115e2529b043c1e57dfa1291fe

---
 .../awt/datatransfer/HTMLDataFlavors/HTMLDataFlavorTest.java    | 2 --
 jdk/test/javax/swing/JFrame/8016356/bug8016356.java             | 2 --
 2 files changed, 4 deletions(-)

diff --git a/jdk/test/java/awt/datatransfer/HTMLDataFlavors/HTMLDataFlavorTest.java b/jdk/test/java/awt/datatransfer/HTMLDataFlavors/HTMLDataFlavorTest.java
index 65c185d782a..a5677e87e38 100644
--- a/jdk/test/java/awt/datatransfer/HTMLDataFlavors/HTMLDataFlavorTest.java
+++ b/jdk/test/java/awt/datatransfer/HTMLDataFlavors/HTMLDataFlavorTest.java
@@ -28,10 +28,8 @@
  * @summary WIN: Provide a way to format HTML on drop
  * @author Denis Fokin: area=datatransfer
  * @requires (os.family == "windows")
- * @library ../../../../lib/testlibrary
  * @build HtmlTransferable PutAllHtmlFlavorsOnClipboard
  * @build PutOnlyAllHtmlFlavorOnClipboard PutSelectionAndFragmentHtmlFlavorsOnClipboard
- * @build jdk.testlibrary.OSInfo
  * @run main HTMLDataFlavorTest
  */
 
diff --git a/jdk/test/javax/swing/JFrame/8016356/bug8016356.java b/jdk/test/javax/swing/JFrame/8016356/bug8016356.java
index 60761a4f52b..7954c2a7527 100644
--- a/jdk/test/javax/swing/JFrame/8016356/bug8016356.java
+++ b/jdk/test/javax/swing/JFrame/8016356/bug8016356.java
@@ -28,8 +28,6 @@
  * @summary Any swing frame resizes ugly.
  * @author Oleg Pekhovskiy
  * @requires (os.family == "windows")
- * @library ../../../../lib/testlibrary
- * @build jdk.testlibrary.OSInfo
  * @run main bug8016356
  */
 

From 2ee8478744ae36c940831d88a2c2d598920ebe9a Mon Sep 17 00:00:00 2001
From: sunyaqi <sunyaqi@loongson.cn>
Date: Tue, 25 Jun 2024 09:04:29 +0800
Subject: [PATCH 13/15] del '@(#)TestSinhalaChar.java' after '@test'

---
 jdk/test/java/awt/font/TextLayout/TestSinhalaChar.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/test/java/awt/font/TextLayout/TestSinhalaChar.java b/jdk/test/java/awt/font/TextLayout/TestSinhalaChar.java
index b73f68c5e2a..5ff5a4b5bdd 100644
--- a/jdk/test/java/awt/font/TextLayout/TestSinhalaChar.java
+++ b/jdk/test/java/awt/font/TextLayout/TestSinhalaChar.java
@@ -22,7 +22,7 @@
  */
 
 /**
- * @test @(#)TestSinhalaChar.java
+ * @test
  * @key headful
  * @summary verify lack of crash on U+0DDD.
  * @bug 6795060

From 330839e2a9b6ae3d508d2a8cd7e04f2b9fa4d90a Mon Sep 17 00:00:00 2001
From: sunyaqi <sunyaqi@loongson.cn>
Date: Wed, 26 Jun 2024 14:41:49 +0800
Subject: [PATCH 14/15] add '@build Sysout'

---
 .../DefaultPolicyChange/DefaultPolicyChange_Swing.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jdk/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java b/jdk/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java
index e10e4f0d6a3..217b20ef705 100644
--- a/jdk/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java
+++ b/jdk/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java
@@ -24,9 +24,10 @@
 /**
  * @test
  * @key headful
- * @bug 6741526 8004693
+ * @bug 6741526
  * @summary KeyboardFocusManager.setDefaultFocusTraversalPolicy(FocusTraversalPolicy) affects created components
  * @library ../../regtesthelpers
+ * @build Sysout
  * @author Andrei Dmitriev : area=awt-focus
  * @run main DefaultPolicyChange_Swing
  */

From 906ade35ac5ce10b762caad08a83535f9a09a344 Mon Sep 17 00:00:00 2001
From: sunyaqi <sunyaqi@loongson.cn>
Date: Thu, 31 Oct 2024 19:38:13 +0800
Subject: [PATCH 15/15] backport
 jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java

---
 .../ToolTipManager/7123767/bug7123767.java    | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java b/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java
index 549f9ec57e2..9057e3a39b8 100644
--- a/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java
+++ b/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java
@@ -21,27 +21,27 @@
  * questions.
  */
 
-/* @test
-* @bug      7123767
-*
-* @summary  Check if a tooltip location in Multi-Monitor
-*           configurations is correct.
-*           If the configurations number per device exceeds 5,
-*           then some 5 random configurations will be checked.
-*           Please Use -Dseed=X to set the random generator seed
-*           (if necessary).
-*
-* @author   Vladislav Karnaukhov
-*
-* @key      headful
-* @key      randomness
-*
-* @modules  java.desktop/sun.awt
-* @library  /lib/testlibrary/
-* @build    jdk.testlibrary.*
-*
-* @run      main/timeout=300 bug7123767
-*/
+/**
+ * @test
+ * @bug      7123767
+ *
+ * @summary  Check if a tooltip location in Multi-Monitor
+ *           configurations is correct.
+ *           If the configurations number per device exceeds 5,
+ *           then some 5 random configurations will be checked.
+ *           Please Use -Dseed=X to set the random generator seed
+ *           (if necessary).
+ *
+ * @author   Vladislav Karnaukhov
+ *
+ * @key      headful randomness
+ *
+ * @modules  java.desktop/sun.awt
+ * @library  /lib/testlibrary/
+ * @build    jdk.testlibrary.*
+ *
+ * @run      main/timeout=300 bug7123767
+ */
 
 import javax.swing.*;
 import javax.swing.plaf.metal.MetalLookAndFeel;