8328247: Remove redundant dir for tests converted from applet to main

test/jdk/ProblemList.txt

@@ -460,6 +460,7 @@ java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java 8194751 linux-all
 java/awt/image/VolatileImage/BitmaskVolatileImage.java 8133102 linux-all
 java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java 8203004 linux-all
 java/awt/ScrollPane/ScrollPositionTest.java 8040070 linux-all
+java/awt/ScrollPane/ScrollPaneEventType.java 8296516 macosx-all
 java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java 7107528 linux-all,macosx-all
 java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java 8080676 linux-all
 java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersInKeyEvent.java 8157147 linux-all,windows-all,macosx-all
@@ -501,8 +502,6 @@ java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemoni
 
 java/awt/Window/GetScreenLocation/GetScreenLocationTest.java 8225787 linux-x64
 java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java 8266243 macosx-aarch64
-java/awt/Dialog/PrintToFileTest/PrintToFileRevoked.java 8029249 macosx-all
-java/awt/Dialog/PrintToFileTest/PrintToFileGranted.java 8029249 macosx-all
 java/awt/Dialog/FileDialogUserFilterTest.java 8001142 generic-all
 
 java/awt/dnd/DragSourceMotionListenerTest.java 8225131 windows-all
@@ -706,7 +705,7 @@ javax/swing/JFileChooser/8194044/FileSystemRootTest.java 8327236 windows-all
 javax/swing/JPopupMenu/6800513/bug6800513.java 7184956 macosx-all
 javax/swing/JTabbedPane/4624207/bug4624207.java 8064922 macosx-all
 javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java 8160720 generic-all
-javax/swing/JFileChooser/6798062/bug6798062.java 8146446 windows-all
+javax/swing/JFileChooser/bug6798062.java 8146446 windows-all
 javax/swing/JFileChooser/6738668/bug6738668.java 8194946 generic-all
 javax/swing/JInternalFrame/Test6325652.java 8224977 macosx-all
 javax/swing/JPopupMenu/4870644/bug4870644.java 8194130 macosx-all,linux-all
@@ -825,7 +824,7 @@ javax/swing/JFileChooser/6698013/bug6698013.java 8024419 macosx-all
 javax/swing/JColorChooser/8065098/bug8065098.java 8065647 macosx-all
 java/awt/Modal/PrintDialogsTest/PrintDialogsTest.java 8068378 generic-all
 java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.html 8080185 macosx-all,linux-all
-javax/swing/JTabbedPane/4666224/bug4666224.java 8144124  macosx-all
+javax/swing/JTabbedPane/bug4666224.java 8144124  macosx-all
 java/awt/event/MouseEvent/AltGraphModifierTest/AltGraphModifierTest.java 8162380 generic-all
 java/awt/image/VolatileImage/VolatileImageConfigurationTest.java 8171069 macosx-all,linux-all
 java/awt/Modal/InvisibleParentTest/InvisibleParentTest.java 8172245 linux-all

test/jdk/java/awt/ScrollPane/ScrollPaneAsNeededTest.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2003, 2025, 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 4152524
+ * @summary ScrollPane AS_NEEDED always places scrollbars first time component
+ *          is laid out
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual ScrollPaneAsNeededTest
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Button;
+import java.awt.Frame;
+import java.awt.ScrollPane;
+
+public class ScrollPaneAsNeededTest {
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                1. You will see a frame titled 'ScrollPane as needed'
+                   of minimum possible size in the middle of the screen.
+                2. If for the first resize of frame(using mouse) to
+                   a very big size(may be, to half the area of the screen)
+                   the scrollbars(any - horizontal, vertical or both)
+                   appear, click FAIL else, click PASS.
+                                           """;
+        PassFailJFrame.builder()
+                .title("Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(ScrollPaneAsNeededTest::initialize)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static Frame initialize() {
+        Frame f = new Frame("ScrollPane as needed");
+        f.setLayout(new BorderLayout());
+        ScrollPane sp = new ScrollPane(ScrollPane.SCROLLBARS_AS_NEEDED);
+        sp.add(new Button("TEST"));
+        f.add("Center", sp);
+        f.setSize(200, 200);
+        return f;
+    }
+}

test/jdk/java/awt/ScrollPane/ScrollPaneComponentTest.java

@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2003, 2025, 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 4100671
+ * @summary removing and adding back ScrollPane component does not work
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual ScrollPaneComponentTest
+ */
+
+import java.awt.Adjustable;
+import java.awt.BorderLayout;
+import java.awt.Button;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Panel;
+import java.awt.ScrollPane;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class ScrollPaneComponentTest {
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                1. Notice the scrollbars (horizontal and vertical)
+                   in the Frame titled 'ScrollPane Component Test'
+                2. Click the button labeled 'Remove and add back
+                   ScrollPane Contents'
+                3. If the Scrollbars (horizontal or vertical or both)
+                   disappears in the Frame, then press FAIL, else press PASS.
+                                   """;
+        PassFailJFrame.builder()
+                .title("Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(ScrollPaneComponentTest::initialize)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static Frame initialize() {
+        Frame fr = new Frame("ScrollPane Component Test");
+        fr.setLayout(new BorderLayout());
+        ScrollTester test = new ScrollTester();
+
+        fr.add(test);
+        fr.pack();
+        fr.setSize(200, 200);
+
+        Adjustable vadj = test.pane.getVAdjustable();
+        Adjustable hadj = test.pane.getHAdjustable();
+        vadj.setUnitIncrement(5);
+        hadj.setUnitIncrement(5);
+        return fr;
+    }
+}
+
+class Box extends Component {
+    public Dimension getPreferredSize() {
+        System.out.println("asked for size");
+        return new Dimension(300, 300);
+    }
+
+    public void paint(Graphics gr) {
+        super.paint(gr);
+        gr.setColor(Color.red);
+        gr.drawLine(5, 5, 295, 5);
+        gr.drawLine(295, 5, 295, 295);
+        gr.drawLine(295, 295, 5, 295);
+        gr.drawLine(5, 295, 5, 5);
+        System.out.println("Painted!!");
+    }
+}
+
+class ScrollTester extends Panel {
+    public ScrollPane pane;
+    private final Box child;
+
+    class Handler implements ActionListener {
+        public void actionPerformed(ActionEvent e) {
+            System.out.println("Removing scrollable component");
+            pane.remove(child);
+            System.out.println("Adding back scrollable component");
+            pane.add(child);
+            System.out.println("Done Adding back scrollable component");
+        }
+    }
+
+    public ScrollTester() {
+        pane = new ScrollPane();
+        pane.setSize(200, 200);
+        child = new Box();
+        pane.add(child);
+        setLayout(new BorderLayout());
+        Button changeScrollContents = new Button("Remove and add back ScrollPane Contents");
+        changeScrollContents.setBackground(Color.red);
+        changeScrollContents.addActionListener(new Handler());
+        add("North", changeScrollContents);
+        add("Center", pane);
+    }
+}

test/jdk/java/awt/ScrollPane/ScrollPaneEventType.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2003, 2025, 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 4075484
+ * @summary Tests that events of different types are generated for the
+ *          corresponding scroll actions.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual ScrollPaneEventType
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Button;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.ScrollPane;
+import java.awt.event.AdjustmentListener;
+
+public class ScrollPaneEventType {
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                1. This test verifies that when user performs some scrolling operation on
+                   ScrollPane the correct AdjustmentEvent is being generated.
+                2. To test this, press on:
+                   - scrollbar's arrows and verify that UNIT event is generated,
+                   - scrollbar's grey area(non-thumb) and verify that BLOCK event is
+                    generated,
+                   - drag scrollbar's thumb and verify that TRACK event is generated
+                   If you see correct events for both scroll bars then test is PASSED.
+                   Otherwise it is FAILED.
+                   """;
+        PassFailJFrame.builder()
+                .title("Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(ScrollPaneEventType::initialize)
+                .logArea()
+                .build()
+                .awaitAndCheck();
+    }
+
+    static Frame initialize() {
+        Frame frame = new Frame("ScrollPane event type test");
+        frame.setLayout(new BorderLayout());
+        ScrollPane pane = new ScrollPane(ScrollPane.SCROLLBARS_ALWAYS);
+        pane.add(new Button("press") {
+            public Dimension getPreferredSize() {
+                return new Dimension(1000, 1000);
+            }
+        });
+
+        AdjustmentListener listener = e -> PassFailJFrame.log(e.toString());
+        pane.getHAdjustable().addAdjustmentListener(listener);
+        pane.getVAdjustable().addAdjustmentListener(listener);
+        frame.add(pane);
+        frame.setSize(200, 200);
+        return frame;
+    }
+}