diff --git a/test/jdk/java/awt/datatransfer/HTMLDataFlavors/ManualHTMLDataFlavorTest.html b/test/jdk/java/awt/datatransfer/HTMLDataFlavors/ManualHTMLDataFlavorTest.html deleted file mode 100644 index 0a444d5b8ea..00000000000 --- a/test/jdk/java/awt/datatransfer/HTMLDataFlavors/ManualHTMLDataFlavorTest.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - -
-See the dialog box (usually in upper left corner) for instructions
- - - - diff --git a/test/jdk/java/awt/datatransfer/HTMLDataFlavors/ManualHTMLDataFlavorTest.java b/test/jdk/java/awt/datatransfer/HTMLDataFlavors/ManualHTMLDataFlavorTest.java index bd1ea752edb..4e875461ba2 100644 --- a/test/jdk/java/awt/datatransfer/HTMLDataFlavors/ManualHTMLDataFlavorTest.java +++ b/test/jdk/java/awt/datatransfer/HTMLDataFlavors/ManualHTMLDataFlavorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 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 @@ -22,24 +22,32 @@ */ /* - test + @test @bug 7075105 @summary WIN: Provide a way to format HTML on drop - @author Denis Fokin: area=datatransfer - @run applet/manual=yesno ManualHTMLDataFlavorTest + @library /java/awt/regtesthelpers + @run main/manual ManualHTMLDataFlavorTest */ -import java.applet.Applet; -import java.awt.*; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.Panel; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; import java.awt.datatransfer.UnsupportedFlavorException; -import java.awt.dnd.*; +import java.awt.dnd.DnDConstants; +import java.awt.dnd.DropTarget; +import java.awt.dnd.DropTargetDragEvent; +import java.awt.dnd.DropTargetDropEvent; +import java.awt.dnd.DropTargetEvent; +import java.awt.dnd.DropTargetListener; import java.io.IOException; -public class ManualHTMLDataFlavorTest extends Applet { +public class ManualHTMLDataFlavorTest { - class DropPane extends Panel implements DropTargetListener { + static class DropPane extends Panel implements DropTargetListener { DropPane() { requestFocus(); @@ -49,7 +57,7 @@ public class ManualHTMLDataFlavorTest extends Applet { @Override public Dimension getPreferredSize() { - return new Dimension(200,200); + return new Dimension(400, 400); } @Override @@ -73,15 +81,15 @@ public class ManualHTMLDataFlavorTest extends Applet { @Override public void drop(DropTargetDropEvent dtde) { if (!dtde.isDataFlavorSupported(DataFlavor.allHtmlFlavor)) { - Sysout.println("DataFlavor.allHtmlFlavor is not present in the system clipboard"); + ManualHTMLDataFlavorTest.log("DataFlavor.allHtmlFlavor is not present in the system clipboard"); dtde.rejectDrop(); return; } else if (!dtde.isDataFlavorSupported(DataFlavor.fragmentHtmlFlavor)) { - Sysout.println("DataFlavor.fragmentHtmlFlavor is not present in the system clipboard"); + ManualHTMLDataFlavorTest.log("DataFlavor.fragmentHtmlFlavor is not present in the system clipboard"); dtde.rejectDrop(); return; } else if (!dtde.isDataFlavorSupported(DataFlavor.selectionHtmlFlavor)) { - Sysout.println("DataFlavor.selectionHtmlFlavor is not present in the system clipboard"); + ManualHTMLDataFlavorTest.log("DataFlavor.selectionHtmlFlavor is not present in the system clipboard"); dtde.rejectDrop(); return; } @@ -90,12 +98,13 @@ public class ManualHTMLDataFlavorTest extends Applet { Transferable t = dtde.getTransferable(); try { - Sysout.println("ALL:"); - Sysout.println(t.getTransferData(DataFlavor.allHtmlFlavor).toString()); - Sysout.println("FRAGMENT:"); - Sysout.println(t.getTransferData(DataFlavor.fragmentHtmlFlavor).toString()); - Sysout.println("SELECTION:"); - Sysout.println(t.getTransferData(DataFlavor.selectionHtmlFlavor).toString()); + ManualHTMLDataFlavorTest.log("ALL:"); + ManualHTMLDataFlavorTest.log(t.getTransferData(DataFlavor.allHtmlFlavor).toString()); + t.getTransferData(DataFlavor.allHtmlFlavor).toString(); + ManualHTMLDataFlavorTest.log("FRAGMENT:"); + ManualHTMLDataFlavorTest.log(t.getTransferData(DataFlavor.fragmentHtmlFlavor).toString()); + ManualHTMLDataFlavorTest.log("SELECTION:"); + ManualHTMLDataFlavorTest.log(t.getTransferData(DataFlavor.selectionHtmlFlavor).toString()); } catch (UnsupportedFlavorException | IOException e) { e.printStackTrace(); } @@ -103,189 +112,49 @@ public class ManualHTMLDataFlavorTest extends Applet { } } - public void init() { + static final String INSTRUCTIONS = """ + 1) The test contains a drop-aware panel with a red background. + 2) Open some page in a browser, select some text. + Drag and drop it on the red panel. + IMPORTANT NOTE: the page should be stored locally. + Otherwise for instance Internet Explorer may prohibit drag and drop from + the browser to other applications because of protected mode restrictions. + On MacOS do NOT use Safari, it does not provide the needed DataFlavor. + 3) Check the data in the output area of this window. + 5) The output should not contain information that any of + flavors is not present in the system clipboard. + 6) The output should contain data in three different formats + provided by the system clipboard. + - Data after the "ALL:" marker should include the data + from the "SELECTION:" marker". + - Data after the "FRAGMENT" marker should include the data + from the "SELECTION:" marker and may be some closing + tags could be added to the mark-up. + - Data after the "SELECTION:" marker should correspond + to the data selected in the browser. + 7) If the above requirements are met, the test is passed. + """; - String[] instructions = - { - "1) The test contains a drop-aware panel with a red background", - "2) Open some page in a browser, select some text", - " Drag and drop it on the red panel", - " IMPORTANT NOTE: the page should be stored locally.", - " otherwise for instance iexplore can prohibit drag and drop from", - " the browser to other applications because of", - " the protected mode restrictions.", - " On Mac OS X do NOT use Safari, it does not provide the needed DataFlavor", - "3) Check the data in the output area of this dialog", - "5) The output should not contain information that any of", - " flavors is not present in the system clipboard", - "6) The output should contain data in three different formats", - " provided by the system clipboard", - " - Data after the \"ALL:\" marker should include the data", - " from the \"SELECTION:\" marker", - " - Data after the \"FRAGMENT\" marker should include the data", - " from the \"SELECTION:\" marker and may be some closing", - " tags could be added to the mark-up", - " - Data after the \"SELECTION:\" marker should correspond", - " to the data selected in the browser", - "7) If the above requirements are met, the test is passed" - }; - - add(new DropPane()); - Sysout.createDialogWithInstructions( instructions ); - - new ManualHTMLDataFlavorTest(); + static Frame createDropWindow() { + Frame frame = new Frame("Manual HTML DataFlavor Test"); + frame.add(new DropPane()); + frame.setAlwaysOnTop(true); + frame.pack(); + return frame; } - public void start () - { - setSize (200,200); - setVisible(true); - validate(); - - }// start() + static void log(String msg) { + PassFailJFrame.log(msg); + } + public static void main(String[] args) throws Exception { + PassFailJFrame.builder() + .instructions(INSTRUCTIONS) + .rows(25) + .columns(50) + .testUI(ManualHTMLDataFlavorTest::createDropWindow) + .logArea() + .build() + .awaitAndCheck(); + } } - - -/* Place other classes related to the test after this line */ - - - - - -/**************************************************** - 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.setVisible(true); - 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.setVisible(true); - 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 ); - } - -}// 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 = 80; - - //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( "", 15, maxStringLength, scrollBoth ); - add( "North", instructionsText ); - - messageText = new TextArea( "", 5, maxStringLength, scrollBoth ); - add("Center", messageText); - - pack(); - - setVisible(true); - }// 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" ); - System.out.println(messageIn); - } - -}// TestDialog class