Backport d1026720d323d0acd9bd8d85d5caba7185107863

GoeLin · Nov 7, 2023 · a0a04ff · a0a04ff
1 parent 59c5b84
commit a0a04ff
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/test/jdk/java/awt/print/PrinterJob/ImagePrinting/PrintARGBImage.java b/test/jdk/java/awt/print/PrinterJob/ImagePrinting/PrintARGBImage.java
@@ -53,6 +53,7 @@ public static void main(String[] args) throws InterruptedException,
                     "The test passes if the text shows through the rectangular image.\n";
 
             PassFailJFrame passFailJFrame = new PassFailJFrame(instruction, 10);
+            PassFailJFrame.positionTestWindow(null, PassFailJFrame.Position.HORIZONTAL);
             try {
                 PrinterJob pj = PrinterJob.getPrinterJob();
                 pj.setPrintable(new PrintARGBImage());

diff --git a/test/jdk/java/awt/print/PrinterJob/PageRangesDlgTest.java b/test/jdk/java/awt/print/PrinterJob/PageRangesDlgTest.java
@@ -81,6 +81,7 @@ public static void main(String[] args) throws Exception {
                 ;
 
         PassFailJFrame passFailJFrame = new PassFailJFrame(instruction, 10);
+        PassFailJFrame.positionTestWindow(null, PassFailJFrame.Position.HORIZONTAL);
         showPrintDialogs();
         passFailJFrame.awaitAndCheck();
     }

diff --git a/test/jdk/javax/swing/ProgressMonitor/ProgressTest.java b/test/jdk/javax/swing/ProgressMonitor/ProgressTest.java
@@ -22,32 +22,29 @@
  */
 
 /* @test
- * @bug 8054572
+ * @bug 6445283
  * @library /java/awt/regtesthelpers
  * @build PassFailJFrame
- * @summary Tests if JComboBox displays correctly when editable/non-editable
+ * @summary Tests if ProgressMonitorInputStream reports progress accurately
  * @run main/manual ProgressTest
  */
 
 import java.io.InputStream;
 
-import javax.swing.JFrame;
 import javax.swing.ProgressMonitorInputStream;
-import javax.swing.SwingUtilities;
 
 public class ProgressTest {
 
     private static final String instructionsText =
-            "A ProgressMonitor will be shown." +
-            " If it shows blank progressbar after 2048MB bytes read,"+
+            "A ProgressMonitor will be shown.\n" +
+            " If it shows blank progressbar after 2048MB bytes read,\n"+
             " press Fail else press Pass";
 
-    private static JFrame frame;
-
     public static void main(String[] args) throws Exception {
 
         PassFailJFrame pfjFrame = new PassFailJFrame("JScrollPane "
                 + "Test Instructions", instructionsText, 5);
+        PassFailJFrame.positionTestWindow(null, PassFailJFrame.Position.VERTICAL);
 
         final long SIZE = (long) (Integer.MAX_VALUE * 1.5);
 
@@ -85,6 +82,7 @@ public void run() {
             }
         };
         thread.start();
+
         pfjFrame.awaitAndCheck();
     }
 }