changeset in /hg/icedtea6: 2009-03-31 Omair Majid <omajid at redh...

[Omair Majid]

changeset a537113b9d22 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a537113b9d22
description:
	2009-03-31  Omair Majid  <omajid at redhat.com>

	    * patches/icedtea-jtreg-printjob-multiple-end.patch: New patch. Dont
	    require any user interaction for test.
	    * Makefile.am (ICEDTEA_PATCHES): Apply the above.
	    * HACKING: Document the above.

diffstat:

4 files changed, 46 insertions(+)
ChangeLog                                         |    7 +++
HACKING                                           |    1 
Makefile.am                                       |    1 
patches/icedtea-jtreg-printjob-multiple-end.patch |   37 +++++++++++++++++++++

diffs (77 lines):

diff -r 4d01a6a212bd -r a537113b9d22 ChangeLog
--- a/ChangeLog	Mon Mar 30 14:43:28 2009 -0400
+++ b/ChangeLog	Tue Mar 31 14:03:24 2009 -0400
@@ -1,3 +1,10 @@ 2009-03-30  Omair Majid  <omajid at redhat.
+2009-03-31  Omair Majid  <omajid at redhat.com>
+
+	* patches/icedtea-jtreg-printjob-multiple-end.patch: New patch. Dont
+	require any user interaction for test.
+	* Makefile.am (ICEDTEA_PATCHES): Apply the above.
+	* HACKING: Document the above.
+
 2009-03-30  Omair Majid  <omajid at redhat.com>
 
 	* patches/icedtea-jtreg-colortest.patch: New patch. Remove the 
diff -r 4d01a6a212bd -r a537113b9d22 HACKING
--- a/HACKING	Mon Mar 30 14:43:28 2009 -0400
+++ b/HACKING	Tue Mar 31 14:03:24 2009 -0400
@@ -90,6 +90,7 @@ The following patches are currently appl
 * icedtea-jtreg-hatrun.patch: Fix jhat test by passing the classpath to the new jvm in HatRun.java.
 * icedtea-jtreg-dnd.patch: Fix classpath issues in java/awt/dnd/FileListBetweenJVMsTest.
 * icedtea-jtreg-colortest.patch: Remove call to System.exit() that was causing SystemBgColorTest to fail.
+* icedtea-jtreg-printjob-multiple-end.patch: Fix test to not require any user interaction.
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
diff -r 4d01a6a212bd -r a537113b9d22 Makefile.am
--- a/Makefile.am	Mon Mar 30 14:43:28 2009 -0400
+++ b/Makefile.am	Tue Mar 31 14:03:24 2009 -0400
@@ -689,6 +689,7 @@ ICEDTEA_PATCHES += \
 	patches/icedtea-jtreg-hatrun.patch \
 	patches/icedtea-jtreg-dnd.patch \
 	patches/icedtea-jtreg-colortest.patch \
+	patches/icedtea-jtreg-printjob-multiple-end.patch \
 	$(DISTRIBUTION_PATCHES)
 
 stamps/extract.stamp: stamps/download.stamp
diff -r 4d01a6a212bd -r a537113b9d22 patches/icedtea-jtreg-printjob-multiple-end.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-jtreg-printjob-multiple-end.patch	Tue Mar 31 14:03:24 2009 -0400
@@ -0,0 +1,37 @@
+--- openjdk/jdk/test/java/awt/PrintJob/MultipleEnd/MultipleEnd.java.orig	2009-03-31 13:29:02.000000000 -0400
++++ openjdk/jdk/test/java/awt/PrintJob/MultipleEnd/MultipleEnd.java	2009-03-31 13:39:50.000000000 -0400
+@@ -30,13 +30,17 @@
+  */
+ 
+ import java.awt.*;
++import java.awt.JobAttributes.DialogType;
+ 
+ public class MultipleEnd {
+     public static void main(String[] args) {
+         new MultipleEnd().start();
+     }
+     public void start() {
+-        new MultipleEndFrame();
++        Frame f = new MultipleEndFrame();
++        
++        // cleanup
++        f.dispose();
+     }
+ }
+ 
+@@ -44,10 +48,14 @@
+     public MultipleEndFrame() {
+         super("MultipleEnd");
+         setVisible(true);
+-        PrintJob pj  = getToolkit().getPrintJob(this, "MuiltipleEnd", null);
++        JobAttributes printJobAttributes = new JobAttributes();
++        printJobAttributes.setDialog(DialogType.NONE);
++        PrintJob pj  = getToolkit().getPrintJob(this, "MuiltipleEnd", printJobAttributes, null);
+         if (pj != null) {
+             pj.end();
+             pj.end();
++        } else {
++            throw new RuntimeException("getPrintJob returned null");
+         }
+     }
+ }