tkormann 02/05/02 04:12:18
Modified: . build.xml
test-references/org/apache/batik/transcoder/image anneC.png
anneH200.png anneH600.png anneNE.png anneNW.png
anneSE.png anneSW.png anneW200.png anneW600.png
anneWC.png anneWH200.png anneWH600.png anneWNE.png
anneWNW.png anneWSE.png anneWSW.png butterflyC.png
butterflyH200.png butterflyH600.png butterflyNE.png
butterflyNW.png butterflySE.png butterflySW.png
butterflyW200.png butterflyW600.png butterflyWC.png
butterflyWH200.png butterflyWH600.png
butterflyWNE.png butterflyWNW.png butterflyWSE.png
butterflyWSW.png language.png languageEn.png
languageFr.png px2mm72dpi.png px2mm96dpi.png
test-sources/org/apache/batik/transcoder/image AOITest.java
AbstractImageTranscoderTest.java
AlternateStylesheetTest.java
BackgroundColorTest.java DOMTest.java
DimensionTest.java InputStreamTest.java
LanguageTest.java MediaTest.java
ParametrizedDOMTest.java PixelToMMTest.java
ReaderTest.java URITest.java
Log:
change transcoder unit testing classes, so that I diff PNG data rather
image data. Tests can now generates candidate-reference when there is a diff.
Revision Changes Path
1.109 +2 -1 xml-batik/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-batik/build.xml,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- build.xml 30 Apr 2002 08:45:14 -0000 1.108
+++ build.xml 2 May 2002 11:12:17 -0000 1.109
@@ -47,7 +47,7 @@
[win32] .\build.bat help
- $Id: build.xml,v 1.108 2002/04/30 08:45:14 vhardy Exp $
+ $Id: build.xml,v 1.109 2002/05/02 11:12:17 tkormann Exp $
-->
@@ -846,6 +846,7 @@
<mkdir dir="${test-references}/org/apache/batik/gvt/variation" />
<mkdir dir="${test-references}/org/apache/batik/ext/awt/geom/candidate" />
<mkdir dir="${test-references}/org/apache/batik/ext/awt/geom/variation" />
+ <mkdir
dir="${test-references}/org/apache/batik/transcoder/image/candidate-reference" />
</target>
<target name="ttf2svg"
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/anneC.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/anneH200.png
<<Binary file>>
1.3 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/anneH600.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/anneNE.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/anneNW.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/anneSE.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/anneSW.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/anneW200.png
<<Binary file>>
1.2 +28 -40
xml-batik/test-references/org/apache/batik/transcoder/image/anneW600.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/anneWC.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/anneWH200.png
<<Binary file>>
1.3 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/anneWH600.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/anneWNE.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/anneWNW.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/anneWSE.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/anneWSW.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/butterflyC.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/butterflyH200.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/butterflyH600.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/butterflyNE.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/butterflyNW.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/butterflySE.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/butterflySW.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/butterflyW200.png
<<Binary file>>
1.2 +3 -3
xml-batik/test-references/org/apache/batik/transcoder/image/butterflyW600.png
<<Binary file>>
1.2 +68 -61
xml-batik/test-references/org/apache/batik/transcoder/image/butterflyWC.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/butterflyWH200.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/butterflyWH600.png
<<Binary file>>
1.2 +35 -55
xml-batik/test-references/org/apache/batik/transcoder/image/butterflyWNE.png
<<Binary file>>
1.2 +75 -67
xml-batik/test-references/org/apache/batik/transcoder/image/butterflyWNW.png
<<Binary file>>
1.2 +47 -44
xml-batik/test-references/org/apache/batik/transcoder/image/butterflyWSE.png
<<Binary file>>
1.2 +47 -41
xml-batik/test-references/org/apache/batik/transcoder/image/butterflyWSW.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/language.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/languageEn.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/languageFr.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/px2mm72dpi.png
<<Binary file>>
1.2 +1 -1
xml-batik/test-references/org/apache/batik/transcoder/image/px2mm96dpi.png
<<Binary file>>
1.2 +3 -3
xml-batik/test-sources/org/apache/batik/transcoder/image/AOITest.java
Index: AOITest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/transcoder/image/AOITest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AOITest.java 30 Oct 2001 14:19:07 -0000 1.1
+++ AOITest.java 2 May 2002 11:12:18 -0000 1.2
@@ -22,7 +22,7 @@
* Test the ImageTranscoder with the KEY_AOI transcoding hint.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: AOITest.java,v 1.1 2001/10/30 14:19:07 tkormann Exp $
+ * @version $Id: AOITest.java,v 1.2 2002/05/02 11:12:18 tkormann Exp $
*/
public class AOITest extends AbstractImageTranscoderTest {
@@ -122,7 +122,7 @@
/**
* Returns the reference image for this test.
*/
- protected BufferedImage getReferenceImage() {
- return createBufferedImage(resolveURL(refImageURI));
+ protected byte [] getReferenceImageData() {
+ return createBufferedImageData(resolveURL(refImageURI));
}
}
1.3 +86 -62
xml-batik/test-sources/org/apache/batik/transcoder/image/AbstractImageTranscoderTest.java
Index: AbstractImageTranscoderTest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/transcoder/image/AbstractImageTranscoderTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractImageTranscoderTest.java 30 Oct 2001 15:18:24 -0000 1.2
+++ AbstractImageTranscoderTest.java 2 May 2002 11:12:18 -0000 1.3
@@ -11,7 +11,11 @@
import java.awt.image.BufferedImage;
import java.awt.image.RenderedImage;
+import java.io.FileOutputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -37,7 +41,7 @@
* The base class for the ImageTranscoder tests.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: AbstractImageTranscoderTest.java,v 1.2 2001/10/30 15:18:24
tkormann Exp $
+ * @version $Id: AbstractImageTranscoderTest.java,v 1.3 2002/05/02 11:12:18
tkormann Exp $
*/
public abstract class AbstractImageTranscoderTest extends AbstractTest {
@@ -68,7 +72,7 @@
try {
DiffImageTranscoder transcoder =
- new DiffImageTranscoder(getReferenceImage());
+ new DiffImageTranscoder(getReferenceImageData());
Map hints = createTranscodingHints();
if (hints != null) {
@@ -83,7 +87,7 @@
report.addDescriptionEntry(ERROR_IMAGE_DIFFER, "");
report.setPassed(false);
}
- } catch (TranscoderException ex) {
+ } catch (Exception ex) {
report.setErrorCode(ERROR_TRANSCODING);
report.addDescriptionEntry(ERROR_TRANSCODING, toString(ex));
ex.printStackTrace();
@@ -108,7 +112,7 @@
/**
* Returns the reference image for this test.
*/
- protected abstract BufferedImage getReferenceImage();
+ protected abstract byte [] getReferenceImageData();
//////////////////////////////////////////////////////////////////////////
// Convenient methods
@@ -149,26 +153,48 @@
}
}
+ static String filename;
+
/**
* Loads an image from a URL
*/
- public static BufferedImage createBufferedImage(URL url) {
- ImageTagRegistry reg = ImageTagRegistry.getRegistry();
- Filter filt = reg.readURL(new ParsedURL(url));
- if (filt == null) {
- return null;
- }
-
- RenderedImage red = filt.createDefaultRendering();
- if (red == null) {
+ public static byte [] createBufferedImageData(URL url) {
+ try {
+ filename = url.toString();
+ //System.out.println(url.toString());
+ InputStream istream = url.openStream();
+ byte [] imgData = null;
+ byte [] buf = new byte[1024];
+ int length;
+ while ((length = istream.read(buf, 0, buf.length)) == buf.length) {
+ if (imgData != null) {
+ byte [] imgDataTmp = new byte[imgData.length + length];
+ System.arraycopy
+ (imgData, 0, imgDataTmp, 0, imgData.length);
+ System.arraycopy
+ (buf, 0, imgDataTmp, imgData.length, length);
+ imgData = imgDataTmp;
+ } else {
+ imgData = new byte[length];
+ System.arraycopy(buf, 0, imgData, 0, length);
+ }
+ }
+ if (imgData != null) {
+ byte [] imgDataTmp = new byte[imgData.length + length];
+ System.arraycopy
+ (imgData, 0, imgDataTmp, 0, imgData.length);
+ System.arraycopy
+ (buf, 0, imgDataTmp, imgData.length, length);
+ imgData = imgDataTmp;
+ } else {
+ imgData = new byte[length];
+ System.arraycopy(buf, 0, imgData, 0, length);
+ }
+ istream.close();
+ return imgData;
+ } catch (IOException ex) {
return null;
}
-
- BufferedImage img = new BufferedImage(red.getWidth(),
- red.getHeight(),
- BufferedImage.TYPE_INT_ARGB);
- red.copyData(img.getRaster());
- return img;
}
/**
@@ -180,7 +206,7 @@
protected boolean state;
/** The reference image. */
- protected BufferedImage refImg;
+ protected byte [] refImgData;
/**
* Constructs a new <tt>DiffImageTranscoder</tt>.
@@ -188,8 +214,8 @@
* @param refImg the reference image
* @param report the test report into which errors have been sent
*/
- public DiffImageTranscoder(BufferedImage refImg) {
- this.refImg = refImg;
+ public DiffImageTranscoder(byte [] refImgData) {
+ this.refImgData = refImgData;
}
/**
@@ -216,54 +242,52 @@
compareImage(img);
}
+ protected void writeCandidateReference(byte [] imgData) {
+ try {
+ String s = new File(filename).getName();
+ s =
"test-references/org/apache/batik/transcoder/image/candidate-reference/"+s;
+ System.out.println(s);
+ FileOutputStream ostream = new FileOutputStream(s);
+ ostream.write(imgData, 0, imgData.length);
+ ostream.flush();
+ ostream.close();
+ } catch (Exception ex) {}
+ }
+
/**
* Compares both source and result images and set the state flag.
*/
- protected void compareImage(BufferedImage img) {
+ protected void compareImage(BufferedImage img)
+ throws TranscoderException {
// compare the resulting image with the reference image
// state = true if refImg is the same than img
- if ((img.getType() != BufferedImage.TYPE_INT_ARGB) ||
- (refImg.getType() != BufferedImage.TYPE_INT_ARGB)) {
- throw new IllegalArgumentException("Different Image type");
- }
- int minX = refImg.getMinX();
- int minY = refImg.getMinY();
- int w = refImg.getWidth();
- int h = refImg.getHeight();
- if ((img.getMinX() != minX) ||
- (img.getMinY() != minY) ||
- (img.getWidth() != w) ||
- (img.getHeight() != h)) {
- //showDiff(img);
- state = false;
- return;
- }
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ TranscoderOutput output = new TranscoderOutput(out);
+ PNGTranscoder t = new PNGTranscoder();
+ t.writeImage(img, output);
+ byte [] imgData = out.toByteArray();
+
+ if (refImgData == null) {
+ writeCandidateReference(imgData);
+ state = false;
+ return;
+ }
+
+ if (refImgData.length != imgData.length) {
+ writeCandidateReference(imgData);
+ state = false;
+ return;
+ }
- for (int y = minY; y < minY+h; ++y) {
- for (int x = minX; x < minX+w; ++x) {
- if (img.getRGB(x, y) != refImg.getRGB(x, y)) {
- //showDiff(img);
- state = false;
- return;
- }
- }
- }
+ for (int i = 0; i < refImgData.length; ++i) {
+ if (refImgData[i] != imgData[i]) {
+ writeCandidateReference(imgData);
+ state = false;
+ return;
+ }
+ }
state = true;
- }
-
- private void showDiff(BufferedImage img) {
- javax.swing.JFrame frame = new javax.swing.JFrame();
-
- frame.getContentPane().add
- (new javax.swing.JLabel(new javax.swing.ImageIcon(img)),
- java.awt.BorderLayout.EAST);
- frame.getContentPane().add
- (new javax.swing.JLabel(new javax.swing.ImageIcon(refImg)),
- java.awt.BorderLayout.WEST);
-
- frame.pack();
- frame.show();
}
/**
1.2 +3 -3
xml-batik/test-sources/org/apache/batik/transcoder/image/AlternateStylesheetTest.java
Index: AlternateStylesheetTest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/transcoder/image/AlternateStylesheetTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AlternateStylesheetTest.java 30 Oct 2001 14:19:07 -0000 1.1
+++ AlternateStylesheetTest.java 2 May 2002 11:12:18 -0000 1.2
@@ -22,7 +22,7 @@
* Test the ImageTranscoder with the KEY_ALTERNATE_STYLESHEET transcoding hint.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: AlternateStylesheetTest.java,v 1.1 2001/10/30 14:19:07 tkormann
Exp $
+ * @version $Id: AlternateStylesheetTest.java,v 1.2 2002/05/02 11:12:18 tkormann
Exp $
*/
public class AlternateStylesheetTest extends AbstractImageTranscoderTest {
@@ -70,7 +70,7 @@
/**
* Returns the reference image for this test.
*/
- protected BufferedImage getReferenceImage() {
- return createBufferedImage(resolveURL(refImageURI));
+ protected byte [] getReferenceImageData() {
+ return createBufferedImageData(resolveURL(refImageURI));
}
}
1.2 +20 -10
xml-batik/test-sources/org/apache/batik/transcoder/image/BackgroundColorTest.java
Index: BackgroundColorTest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/transcoder/image/BackgroundColorTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BackgroundColorTest.java 30 Oct 2001 14:19:07 -0000 1.1
+++ BackgroundColorTest.java 2 May 2002 11:12:18 -0000 1.2
@@ -12,6 +12,8 @@
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+
import java.util.Map;
import java.util.HashMap;
@@ -29,7 +31,7 @@
* Test the ImageTranscoder with the KEY_BACKGROUND_COLOR transcoding hint.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: BackgroundColorTest.java,v 1.1 2001/10/30 14:19:07 tkormann Exp $
+ * @version $Id: BackgroundColorTest.java,v 1.2 2002/05/02 11:12:18 tkormann Exp $
*/
public class BackgroundColorTest extends AbstractImageTranscoderTest {
@@ -75,14 +77,22 @@
/**
* Returns the reference image for this test.
*/
- protected BufferedImage getReferenceImage() {
- BufferedImage img = new BufferedImage
- (400, 400, BufferedImage.TYPE_INT_ARGB);
- Graphics2D g2d = img.createGraphics();
- g2d.setColor(Color.blue);
- g2d.fillRect(0, 0, 400, 400);
- g2d.setColor(Color.red);
- g2d.fillRect(100, 50, 100, 50);
- return img;
+ protected byte [] getReferenceImageData() {
+ try {
+ BufferedImage img = new BufferedImage
+ (400, 400, BufferedImage.TYPE_INT_ARGB);
+ Graphics2D g2d = img.createGraphics();
+ g2d.setColor(Color.blue);
+ g2d.fillRect(0, 0, 400, 400);
+ g2d.setColor(Color.red);
+ g2d.fillRect(100, 50, 100, 50);
+ ByteArrayOutputStream ostream = new ByteArrayOutputStream();
+ PNGTranscoder t = new PNGTranscoder();
+ TranscoderOutput output = new TranscoderOutput(ostream);
+ t.writeImage(img, output);
+ return ostream.toByteArray();
+ } catch (Exception ex) {
+ throw new RuntimeException("BackgroundColorTest error");
+ }
}
}
1.2 +20 -10
xml-batik/test-sources/org/apache/batik/transcoder/image/DOMTest.java
Index: DOMTest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/transcoder/image/DOMTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMTest.java 30 Oct 2001 14:19:07 -0000 1.1
+++ DOMTest.java 2 May 2002 11:12:18 -0000 1.2
@@ -12,6 +12,8 @@
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+
import org.apache.batik.transcoder.TranscoderException;
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
@@ -27,7 +29,7 @@
* Test the ImageTranscoder input with a DOM tree.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: DOMTest.java,v 1.1 2001/10/30 14:19:07 tkormann Exp $
+ * @version $Id: DOMTest.java,v 1.2 2002/05/02 11:12:18 tkormann Exp $
*/
public class DOMTest extends AbstractImageTranscoderTest {
@@ -72,14 +74,22 @@
/**
* Returns the reference image for this test.
*/
- protected BufferedImage getReferenceImage() {
- BufferedImage img = new BufferedImage
- (400, 400, BufferedImage.TYPE_INT_ARGB);
- Graphics2D g2d = img.createGraphics();
- g2d.setColor(Color.black);
- g2d.fillRect(0, 0, 400, 400);
- g2d.setColor(Color.red);
- g2d.drawRect(100, 50, 100, 50);
- return img;
+ protected byte [] getReferenceImageData() {
+ try {
+ BufferedImage img = new BufferedImage
+ (400, 400, BufferedImage.TYPE_INT_ARGB);
+ Graphics2D g2d = img.createGraphics();
+ g2d.setColor(Color.black);
+ g2d.fillRect(0, 0, 400, 400);
+ g2d.setColor(Color.red);
+ g2d.drawRect(100, 50, 100, 50);
+ ByteArrayOutputStream ostream = new ByteArrayOutputStream();
+ PNGTranscoder t = new PNGTranscoder();
+ TranscoderOutput output = new TranscoderOutput(ostream);
+ t.writeImage(img, output);
+ return ostream.toByteArray();
+ } catch (Exception ex) {
+ throw new RuntimeException("DOMTest error");
+ }
}
}
1.2 +5 -5
xml-batik/test-sources/org/apache/batik/transcoder/image/DimensionTest.java
Index: DimensionTest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/transcoder/image/DimensionTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DimensionTest.java 30 Oct 2001 14:19:07 -0000 1.1
+++ DimensionTest.java 2 May 2002 11:12:18 -0000 1.2
@@ -11,8 +11,8 @@
import java.awt.image.BufferedImage;
import java.util.Map;
-import java.util.HashMap
-;
+import java.util.HashMap;
+
import org.apache.batik.transcoder.TranscoderException;
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
@@ -22,7 +22,7 @@
* hint.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: DimensionTest.java,v 1.1 2001/10/30 14:19:07 tkormann Exp $
+ * @version $Id: DimensionTest.java,v 1.2 2002/05/02 11:12:18 tkormann Exp $
*/
public class DimensionTest extends AbstractImageTranscoderTest {
@@ -80,7 +80,7 @@
/**
* Returns the reference image for this test.
*/
- protected BufferedImage getReferenceImage() {
- return createBufferedImage(resolveURL(refImageURI));
+ protected byte [] getReferenceImageData() {
+ return createBufferedImageData(resolveURL(refImageURI));
}
}
1.2 +3 -3
xml-batik/test-sources/org/apache/batik/transcoder/image/InputStreamTest.java
Index: InputStreamTest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/transcoder/image/InputStreamTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InputStreamTest.java 30 Oct 2001 14:19:07 -0000 1.1
+++ InputStreamTest.java 2 May 2002 11:12:18 -0000 1.2
@@ -23,7 +23,7 @@
* Test the ImageTranscoder input with a InputStream.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: InputStreamTest.java,v 1.1 2001/10/30 14:19:07 tkormann Exp $
+ * @version $Id: InputStreamTest.java,v 1.2 2002/05/02 11:12:18 tkormann Exp $
*/
public class InputStreamTest extends AbstractImageTranscoderTest {
@@ -62,7 +62,7 @@
/**
* Returns the reference image for this test.
*/
- protected BufferedImage getReferenceImage() {
- return createBufferedImage(resolveURL(refImageURI));
+ protected byte [] getReferenceImageData() {
+ return createBufferedImageData(resolveURL(refImageURI));
}
}
1.2 +3 -3
xml-batik/test-sources/org/apache/batik/transcoder/image/LanguageTest.java
Index: LanguageTest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/transcoder/image/LanguageTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LanguageTest.java 30 Oct 2001 14:19:07 -0000 1.1
+++ LanguageTest.java 2 May 2002 11:12:18 -0000 1.2
@@ -21,7 +21,7 @@
* Test the ImageTranscoder with the KEY_LANGUAGE transcoding hint.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: LanguageTest.java,v 1.1 2001/10/30 14:19:07 tkormann Exp $
+ * @version $Id: LanguageTest.java,v 1.2 2002/05/02 11:12:18 tkormann Exp $
*/
public class LanguageTest extends AbstractImageTranscoderTest {
@@ -71,7 +71,7 @@
/**
* Returns the reference image for this test.
*/
- protected BufferedImage getReferenceImage() {
- return createBufferedImage(resolveURL(refImageURI));
+ protected byte [] getReferenceImageData() {
+ return createBufferedImageData(resolveURL(refImageURI));
}
}
1.2 +3 -3
xml-batik/test-sources/org/apache/batik/transcoder/image/MediaTest.java
Index: MediaTest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/transcoder/image/MediaTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MediaTest.java 30 Oct 2001 14:19:07 -0000 1.1
+++ MediaTest.java 2 May 2002 11:12:18 -0000 1.2
@@ -22,7 +22,7 @@
* Test the ImageTranscoder with the KEY_MEDIA transcoding hint.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: MediaTest.java,v 1.1 2001/10/30 14:19:07 tkormann Exp $
+ * @version $Id: MediaTest.java,v 1.2 2002/05/02 11:12:18 tkormann Exp $
*/
public class MediaTest extends AbstractImageTranscoderTest {
@@ -67,7 +67,7 @@
/**
* Returns the reference image for this test.
*/
- protected BufferedImage getReferenceImage() {
- return createBufferedImage(resolveURL(refImageURI));
+ protected byte [] getReferenceImageData() {
+ return createBufferedImageData(resolveURL(refImageURI));
}
}
1.2 +3 -3
xml-batik/test-sources/org/apache/batik/transcoder/image/ParametrizedDOMTest.java
Index: ParametrizedDOMTest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/transcoder/image/ParametrizedDOMTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParametrizedDOMTest.java 30 Oct 2001 14:19:07 -0000 1.1
+++ ParametrizedDOMTest.java 2 May 2002 11:12:18 -0000 1.2
@@ -28,7 +28,7 @@
* Test the ImageTranscoder input with a DOM tree.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: ParametrizedDOMTest.java,v 1.1 2001/10/30 14:19:07 tkormann Exp $
+ * @version $Id: ParametrizedDOMTest.java,v 1.2 2002/05/02 11:12:18 tkormann Exp $
*/
public class ParametrizedDOMTest extends AbstractImageTranscoderTest {
@@ -66,7 +66,7 @@
/**
* Returns the reference image for this test.
*/
- protected BufferedImage getReferenceImage() {
- return createBufferedImage(resolveURL(refImageURI));
+ protected byte [] getReferenceImageData() {
+ return createBufferedImageData(resolveURL(refImageURI));
}
}
1.2 +3 -3
xml-batik/test-sources/org/apache/batik/transcoder/image/PixelToMMTest.java
Index: PixelToMMTest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/transcoder/image/PixelToMMTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PixelToMMTest.java 30 Oct 2001 14:19:07 -0000 1.1
+++ PixelToMMTest.java 2 May 2002 11:12:18 -0000 1.2
@@ -22,7 +22,7 @@
* Test the ImageTranscoder with the KEY_PIXEL_TO_MM transcoding hint.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: PixelToMMTest.java,v 1.1 2001/10/30 14:19:07 tkormann Exp $
+ * @version $Id: PixelToMMTest.java,v 1.2 2002/05/02 11:12:18 tkormann Exp $
*/
public class PixelToMMTest extends AbstractImageTranscoderTest {
@@ -69,7 +69,7 @@
/**
* Returns the reference image for this test.
*/
- protected BufferedImage getReferenceImage() {
- return createBufferedImage(resolveURL(refImageURI));
+ protected byte [] getReferenceImageData() {
+ return createBufferedImageData(resolveURL(refImageURI));
}
}
1.2 +3 -3
xml-batik/test-sources/org/apache/batik/transcoder/image/ReaderTest.java
Index: ReaderTest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/transcoder/image/ReaderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReaderTest.java 30 Oct 2001 14:19:07 -0000 1.1
+++ ReaderTest.java 2 May 2002 11:12:18 -0000 1.2
@@ -24,7 +24,7 @@
* Test the ImageTranscoder input with a Reader.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: ReaderTest.java,v 1.1 2001/10/30 14:19:07 tkormann Exp $
+ * @version $Id: ReaderTest.java,v 1.2 2002/05/02 11:12:18 tkormann Exp $
*/
public class ReaderTest extends AbstractImageTranscoderTest {
@@ -63,7 +63,7 @@
/**
* Returns the reference image for this test.
*/
- protected BufferedImage getReferenceImage() {
- return createBufferedImage(resolveURL(refImageURI));
+ protected byte [] getReferenceImageData() {
+ return createBufferedImageData(resolveURL(refImageURI));
}
}
1.2 +3 -3
xml-batik/test-sources/org/apache/batik/transcoder/image/URITest.java
Index: URITest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/transcoder/image/URITest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- URITest.java 30 Oct 2001 14:19:07 -0000 1.1
+++ URITest.java 2 May 2002 11:12:18 -0000 1.2
@@ -18,7 +18,7 @@
* Test the ImageTranscoder input with a URI.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: URITest.java,v 1.1 2001/10/30 14:19:07 tkormann Exp $
+ * @version $Id: URITest.java,v 1.2 2002/05/02 11:12:18 tkormann Exp $
*/
public class URITest extends AbstractImageTranscoderTest {
@@ -49,7 +49,7 @@
/**
* Returns the reference image for this test.
*/
- protected BufferedImage getReferenceImage() {
- return createBufferedImage(resolveURL(refImageURI));
+ protected byte [] getReferenceImageData() {
+ return createBufferedImageData(resolveURL(refImageURI));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
