/hg/gfx-test: * src/org/gfxtest/framework/GfxTest.java:
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Mon May 7 05:50:21 PDT 2012
changeset cc3e62406976 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=cc3e62406976
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Mon May 07 14:53:02 2012 +0200
* src/org/gfxtest/framework/GfxTest.java:
Rasterization phase is started when each print job finishes
- it allows us to simply compare raster images as a product
of print tests.
* src/org/gfxtest/framework/PrintJobWatcher.java:
Class which checks when print job finishes.
* Makefile: Updated
diffstat:
ChangeLog | 10 +
Makefile | 2 +-
src/org/gfxtest/framework/GfxTest.java | 75 ++++++++++-
src/org/gfxtest/framework/PrintJobWatcher.java | 148 +++++++++++++++++++++++++
4 files changed, 223 insertions(+), 12 deletions(-)
diffs (303 lines):
diff -r e1207eaf717b -r cc3e62406976 ChangeLog
--- a/ChangeLog Fri May 04 14:40:21 2012 +0200
+++ b/ChangeLog Mon May 07 14:53:02 2012 +0200
@@ -1,3 +1,13 @@
+2012-05-07 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * src/org/gfxtest/framework/GfxTest.java:
+ Rasterization phase is started when each print job finishes
+ - it allows us to simply compare raster images as a product
+ of print tests.
+ * src/org/gfxtest/framework/PrintJobWatcher.java:
+ Class which checks when print job finishes.
+ * Makefile: Updated
+
2012-05-04 Pavel Tisnovsky <ptisnovs at redhat.com>
* postscript_renderer.properties:
diff -r e1207eaf717b -r cc3e62406976 Makefile
--- a/Makefile Fri May 04 14:40:21 2012 +0200
+++ b/Makefile Mon May 07 14:53:02 2012 +0200
@@ -94,7 +94,7 @@
$(CLASSES)/$(FRAMEWORK_DIR)/ProceduralTextureFactory.class \
$(CLASSES)/$(FRAMEWORK_DIR)/ImageFactory.class \
$(CLASSES)/$(FRAMEWORK_DIR)/PostScriptToPngConverter.class \
- $(CLASSES)/$(FRAMEWORK_DIR)/PrintingTest.class \
+ $(CLASSES)/$(FRAMEWORK_DIR)/PrintJobWatcher.class \
$(CLASSES)/$(IMAGE_DIFFER_DIR)/ComparisonResult.class \
$(CLASSES)/$(IMAGE_DIFFER_DIR)/Configuration.class \
$(CLASSES)/$(IMAGE_DIFFER_DIR)/ImageComparator.class \
diff -r e1207eaf717b -r cc3e62406976 src/org/gfxtest/framework/GfxTest.java
--- a/src/org/gfxtest/framework/GfxTest.java Fri May 04 14:40:21 2012 +0200
+++ b/src/org/gfxtest/framework/GfxTest.java Mon May 07 14:53:02 2012 +0200
@@ -43,7 +43,6 @@
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Graphics2D;
-import java.awt.print.PrinterException;
import java.awt.print.PrinterJob;
import java.io.File;
import java.io.FileNotFoundException;
@@ -54,7 +53,11 @@
+import javax.print.Doc;
import javax.print.DocFlavor;
+import javax.print.DocPrintJob;
+import javax.print.PrintException;
+import javax.print.SimpleDoc;
import javax.print.StreamPrintService;
import javax.print.StreamPrintServiceFactory;
import javax.print.attribute.HashPrintRequestAttributeSet;
@@ -505,38 +508,88 @@
{
String psMimeType = DocFlavor.BYTE_ARRAY.POSTSCRIPT.getMimeType(); // only this works!
File printOutputFile;
+ File pngOutputFile;
StreamPrintService streamPrintService;
StreamPrintServiceFactory[] factories = PrinterJob.lookupStreamPrintServices(psMimeType);
+ FileOutputStream fileOutputStream = null;
if (factories.length == 0)
{
System.err.println("No factories found");
}
else
{
- PrinterJob printerJob = PrinterJob.getPrinterJob();
try
{
- printOutputFile = new File(this.suiteName + "_" + methodName + ".ps");
- streamPrintService = factories[0].getPrintService(new FileOutputStream(printOutputFile));
+ // prepare input and output files
+ printOutputFile = constructOutputFile(methodName, "ps");
+ pngOutputFile = constructOutputFile(methodName, "png");
+
+ fileOutputStream = new FileOutputStream(printOutputFile);
+ streamPrintService = factories[0].getPrintService(fileOutputStream);
// streamPrintService can now be set as the service on a PrinterJob
- printerJob.setPrintService(streamPrintService);
+
+ // set up initial print settings
PrintRequestAttributeSet printAttributeSet = new HashPrintRequestAttributeSet();
printAttributeSet.add(MediaSizeName.ISO_A4);
printAttributeSet.add(new Copies(1));
- printerJob.setPrintable(new PrintingTest(this, method));
- printerJob.print(printAttributeSet);
+
+ Doc doc = new SimpleDoc(new PrintingTest(this, method), DocFlavor.SERVICE_FORMATTED.PRINTABLE, null);
+ try
+ {
+ DocPrintJob docPrintJob = streamPrintService.createPrintJob();
+ PrintJobWatcher printJobWatcher = new PrintJobWatcher(docPrintJob);
+ this.log.logBegin(this.getClass().getName(), "printBegin " + methodName);
+ docPrintJob.print(doc, printAttributeSet);
+ // wait until print is done
+ printJobWatcher.waitForDone();
+ this.log.logEnd(this.getClass().getName(), "printDone " + methodName);
+ }
+ catch (PrintException e)
+ {
+ e.printStackTrace();
+ }
+ finally
+ {
+ try
+ {
+ // must be sure that output stream is really closed
+ // because we are going to use output file with
+ // converter
+ fileOutputStream.flush();
+ fileOutputStream.close();
+ }
+ catch (IOException e)
+ {
+ e.printStackTrace();
+ }
+ // convert PostScript file to a PNG using software RIP
+ PostScriptToPngConverter.convert(printOutputFile, pngOutputFile);
+ }
}
catch (FileNotFoundException e)
{
e.printStackTrace();
}
- catch (PrinterException e)
- {
- e.printStackTrace();
- }
}
}
+ /**
+ * Creates an instance of File object which represents test result file, ie.
+ * either PostScript file or PNG image.
+ *
+ * @param methodName name of test method
+ * @param suffix suffix, should be either "ps" or "png"
+ * @return an instance of File object which represents test result file
+ */
+ private File constructOutputFile(String methodName, String suffix)
+ {
+ if ("ps".equals(suffix) || "png".equals(suffix))
+ {
+ return new File(this.suiteName + "_" + methodName + "." + suffix);
+ }
+ throw new RuntimeException("Bad suffix");
+ }
+
private void writeZoomedImage(GfxTestConfiguration configuration, TestImage sourceImage, String methodName, int zoom) throws IOException
{
if (zoom == 1)
diff -r e1207eaf717b -r cc3e62406976 src/org/gfxtest/framework/PrintJobWatcher.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/framework/PrintJobWatcher.java Mon May 07 14:53:02 2012 +0200
@@ -0,0 +1,148 @@
+/*
+ Java gfx-test framework
+
+ Copyright (C) 2012 Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package org.gfxtest.framework;
+
+
+
+import javax.print.DocPrintJob;
+import javax.print.event.PrintJobAdapter;
+import javax.print.event.PrintJobEvent;
+
+
+
+/**
+ * This class performs a waiting for a printer job. We need to wait for a
+ * PostScript SW printer to finish printing because the conversion to a PNG
+ * files should be done when the .ps files are created and closed.
+ *
+ * @author Pavel Tisnovsky
+ */
+public class PrintJobWatcher
+{
+ /**
+ * Set to true if it is safe to close the print job's input stream
+ */
+ boolean printJobDone = false;
+
+ /**
+ * Constructor.
+ *
+ * @param job
+ * print job that can print a specified document with a set of
+ * job attributes
+ */
+ public PrintJobWatcher(DocPrintJob job)
+ {
+ // Add a listener to the print job
+ job.addPrintJobListener(new PrintJobAdapter()
+ {
+ @Override
+ /**
+ * @see PrintJobAdapter#printJobCancelled
+ */
+ public void printJobCanceled(PrintJobEvent pje)
+ {
+ allDone();
+ }
+
+ @Override
+ /**
+ * @see PrintJobAdapter#printJobCompleted
+ */
+ public void printJobCompleted(PrintJobEvent pje)
+ {
+ allDone();
+ }
+
+ @Override
+ /**
+ * @see PrintJobAdapter#printJobFailed
+ */
+ public void printJobFailed(PrintJobEvent pje)
+ {
+ allDone();
+ }
+
+ @Override
+ /**
+ * @see PrintJobAdapter#printJobNoMoreEvents
+ */
+ public void printJobNoMoreEvents(PrintJobEvent pje)
+ {
+ allDone();
+ }
+
+ /**
+ * Called when printing is canceled or finished.
+ */
+ void allDone()
+ {
+ synchronized (PrintJobWatcher.this)
+ {
+ // set a flag
+ PrintJobWatcher.this.printJobDone = true;
+ // and notify PrintJobWatcher
+ PrintJobWatcher.this.notify();
+ }
+ }
+ });
+ }
+
+ /**
+ * Called from the gfx. test framework.
+ */
+ public synchronized void waitForDone()
+ {
+ try
+ {
+ // thread wait
+ while (!this.printJobDone)
+ {
+ wait();
+ }
+ }
+ // thread could be interrupted
+ catch (InterruptedException e)
+ {
+ e.printStackTrace();
+ }
+ }
+}
More information about the distro-pkg-dev
mailing list