diff --git a/test/jdk/javax/swing/JToolTip/4644444/bug4644444.html b/test/jdk/javax/swing/JToolTip/4644444/bug4644444.html
deleted file mode 100644
index b7e9bcb03fe85..0000000000000
--- a/test/jdk/javax/swing/JToolTip/4644444/bug4644444.html
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
- bug4644444
-
-
-
-bug4644444
Bug ID: 4644444
-
- See the dialog box (usually in upper left corner) for instructions
-
-
-
-
diff --git a/test/jdk/javax/swing/JToolTip/4644444/bug4644444.java b/test/jdk/javax/swing/JToolTip/4644444/bug4644444.java
deleted file mode 100644
index 124c565a9cbd6..0000000000000
--- a/test/jdk/javax/swing/JToolTip/4644444/bug4644444.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- * Copyright (c) 2001, 2015, 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 java.awt.*;
-import javax.swing.*;
-import java.awt.event.*;
-
-/*
- * test
- * @bug 4644444 8076246
-*/
-
-public class bug4644444 extends JApplet {
-
- JPanel panel;
- JButton button;
-
- public bug4644444() throws Exception {
- java.awt.EventQueue.invokeLater( () -> {
- panel = new JPanel();
- button = new JButton("whooo");
- button.setToolTipText("Somthing really long 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890");
- panel.add(button);
- getContentPane().add(panel);
- });
- }
-
- public void init() {
- String[][] instructionsSet =
- {
- {
- " Note : Incase of Assertion failure,user can enter",
- " remarks by pressing 'Assertion Fail Remarks ' button",
- " ",
- " You would see a testframe with a Button",
- " ",
- " ON ALL PLATFORMS",
- "1. Move the mouse on the button, ",
- " so that the tooltip attached to it comes up ",
- "2. Tool tip should get adjusted it-self to show ",
- " its full length of text. ",
- "3. If tooltip text gets cut, ",
- " press 'Assertion Fail' else press 'Assertion Pass'",
- "4. Similarly, move the applet to different locations of the screen, ",
- " & see if tooltip works properly everywhere. "
- }
- };
-
- String[] exceptionsSet =
- {
- "JToolTip is shown partially when placed very close to screen boundaries",
- };
-
- Sysout.setInstructionsWithExceptions(instructionsSet,exceptionsSet);
-
- }
-
- public void start (){}
-
- public void destroy(){
- if(Sysout.failStatus()) {
- String failMsg = Sysout.getFailureMessages();
- failMsg = failMsg.replace('\n',' ');
- throw new RuntimeException(failMsg);
- }// End destroy
- }
-}
-
-
-/****************************************************
- Standard Test Machinery
- DO NOT modify anything below -- it's a standard
- chunk of code whose purpose is to make user
- interaction uniform, and thereby make it simpler
- to read and understand someone else's test.
- ****************************************************/
-
-/**
- This is part of the standard test machinery.
- It creates a dialog (with the instructions), and is the interface
- for sending text messages to the user.
- To print the instructions, send an array of strings to Sysout.createDialog
- WithInstructions method. Put one line of instructions per array entry.
- To display a message for the tester to see, simply call Sysout.println
- with the string to be displayed.
- This mimics System.out.println but works within the test harness as well
- as standalone.
- */
-
-class Sysout
- {
- private static TestDialog dialog;
-
- public static void createDialogWithInstructions( String[] instructions )
- {
- dialog = new TestDialog( new Frame(), "Instructions" );
- dialog.printInstructions( instructions );
- dialog.show();
- println( "Any messages for the tester will display here." );
- }
-
- public static void createDialog( )
- {
- dialog = new TestDialog( new Frame(), "Instructions" );
- String[] defInstr = { "Instructions will appear here. ", "" } ;
- dialog.printInstructions( defInstr );
- dialog.show();
- println( "Any messages for the tester will display here." );
- }
-
-
- public static void printInstructions( String[] instructions )
- {
- dialog.printInstructions( instructions );
- }
-
-
- public static void println( String messageIn )
- {
- dialog.displayMessage( messageIn );
- }
-
- public static void setInstructionsWithExceptions(String instructionsSet[][],
- String exceptionsSet[]) {
- createDialogWithInstructions(instructionsSet[0]);
- dialog.setInstructions(instructionsSet);
- dialog.setExceptionMessages(exceptionsSet);
- }
-
- public static String getFailureMessages() {
- return dialog.failureMessages;
- }
-
- public static boolean failStatus() {
- return dialog.failStatus;
- }
-
- }// Sysout class
-
-/**
- This is part of the standard test machinery. It provides a place for the
- test instructions to be displayed, and a place for interactive messages
- to the user to be displayed.
- To have the test instructions displayed, see Sysout.
- To have a message to the user be displayed, see Sysout.
- Do not call anything in this dialog directly.
- */
-class TestDialog extends Dialog
- {
-
- TextArea instructionsText;
- TextArea messageText;
- int maxStringLength = 70;
-
- Panel assertPanel;
- Button assertPass,assertFail,remarks;
- HandleAssert handleAssert;
- boolean failStatus=false;
- int instructionCounter=0;
- String instructions[][];
- int exceptionCounter=0;
- String exceptionMessages[];
- String failureMessages="
";
- String remarksMessage=null;
- RemarksDialog remarksDialog;
-
- //DO NOT call this directly, go through Sysout
- public TestDialog( Frame frame, String name )
- {
- super( frame, name );
- int scrollBoth = TextArea.SCROLLBARS_BOTH;
- instructionsText = new TextArea( "", 14, maxStringLength, scrollBoth );
- add( "North", instructionsText );
-
- messageText = new TextArea( "", 3, maxStringLength, scrollBoth );
- add("Center", messageText);
-
- assertPanel = new Panel(new FlowLayout());
- assertPass=new Button("Assertion Pass");
- assertPass.setName("Assertion Pass");
- assertFail=new Button("Assertion Fail");
- assertFail.setName("Assertion Fail");
- remarks = new Button("Assertion Fail Remarks");
- remarks.setEnabled(false);
- remarks.setName("Assertion Remarks");
- assertPanel.add(assertPass);
- assertPanel.add(assertFail);
- assertPanel.add(remarks);
- handleAssert = new HandleAssert();
- assertPass.addActionListener(handleAssert);
- assertFail.addActionListener(handleAssert);
- remarks.addActionListener(handleAssert);
- add("South",assertPanel);
- pack();
-
- show();
- }// TestDialog()
-
- //DO NOT call this directly, go through Sysout
- public void printInstructions( String[] instructions )
- {
- //Clear out any current instructions
- instructionsText.setText( "" );
-
- //Go down array of instruction strings
-
- String printStr, remainingStr;
- for( int i=0; i < instructions.length; i++ )
- {
- //chop up each into pieces maxSringLength long
- remainingStr = instructions[ i ];
- while( remainingStr.length() > 0 )
- {
- //if longer than max then chop off first max chars to print
- if( remainingStr.length() >= maxStringLength )
- {
- //Try to chop on a word boundary
- int posOfSpace = remainingStr.
- lastIndexOf( ' ', maxStringLength - 1 );
-
- if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
-
- printStr = remainingStr.substring( 0, posOfSpace + 1 );
- remainingStr = remainingStr.substring( posOfSpace + 1 );
- }
- //else just print
- else
- {
- printStr = remainingStr;
- remainingStr = "";
- }
-
- instructionsText.append( printStr + "\n" );
-
- }// while
-
- }// for
-
- }//printInstructions()
-
- //DO NOT call this directly, go through Sysout
- public void displayMessage( String messageIn )
- {
- messageText.append( messageIn + "\n" );
- }
-
- public void emptyMessage() {
- messageText.setText("");
- }
-
- public void setInstructions(String insStr[][]) {
- instructions=insStr;
- }
-
- public void setExceptionMessages(String exceptionMessages[]) {
- this.exceptionMessages=exceptionMessages;
- }
-
- class HandleAssert implements ActionListener {
- public void actionPerformed(ActionEvent ae) {
- if(ae.getSource()==remarks) {
- remarksDialog = new RemarksDialog(TestDialog.this,
- "Assertion Remarks Dialog",true);
- remarks.setEnabled(false);
- if(remarksMessage!=null)
- failureMessages+=". User Remarks : "+remarksMessage;
- }
- else {
- if(instructionCounter"+
- exceptionMessages[exceptionCounter];
- }
- }
- exceptionCounter++;
- }
- }
- }
-
- class RemarksDialog extends Dialog implements ActionListener{
- Panel rootPanel,remarksPanel;
- TextArea textarea;
- Button addRemarks,cancelRemarks;
- public RemarksDialog(Dialog owner,String title,boolean modal) {
- super(owner,title,modal);
- rootPanel = new Panel(new BorderLayout());
- remarksPanel = new Panel(new FlowLayout());
- textarea = new TextArea(5,30);
- addRemarks=new Button("Add Remarks");
- addRemarks.addActionListener(this);
- cancelRemarks = new Button("Cancel Remarks");
- cancelRemarks.addActionListener(this);
- remarksPanel.add(addRemarks);
- remarksPanel.add(cancelRemarks);
- rootPanel.add(textarea,"Center");
- rootPanel.add(remarksPanel,"South");
- add(rootPanel);
- setBounds(150,150,400,200);
- setVisible(true);
- }
-
- public void actionPerformed(ActionEvent ae) {
- remarksMessage=null;
- if(ae.getSource()==addRemarks) {
- String msg = textarea.getText().trim();
- if (msg.length()>0)
- remarksMessage=msg;
- }
- dispose();
- }
-
- }
-
-}// TestDialog class
diff --git a/test/jdk/javax/swing/JToolTip/bug4644444.java b/test/jdk/javax/swing/JToolTip/bug4644444.java
new file mode 100644
index 0000000000000..2921ecf0da5cc
--- /dev/null
+++ b/test/jdk/javax/swing/JToolTip/bug4644444.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2001, 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.JButton;
+import javax.swing.JFrame;
+
+/*
+ * @test
+ * @bug 4644444 8076246
+ * @summary JToolTip is shown improperly when placed very close to screen boundaries
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4644444
+ */
+
+public class bug4644444 {
+
+ private static final String INSTRUCTIONS = """
+ 1. Move the mouse on the button, so that the tooltip is visible.
+ 2. Tooltip should get adjusted itself to show its full length of text.
+ 3. Similarly, move the frame to different locations of the screen
+ & see if tooltip works properly everywhere.
+ 4. Press 'Pass' if tooltip text is fully visible else press 'Fail'. """;
+
+ public static void main(String[] args) throws Exception {
+ PassFailJFrame.builder()
+ .title("JToolTip Instructions")
+ .instructions(INSTRUCTIONS)
+ .testUI(bug4644444::createUI)
+ .build()
+ .awaitAndCheck();
+ }
+
+ private static JFrame createUI() {
+ JFrame frame = new JFrame("bug4644444");
+ JButton button = new JButton("Button");
+ button.setToolTipText("Something really long 1234567890 1234567890 " +
+ "1234567890 1234567890 1234567890 1234567890 1234567890 1234567890");
+ frame.getContentPane().add(button);
+ frame.setSize(200, 80);
+ return frame;
+ }
+}