vhardy 01/11/12 23:23:05
Modified: test-resources/org/apache/batik/svggen regsvggen.xml
test-sources/org/apache/batik/test/svg
SVGRenderingAccuracyTest.java
SamplesRenderingTest.java
test-sources/org/apache/batik/test/util
ImageCompareTest.java
sources/org/apache/batik/svggen SVGTransform.java
Added: test-sources/org/apache/batik/svggen Bug4389.java
Log:
Bug fixing:
+ Bug 4389. Added regression test. Applied Paul Evenblij's patch.
+ Bug 4453. Added property for controlling validation in SVGRenderingAccuracyTest.
Revision Changes Path
1.12 +2 -1 xml-batik/test-resources/org/apache/batik/svggen/regsvggen.xml
Index: regsvggen.xml
===================================================================
RCS file: /home/cvs/xml-batik/test-resources/org/apache/batik/svggen/regsvggen.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- regsvggen.xml 2001/10/16 15:47:44 1.11
+++ regsvggen.xml 2001/11/13 07:23:04 1.12
@@ -8,7 +8,7 @@
<!-- ========================================================================= -->
<!-- @author [EMAIL PROTECTED] -->
-<!-- @version $Id: regsvggen.xml,v 1.11 2001/10/16 15:47:44 vhardy Exp $ -->
+<!-- @version $Id: regsvggen.xml,v 1.12 2001/11/13 07:23:04 vhardy Exp $ -->
<!-- ========================================================================= -->
<testSuite id="svggen" name="SVGGraphics2D Accuracy Testing"
class="org.apache.batik.svggen.SVGGeneratorTests">
<test id="ATransform" />
@@ -16,6 +16,7 @@
<test id="BasicShapes" />
<test id="BasicShapes2" />
<test id="BStroke" />
+ <test id="Bug4389" />
<test id="Clip" />
<test id="Color1" />
<test id="Color2" />
1.1 xml-batik/test-sources/org/apache/batik/svggen/Bug4389.java
Index: Bug4389.java
===================================================================
/*****************************************************************************
* Copyright (C) The Apache Software Foundation. All rights reserved. *
* ------------------------------------------------------------------------- *
* This software is published under the terms of the Apache Software License *
* version 1.1, a copy of which has been included with this distribution in *
* the LICENSE file. *
*****************************************************************************/
package org.apache.batik.svggen;
import java.awt.*;
import java.awt.geom.*;
import java.awt.image.*;
import javax.swing.ImageIcon;
/**
* This test validates drawImage conversions.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Hardy</a>
* @version $Id: Bug4389.java,v 1.1 2001/11/13 07:23:05 vhardy Exp $
*/
public class Bug4389 implements Painter {
public void paint(Graphics2D g){
ImageIcon image = new
ImageIcon(ClassLoader.getSystemResource("org/apache/batik/svggen/resources/vangogh.png"));
g.translate(40,40);
g.drawImage(image.getImage(), new AffineTransform(), null);
}
}
1.23 +25 -3
xml-batik/test-sources/org/apache/batik/test/svg/SVGRenderingAccuracyTest.java
Index: SVGRenderingAccuracyTest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/test/svg/SVGRenderingAccuracyTest.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- SVGRenderingAccuracyTest.java 2001/11/08 23:02:44 1.22
+++ SVGRenderingAccuracyTest.java 2001/11/13 07:23:05 1.23
@@ -64,7 +64,7 @@
* all pixel values are the same).
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Hardy</a>
- * @version $Id: SVGRenderingAccuracyTest.java,v 1.22 2001/11/08 23:02:44 deweese
Exp $
+ * @version $Id: SVGRenderingAccuracyTest.java,v 1.23 2001/11/13 07:23:05 vhardy
Exp $
*/
public class SVGRenderingAccuracyTest extends AbstractTest {
/**
@@ -250,6 +250,12 @@
protected File candidateReference;
/**
+ * Controls whether or not the SVG file should be
+ * validated. By default, no validation is used.
+ */
+ protected boolean validate = false;
+
+ /**
* Temporary directory
*/
protected static File tempDirectory;
@@ -881,9 +887,25 @@
new Boolean(false));
t.addTranscodingHint(PNGTranscoder.KEY_BACKGROUND_COLOR,
new Color(0,0,0,0));
- // t.addTranscodingHint(PNGTranscoder.KEY_XML_PARSER_VALIDATING,
- // new Boolean(true));
+
+ if (validate){
+ System.out.println("Using validation");
+ t.addTranscodingHint(PNGTranscoder.KEY_XML_PARSER_VALIDATING,
+ new Boolean(true));
+ }
+
return t;
+ }
+
+ /**
+ * If true, this test will use validation
+ */
+ public void setValidating(boolean validate){
+ this.validate = validate;
+ }
+
+ public boolean getValidating(){
+ return validate;
}
/**
1.3 +4 -2
xml-batik/test-sources/org/apache/batik/test/svg/SamplesRenderingTest.java
Index: SamplesRenderingTest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/test/svg/SamplesRenderingTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SamplesRenderingTest.java 2001/10/22 09:26:17 1.2
+++ SamplesRenderingTest.java 2001/11/13 07:23:05 1.3
@@ -12,7 +12,7 @@
* Preconfigured test for SVG files under the xml-batik directory.
*
* @author <a href="[EMAIL PROTECTED]">Vincent Hardy</a>
- * @version $Id: SamplesRenderingTest.java,v 1.2 2001/10/22 09:26:17 vhardy Exp $
+ * @version $Id: SamplesRenderingTest.java,v 1.3 2001/11/13 07:23:05 vhardy Exp $
*/
public class SamplesRenderingTest extends PreconfiguredRenderingTest {
public static final String SVG_URL_PREFIX
@@ -42,7 +42,9 @@
public static final String SAVE_CANDIDATE_REFERENCE_SUFFIX
= "candidate-reference/";
-
+ public SamplesRenderingTest(){
+ setValidating(true);
+ }
protected String getSVGURLPrefix(){
return SVG_URL_PREFIX;
1.2 +13 -4
xml-batik/test-sources/org/apache/batik/test/util/ImageCompareTest.java
Index: ImageCompareTest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/test/util/ImageCompareTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImageCompareTest.java 2001/10/11 09:42:42 1.1
+++ ImageCompareTest.java 2001/11/13 07:23:05 1.2
@@ -46,7 +46,7 @@
* describing why the two images are different.
*
* @author <a href="[EMAIL PROTECTED]">Vincent Hardy</a>
- * @version $Id: ImageCompareTest.java,v 1.1 2001/10/11 09:42:42 vhardy Exp $
+ * @version $Id: ImageCompareTest.java,v 1.2 2001/11/13 07:23:05 vhardy Exp $
*/
public class ImageCompareTest extends AbstractTest {
public static final String ERROR_COULD_NOT_OPEN_IMAGE
@@ -96,15 +96,16 @@
public static final String TEMP_FILE_SUFFIX
= "";
-
/**
* URL for the first image to be compared.
*/
+ protected String urlAStr;
protected URL urlA;
/**
* URL for the second image to be compared
*/
+ protected String urlBStr;
protected URL urlB;
/**
@@ -145,6 +146,11 @@
*/
public ImageCompareTest(String urlA,
String urlB){
+ urlAStr = urlA;
+ urlBStr = urlB;
+ }
+
+ protected void initURLs(){
if(urlA == null){
throw new IllegalArgumentException();
}
@@ -152,11 +158,14 @@
if(urlB == null){
throw new IllegalArgumentException();
}
- this.urlA = resolveURL(urlA);
- this.urlB = resolveURL(urlB);
+
+ this.urlA = resolveURL(urlAStr);
+ this.urlB = resolveURL(urlBStr);
}
public TestReport rumImpl() throws Exception {
+ initURLs();
+
InputStream streamA = null;
try{
1.5 +6 -1 xml-batik/sources/org/apache/batik/svggen/SVGTransform.java
Index: SVGTransform.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGTransform.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SVGTransform.java 2001/10/01 12:37:10 1.4
+++ SVGTransform.java 2001/11/13 07:23:05 1.5
@@ -24,7 +24,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Hardy</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Paul Evenblij</a>
- * @version $Id: SVGTransform.java,v 1.4 2001/10/01 12:37:10 vhardy Exp $
+ * @version $Id: SVGTransform.java,v 1.5 2001/11/13 07:23:05 vhardy Exp $
*/
public class SVGTransform extends AbstractSVGConverter{
/**
@@ -145,6 +145,11 @@
// the current top of stack will be returned to concatenate onto.
// Otherwise, null will be returned.
element = (TransformStackElement) presentation.push(element);
+ }
+
+ // Push back teh last element popped, if not null
+ if (element != null){
+ presentation.push(element);
}
//
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
