From c51406a1cab66e9ac7710694c56b9fee13b6b352 Mon Sep 17 00:00:00 2001
From: Damon Nguyen <damon.nguyen@oracle.com>
Date: Sat, 23 Nov 2024 20:39:30 -0800
Subject: [PATCH 1/2] Initial commit for backout

---
 .../swing/plaf/basic/BasicScrollBarUI.java    | 45 -----------
 .../JComboBox/JComboBoxScrollFocusTest.java   | 75 -------------------
 2 files changed, 120 deletions(-)
 delete mode 100644 test/jdk/javax/swing/JComboBox/JComboBoxScrollFocusTest.java

diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java
index 9fc9b64314cb9..60274d766cd70 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java
@@ -31,7 +31,6 @@
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Insets;
-import java.awt.KeyboardFocusManager;
 import java.awt.LayoutManager;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -123,8 +122,6 @@ public class BasicScrollBarUI
     protected ArrowButtonListener buttonListener;
     /** Model listener */
     protected ModelListener modelListener;
-    /** KeyboardFocusListener */
-    protected KeyboardFocusListener keyboardFocusListener;
 
     /** Thumb rectangle */
     protected Rectangle thumbRect;
@@ -359,15 +356,12 @@ protected void installListeners(){
         buttonListener = createArrowButtonListener();
         modelListener = createModelListener();
         propertyChangeListener = createPropertyChangeListener();
-        keyboardFocusListener = createKeyboardFocusListener();
 
         scrollbar.addMouseListener(trackListener);
         scrollbar.addMouseMotionListener(trackListener);
         scrollbar.getModel().addChangeListener(modelListener);
         scrollbar.addPropertyChangeListener(propertyChangeListener);
         scrollbar.addFocusListener(getHandler());
-        KeyboardFocusManager.getCurrentKeyboardFocusManager()
-                .addPropertyChangeListener(keyboardFocusListener);
 
         if (incrButton != null) {
             incrButton.addMouseListener(buttonListener);
@@ -449,8 +443,6 @@ protected void uninstallListeners() {
             incrButton.removeMouseListener(buttonListener);
         }
 
-        KeyboardFocusManager.getCurrentKeyboardFocusManager()
-                .removePropertyChangeListener(keyboardFocusListener);
         scrollbar.getModel().removeChangeListener(modelListener);
         scrollbar.removeMouseListener(trackListener);
         scrollbar.removeMouseMotionListener(trackListener);
@@ -517,14 +509,6 @@ protected PropertyChangeListener createPropertyChangeListener() {
         return getHandler();
     }
 
-    /**
-     * Creates a keyboard focus listener.
-     * @return a keyboard focus listener
-     */
-    protected KeyboardFocusListener createKeyboardFocusListener() {
-        return new KeyboardFocusListener();
-    }
-
     private void updateThumbState(int x, int y) {
         Rectangle rect = getThumbBounds();
 
@@ -1218,35 +1202,6 @@ public boolean getSupportsAbsolutePositioning() {
         return supportsAbsolutePositioning;
     }
 
-    /**
-     * A listener to listen for keyboard focus changes.
-     */
-    protected class KeyboardFocusListener implements PropertyChangeListener {
-        /**
-         * Constructs a {@code KeyboardFocusListener}.
-         */
-        protected KeyboardFocusListener() {}
-
-        @Override
-        public void propertyChange(PropertyChangeEvent e) {
-            String propertyName = e.getPropertyName();
-
-            if ("focusOwner" == propertyName) {
-                // Stop scrolling if no longer focus owner
-                if (e.getNewValue() == null && scrollTimer.isRunning()) {
-                    scrollTimer.stop();
-                    buttonListener.handledEvent = false;
-                    scrollbar.setValueIsAdjusting(false);
-                    if (incrButton.getModel().isPressed()) {
-                        incrButton.getModel().setPressed(false);
-                    } else if (decrButton.getModel().isPressed()) {
-                        decrButton.getModel().setPressed(false);
-                    }
-                }
-            }
-        }
-    }
-
     /**
      * A listener to listen for model changes.
      */
diff --git a/test/jdk/javax/swing/JComboBox/JComboBoxScrollFocusTest.java b/test/jdk/javax/swing/JComboBox/JComboBoxScrollFocusTest.java
deleted file mode 100644
index 4d2c3bd19ccfe..0000000000000
--- a/test/jdk/javax/swing/JComboBox/JComboBoxScrollFocusTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2024, 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.
- */
-
-import javax.swing.JComboBox;
-import javax.swing.JFrame;
-
-/*
- * @test
- * @bug 6672644
- * @library /java/awt/regtesthelpers
- * @build PassFailJFrame
- * @summary Tests JComboBox scrollbar behavior when alt-tabbing
- * @requires os.family != "mac"
- * @run main/manual JComboBoxScrollFocusTest
- */
-
-public class JComboBoxScrollFocusTest {
-    private static final String INSTRUCTIONS =
-            """
-             Click on the dropdown button for the JComboBox in the test frame.
-             Then, press and hold the left click button on the down arrow button
-             in the popup list. While holding the left click button, the list
-             should be scrolling down. Press ALT + TAB while holding down the
-             left click to switch focus to a different window. Then release the
-             left click button. Focus the test frame again and click the
-             dropdown button for the JComboBox again. The list should be
-             stationary and not be automatically scrolling.
-
-             If you are able to execute all steps successfully then the test
-             passes, otherwise it fails.
-            """;
-
-    public static void main(String[] args) throws Exception {
-        PassFailJFrame
-                .builder()
-                .title("JComboBoxScrollFocusTest Test Instructions")
-                .instructions(INSTRUCTIONS)
-                .columns(40)
-                .testUI(JComboBoxScrollFocusTest::createAndShowGUI)
-                .build()
-                .awaitAndCheck();
-    }
-
-    private static JFrame createAndShowGUI() {
-        JFrame frame = new JFrame("JComboBoxScrollFocusTest Test Frame");
-        JComboBox<String> combobox = new JComboBox<>();
-        for (int i = 0; i < 100; i++) {
-            combobox.addItem(String.valueOf(i));
-        }
-        frame.add(combobox);
-        frame.setSize(400, 200);
-        frame.setLocationRelativeTo(null);
-        return frame;
-    }
-}

From 64a68905f0afcbff4d4c84a695ca49d39503cc94 Mon Sep 17 00:00:00 2001
From: Damon Nguyen <damon.nguyen@oracle.com>
Date: Thu, 17 Apr 2025 09:34:35 -0700
Subject: [PATCH 2/2] Initial opening

---
 .../DrawEtchedRectTest.java                   |  77 ++++++++++++++++
 .../basic/BasicHTML/4228104/bug4228104.java   |  75 +++++++++++++++
 .../plaf/basic/BasicHTML/4228104/duke.gif     | Bin 0 -> 1929 bytes
 .../plaf/basic/BasicSliderUI/bug4220108.java  |  75 +++++++++++++++
 .../BasicSplitPaneUI/NegativeSizeTest.java    |  87 ++++++++++++++++++
 .../PreferredSizeLayoutTest.java              |  71 ++++++++++++++
 6 files changed, 385 insertions(+)
 create mode 100644 test/jdk/javax/swing/plaf/basic/BasicGraphicsUtils/DrawEtchedRectTest.java
 create mode 100644 test/jdk/javax/swing/plaf/basic/BasicHTML/4228104/bug4228104.java
 create mode 100644 test/jdk/javax/swing/plaf/basic/BasicHTML/4228104/duke.gif
 create mode 100644 test/jdk/javax/swing/plaf/basic/BasicSliderUI/bug4220108.java
 create mode 100644 test/jdk/javax/swing/plaf/basic/BasicSplitPaneUI/NegativeSizeTest.java
 create mode 100644 test/jdk/javax/swing/plaf/basic/BasicSplitPaneUI/PreferredSizeLayoutTest.java

diff --git a/test/jdk/javax/swing/plaf/basic/BasicGraphicsUtils/DrawEtchedRectTest.java b/test/jdk/javax/swing/plaf/basic/BasicGraphicsUtils/DrawEtchedRectTest.java
new file mode 100644
index 0000000000000..0c5c501596ce0
--- /dev/null
+++ b/test/jdk/javax/swing/plaf/basic/BasicGraphicsUtils/DrawEtchedRectTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 1999, 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 4198822
+ * @summary Tests that the bottom line drawn by
+ *          BasicGraphicsUtils.drawEtchedRect extends to the end.
+ * @run main DrawEtchedRectTest
+ */
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.io.File;
+
+import javax.imageio.ImageIO;
+import javax.swing.plaf.basic.BasicGraphicsUtils;
+
+import static java.awt.image.BufferedImage.TYPE_INT_ARGB;
+
+public class DrawEtchedRectTest {
+    private static final int WIDTH = 200;
+    private static final int HEIGHT = 200;
+    private static final int RANGE = 10;
+
+    public static void main(String[] args) throws Exception {
+        // Draw etched rectangle to a BufferedImage
+        BufferedImage image = new BufferedImage(WIDTH, HEIGHT, TYPE_INT_ARGB);
+        Graphics2D g2d = image.createGraphics();
+        Component sq = new Component() {
+            public void paint(Graphics g) {
+                g.setColor(Color.WHITE);
+                g.fillRect(0, 0, WIDTH, HEIGHT);
+                BasicGraphicsUtils.drawEtchedRect(g, 0, 0, WIDTH, HEIGHT,
+                        Color.black, Color.black,
+                        Color.black, Color.black);
+            }
+        };
+        sq.paint(g2d);
+        g2d.dispose();
+
+        // Check if connected at bottom-right corner
+        int c1;
+        int c2;
+        for (int i = 1; i < RANGE; i++) {
+            c1 = image.getRGB(WIDTH - i, HEIGHT - 1);
+            c2 = image.getRGB(WIDTH - 1, HEIGHT - i);
+            if (c1 == Color.WHITE.getRGB() || c2 == Color.WHITE.getRGB()) {
+                ImageIO.write(image, "png", new File("failImage.png"));
+                throw new RuntimeException("Bottom line is not connected!");
+            }
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/plaf/basic/BasicHTML/4228104/bug4228104.java b/test/jdk/javax/swing/plaf/basic/BasicHTML/4228104/bug4228104.java
new file mode 100644
index 0000000000000..451590c66abad
--- /dev/null
+++ b/test/jdk/javax/swing/plaf/basic/BasicHTML/4228104/bug4228104.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 1999, 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 4228104
+ * @summary Tests work of BODY BACKGROUND tag in HTML renderer
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4228104
+ */
+
+import java.awt.BorderLayout;
+
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+
+public class bug4228104 {
+    static final String INSTRUCTIONS = """
+        There should be an image displaying dukes under the rows of digits.
+        If you can see it, the test PASSES. Otherwise, the test FAILS.
+    """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4228104 Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(bug4228104::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static JFrame createUI() {
+        JFrame f = new JFrame("Background HTML Text Test");
+        String dir = System.getProperty("test.src",
+                System.getProperty("user.dir"));
+        String htmlText1 =
+                "<html><BODY BACKGROUND=\"file:" + dir
+                        + "/duke.gif\">\n" +
+                        "<br>111111111111111111" +
+                        "<br>111111111111111111" +
+                        "<br>111111111111111111" +
+                        "<br>111111111111111111" +
+                        "<br>111111111111111111" +
+                        "<br>111111111111111111" +
+                        "<br>111111111111111111" +
+                        "<br>111111111111111111" +
+                        "<br>111111111111111111";
+        JLabel button1 = new JLabel(htmlText1);
+        f.add(button1, BorderLayout.NORTH);
+        f.setSize(200, 200);
+        return f;
+    }
+}
diff --git a/test/jdk/javax/swing/plaf/basic/BasicHTML/4228104/duke.gif b/test/jdk/javax/swing/plaf/basic/BasicHTML/4228104/duke.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ed32e0ff79b05c07b82863ce6fb07fa9898adaa2
GIT binary patch
literal 1929
zcmWlYe^AtB8pi`HvM4_?{J2I$8$dLc1#@!R2zwgXMWdj^k;9xr+bDW&4{JlE8WpDj
z7F-cwwK{H<)?L&#SJz$!;hJ{%BY2FYf)Wp^xl?aq!5Xcdi$c#hV~>m9_n-Hl=Xsy+
z=li^?*Q~;pZ+R1N1J40KRkeWM7ew3~jLM24A{CM-A}~TzqzYpq&od0GC=z71!w_=b
z-==B0rt2t*nA}((5YSLs6a*Z@X__WqiSjTW6oLo{5k<iyeTpP`Xj)M<MUgp%2?T<&
zEc<*umSq6|@E|zH)SHIk^Kl4*XpV}2Kfs5B99xfJZie9$WsF5|P18smlV!;g!!V-2
zn;7GvJv`6jI4%f+q3MRMtBBhU04&Ry?69iHJVr~BEXguSkeaHPbby83IEreP<$yJU
zUlheKF9@O_%VRiB_&WpPU{I1ohN5YT;srhs3=%l*<5(0yJRT28;JU73xZ9-sh=ofO
zC8UBR2oqyvMa9cVnye6lJcePa^*oFUh*gad1Rf3q{k}GiWh9=bDcYp{0l%N#W}))v
zngM|j3_^-3V<^h`+f2-(Fe1w^o#%OqqEt;&Rh1(s6hSGH^mu3=*Jj!BFsxx=p(#a{
zd>m&|K1mGAimYjhs#wwZtvV8SV~7LCFpgub+-TTAk%UQb0dE_cj+pc?!+0o?qG$?%
zVFD)%!w7Z;g)ndE8Uk6<V}@y6RST^}gurmnZnvf(DH2JCKmedUR<bI~)LSksiqgQC
zkFD2r&57bBUZ-oC|3sVB0K-s{B%WaOuq+DUpePNis%#jhZfF!mYPt$R(D`7%43B|!
z5JgcKf><w05QN<p_ry`5O-!YO$bdMEAZW1DZ&I?Vjp2lwqQi!v`~4g|AF-N^$qHl#
zArPEE+=ihU`V<I)VL{f7DFsGNQ-?v&&{YNRF-^;sbzUjsg)IUA3IK<-jliov0obR3
z5AErM5bSTVC%;i83mHX;AEmGD^!Y!9i&OH~Pegazi8u<+zVef};QV(@3+rl=y~S`|
z+ro8g8RqC2>Aky=+kLaUQ{UW`XS?Nn*s@SQ{VmFgGdkV{&&98EcEQ5hjc@H$`e)fX
zj@&GdchxpMUo|-A^M4iBP3(#Ib53Ap?5{nGT7SBA_V!o!TTzL5R~FUWe)4X?@iTd8
z1;TcF^rQLj?4p0uy?@ikb2eUSXdHVa_jIn=@W%a<6~57D>am6&Z!{lzc=@ZbuGB8`
zpU38H8d~@82Da!+qdYG5ls&Cx?~|oPMnbqTHMw%I*KlV~?fc{rSwe29?Om}fsknG#
z@n5IwY=4Mx>>0WJLG>=<wJkri44ypnpphB8Uld;%avo>yJX^WbHA30iQ$H!X)3<4K
zBe1|sf3NKKTS;)mg{$k(2eDJG^u5=&x{@M!V>EWgzRA((>}?o{WQBehp1mIHU!BGG
zYz5<PKM7?P;Z-hqMg0IYKD)fC2`{Qp#c}*PGuiCeFF{$a-|!Y+O|%`1xO+TuJHvs+
z!1C+`E#58;vh@yJz_0U+cV7L#qqcmRn>_6B(+KIVdCVoum2ItM&gXZd+SB^vQTN=a
zeYbbah=i-xCho2{4Pazv_i%2mH`EkM{r8XYDLbdY@(a7Ud}$%!$QrTN_DqwNXA9~g
zTGKxKyfto7NDp;5A3O5zgb(hyxjN@OAG!(zy^*Ug4!yjF=Y*8aHA@ovB1({&a4;sR
zTf1CVC{>Pgy`m$lG;P1$pC_6F7u%iP+qz0q4{lXT`i9g-ThiYgO^GXC`f?JNo*|@p
zr{b%U-tSKw99q0|YJa9{Va?`H{IaNICo>p5lGEY*+IDR4bfIUwq~CTRuC_mGWA%~W
zea{@eKJ(Iq^7MvdsPsR%&vt$@4i&s?bPptz#y#!FcRZEaMS0WFTyXMCUEfsNxnJ_9
zPwpt`Er4O>``2G{7=4r1GCSTO8#0xw+{<^L4X(K8y1wKj72KLrYD}Y7SJuY7y==wf
z;UkI5?(v?h+4r;vR{P*U`ul~=D@U7K5$eV8c!%rX-38vE>azU80<AIk)4^ZMA4h%d
z5`SBK>UrhFXCv#d`(ylZS4+i2a^vI91MTIxCx%9gd2&N&D9RC&xcpx8#f=GZv%9;F
z#?CEVT%UV$nk;L%RJA+d=f8ZB@U*Xz-TZbG?HKKT(VJZMBH!)$#qRuwbFc%Aljqha
zoNBs8od~V$_^vux0ZSk!iP!hI($t35SxY8`FV{pxCjpU}Ova2VIg1&>V)CvvMb_<X
z*!90jAmdxX*61uwt)25(Zl?WYIZ?giXCx*AssPawSuMAqE&Kk&(6i1)O9?Y0{+^5f
zcvyY9Exx4lRLZK4!424O^*=mi`)(<=O_!Qt<0GytnAp*ry3G^6+<z!VQo)p${W~9E
qB`qX3%gt72dTDs6HxP=`*JKL3Yrz%GU6VaOi8dNCzDWUr!v6!a5RWVX

literal 0
HcmV?d00001

diff --git a/test/jdk/javax/swing/plaf/basic/BasicSliderUI/bug4220108.java b/test/jdk/javax/swing/plaf/basic/BasicSliderUI/bug4220108.java
new file mode 100644
index 0000000000000..94cc3d65e5d17
--- /dev/null
+++ b/test/jdk/javax/swing/plaf/basic/BasicSliderUI/bug4220108.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2000, 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 4220108
+ * @summary JSlider in JInternalFrame should be painted correctly
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4220108
+ */
+
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+
+import javax.swing.JDesktopPane;
+import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
+import javax.swing.JLabel;
+import javax.swing.JSlider;
+
+public class bug4220108 {
+    static final String INSTRUCTIONS = """
+        If you see a slider in the internal frame, then the test PASSES.
+        Otherwise the test FAILS.
+    """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4220108 Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(bug4220108::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static JFrame createUI() {
+        JFrame f = new JFrame("Internal Frame Slider Test");
+        f.setLayout(new FlowLayout());
+        JDesktopPane desktop = new JDesktopPane();
+        f.setContentPane(desktop);
+
+        JInternalFrame iFrame =
+                new JInternalFrame("Slider Frame", true, true, true, true);
+        JSlider sl = new JSlider();
+        iFrame.add(sl);
+        iFrame.add(new JLabel("Label"), BorderLayout.SOUTH);
+        desktop.add(iFrame);
+        iFrame.pack();
+        iFrame.setVisible(true);
+        f.setSize(300, 200);
+        return f;
+    }
+}
diff --git a/test/jdk/javax/swing/plaf/basic/BasicSplitPaneUI/NegativeSizeTest.java b/test/jdk/javax/swing/plaf/basic/BasicSplitPaneUI/NegativeSizeTest.java
new file mode 100644
index 0000000000000..3a461410e4b5e
--- /dev/null
+++ b/test/jdk/javax/swing/plaf/basic/BasicSplitPaneUI/NegativeSizeTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 1999, 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 4199666
+ * @summary Makes sure initial negative size of a component does not confuse
+ *          JSplitPane.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual NegativeSizeTest
+ */
+
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JSplitPane;
+
+public class NegativeSizeTest {
+    static final String INSTRUCTIONS = """
+        Click on the 'Show JSplitPane' button. If two buttons appear,
+        click PASS, otherwise click FAIL.
+    """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("NegativeSizeTest Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(NegativeSizeTest::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static JFrame createUI() {
+        JFrame f = new JFrame("Negative Size Test");
+        CardLayout cardLayout = new CardLayout();
+        JPanel mainPanel = new JPanel(cardLayout);
+
+        JSplitPane splitPane = new JSplitPane();
+        splitPane.setContinuousLayout(true);
+        JPanel splitContainer = new JPanel(new BorderLayout());
+        splitContainer.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+        splitContainer.add(splitPane, BorderLayout.CENTER);
+
+        if (false) {
+            mainPanel.add(splitContainer, "split");
+            mainPanel.add(new JPanel(), "blank");
+        }
+        else {
+            mainPanel.add(new JPanel(), "blank");
+            mainPanel.add(splitContainer, "split");
+        }
+
+        f.add(mainPanel, BorderLayout.CENTER);
+
+        JButton button = new JButton("Show JSplitPane");
+        button.addActionListener(e -> cardLayout.show(mainPanel, "split"));
+        f.add(button, BorderLayout.SOUTH);
+        f.setSize(400, 300);
+        return f;
+    }
+}
diff --git a/test/jdk/javax/swing/plaf/basic/BasicSplitPaneUI/PreferredSizeLayoutTest.java b/test/jdk/javax/swing/plaf/basic/BasicSplitPaneUI/PreferredSizeLayoutTest.java
new file mode 100644
index 0000000000000..76d0e45b8eb57
--- /dev/null
+++ b/test/jdk/javax/swing/plaf/basic/BasicSplitPaneUI/PreferredSizeLayoutTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 1999, 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 4208549
+ * @summary Makes sure preferred size returned by layout managers used by
+ *          JSplitPane is correct.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual PreferredSizeLayoutTest
+ */
+
+import java.awt.Container;
+import java.awt.FlowLayout;
+
+import javax.swing.JFrame;
+import javax.swing.JSplitPane;
+
+public class PreferredSizeLayoutTest {
+    static final String INSTRUCTIONS = """
+        If the buttons in the JSplitpanes do not have '...' in them,
+        click PASS, otherwise click FAIL.
+    """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("PreferredSizeLayoutTest Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(PreferredSizeLayoutTest::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static JFrame createUI() {
+        JFrame f = new JFrame("Preferred Size Layout Test");
+        Container parent = f.getContentPane();
+        JSplitPane sp = new JSplitPane();
+
+        parent.setLayout(new FlowLayout());
+
+        sp.setOrientation(JSplitPane.HORIZONTAL_SPLIT);
+        parent.add(sp);
+        sp = new JSplitPane();
+        sp.setOrientation(JSplitPane.VERTICAL_SPLIT);
+        parent.add(sp);
+        f.setSize(400, 300);
+        return f;
+    }
+}