You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by dv...@apache.org on 2007/02/06 13:31:07 UTC
svn commit: r504106 - in
/xmlgraphics/batik/trunk/test-sources/org/apache/batik: apps/rasterizer/
dom/ ext/awt/geom/ gvt/ svggen/ swing/ transcoder/image/ util/
Author: dvholten
Date: Tue Feb 6 04:31:06 2007
New Revision: 504106
URL: http://svn.apache.org/viewvc?view=rev&rev=504106
Log:
1.) remove some more Vector
2.) make a number of 'new Error()' exceptions a little more verbose about their reason
3.) drop unused imports
4.) use String.valueOf(x) instead of ""+x for conversion
Modified:
xmlgraphics/batik/trunk/test-sources/org/apache/batik/apps/rasterizer/MainTest.java
xmlgraphics/batik/trunk/test-sources/org/apache/batik/apps/rasterizer/SVGConverterTest.java
xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DOM3Test.java
xmlgraphics/batik/trunk/test-sources/org/apache/batik/ext/awt/geom/RectListManagerTest.java
xmlgraphics/batik/trunk/test-sources/org/apache/batik/gvt/TextSelectionTest.java
xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/Color1.java
xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/Rescale.java
xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java
xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGGeneratorTests.java
xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/JSVGCanvasHandler.java
xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/JSVGInterruptTest.java
xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AbstractImageTranscoderTest.java
xmlgraphics/batik/trunk/test-sources/org/apache/batik/util/Base64Test.java
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/apps/rasterizer/MainTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/apps/rasterizer/MainTest.java?view=diff&rev=504106&r1=504105&r2=504106
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/apps/rasterizer/MainTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/apps/rasterizer/MainTest.java Tue Feb 6 04:31:06 2007
@@ -23,7 +23,7 @@
import java.awt.geom.Rectangle2D;
import java.io.File;
import java.util.StringTokenizer;
-import java.util.Vector;
+import java.util.List;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.DefaultTestSuite;
@@ -37,7 +37,7 @@
* @version $Id$
*/
public class MainTest extends DefaultTestSuite {
-
+
public MainTest(){
Test t = new MainConfigTest("-d samples") {
public TestReport validate(SVGConverter c){
@@ -48,32 +48,32 @@
return reportError("-d", "samples", "" + dst);
}
}
-
+
};
-
+
addTest(t);
t.setId("MainConfigTest.output");
-
+
t = new MainConfigTest("samples/anne.svg") {
String ERROR_UNEXPECTED_SOURCES = "MainConfigTest.error.unexpected.sources";
-
+
public TestReport validate(SVGConverter c){
- Vector sources = c.getSources();
+ List sources = c.getSources();
if(sources.size() == 1){
- String src = (String)sources.elementAt(0);
+ String src = (String)sources.get(0);
if ("samples/anne.svg".equals(src)){
return reportSuccess();
- }
+ }
}
-
+
return reportError(ERROR_UNEXPECTED_SOURCES);
}
-
+
};
-
+
addTest(t);
t.setId("MainConfigTest.source");
-
+
t = new MainConfigTest("-m image/jpeg") {
public TestReport validate(SVGConverter c){
DestinationType type = c.getDestinationType();
@@ -83,9 +83,9 @@
return reportError("-m", DestinationType.JPEG.toString(), "" + type);
}
}
-
+
};
-
+
addTest(t);
t.setId("MainConfigTest.mimeType.jpegA");
@@ -98,9 +98,9 @@
return reportError("-m", DestinationType.JPEG.toString(), "" + type);
}
}
-
+
};
-
+
addTest(t);
t.setId("MainConfigTest.mimeType.jpegB");
@@ -113,9 +113,9 @@
return reportError("-m", DestinationType.JPEG.toString(), "" + type);
}
}
-
+
};
-
+
addTest(t);
t.setId("MainConfigTest.mimeType.jpegC");
@@ -128,9 +128,9 @@
return reportError("-m", DestinationType.PNG.toString(), "" + type);
}
}
-
+
};
-
+
addTest(t);
t.setId("MainConfigTest.mimeType.png");
@@ -143,9 +143,9 @@
return reportError("-m", DestinationType.PDF.toString(), "" + type);
}
}
-
+
};
-
+
addTest(t);
t.setId("MainConfigTest.mimeType.pdf");
@@ -158,9 +158,9 @@
return reportError("-m", DestinationType.TIFF.toString(), "" + type);
}
}
-
+
};
-
+
addTest(t);
t.setId("MainConfigTest.mimeType.tiff");
@@ -173,9 +173,9 @@
return reportError("-w", "" + 467.69, "" + width);
}
}
-
+
};
-
+
addTest(t);
t.setId("MainConfigTest.width");
@@ -188,9 +188,9 @@
return reportError("-h", "" + 345.67, "" + height);
}
}
-
+
};
-
+
addTest(t);
t.setId("MainConfigTest.height");
@@ -203,7 +203,7 @@
return reportError("-maxw", "" + 467.69, "" + maxWidth);
}
}
-
+
};
addTest(t);
t.setId("MainConfigTest.maxWidth");
@@ -239,13 +239,13 @@
return r.getX() + "," + r.getY() + "," + r.getWidth() + "," + r.getHeight();
}
}
-
+
};
-
+
addTest(t);
t.setId("MainConfigTest.aoi");
-
+
t = new MainConfigTest("-bg 128.200.100.50") {
public TestReport validate(SVGConverter c){
Color bg = c.getBackgroundColor();
@@ -264,9 +264,9 @@
return c.getAlpha() + "." + c.getRed() + "." + c.getGreen() + "." + c.getBlue();
}
}
-
+
};
-
+
addTest(t);
t.setId("MainConfigTest.backgroundColor");
@@ -441,7 +441,7 @@
if(c.getIndexed() == 8){
return reportSuccess();
} else {
- return reportError("-indexed", "8",
+ return reportError("-indexed", "8",
"" + c.getIndexed());
}
}
@@ -582,7 +582,7 @@
public TestReport runImpl() throws Exception {
String[] argsArray = makeArgsArray(args);
Main main = new Main(argsArray) {
- public void error(String errorCode,
+ public void error(String errorCode,
Object[] errorArgs){
if (Main.ERROR_ILLEGAL_ARGUMENT.equals(errorCode)){
report = reportSuccess();
@@ -594,8 +594,8 @@
errorCode);
}
}
-
-
+
+
};
main.execute();
@@ -657,7 +657,7 @@
public TestReport runImpl() throws Exception {
String[] argsArray = makeArgsArray(args);
Main main = new Main(argsArray) {
- public void error(String errorCode,
+ public void error(String errorCode,
Object[] errorArgs){
if (Main.ERROR_NOT_ENOUGH_OPTION_VALUES.equals(errorCode)){
if(errorArgs != null && errorArgs.length > 0 && badOption.equals(errorArgs[0])){
@@ -677,8 +677,8 @@
errorCode);
}
}
-
-
+
+
};
main.execute();
@@ -705,7 +705,7 @@
String args;
TestReport report;
- static final String ERROR_UNEXPECTED_OPTION_VALUE
+ static final String ERROR_UNEXPECTED_OPTION_VALUE
= "MainConfigTest.error.unexpected.option.value";
static final String ENTRY_KEY_OPTION
@@ -741,7 +741,7 @@
public void validateConverterConfig(SVGConverter c){
report = validate(c);
}
-
+
};
main.execute();
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/apps/rasterizer/SVGConverterTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/apps/rasterizer/SVGConverterTest.java?view=diff&rev=504106&r1=504105&r2=504106
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/apps/rasterizer/SVGConverterTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/apps/rasterizer/SVGConverterTest.java Tue Feb 6 04:31:06 2007
@@ -299,8 +299,8 @@
File dummy = null;
try {
dummy = File.createTempFile("dummyPNG", ".png");
- } catch(IOException e){
- throw new Error();
+ } catch(IOException ioEx ){
+ throw new Error( ioEx.getMessage() );
}
c.setSources(new String[]{"samples/anne.svg", "samples/batikFX.svg"});
c.setDst(dummy);
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DOM3Test.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DOM3Test.java?view=diff&rev=504106&r1=504105&r2=504106
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DOM3Test.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DOM3Test.java Tue Feb 6 04:31:06 2007
@@ -19,13 +19,15 @@
package org.apache.batik.dom;
import org.apache.batik.test.AbstractTest;
-import org.apache.batik.dom.GenericDocument;
-import org.apache.batik.dom.GenericDOMImplementation;
import org.apache.batik.dom.svg.SVGOMDocument;
import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.w3c.dom.Document;
+/**
+ *
+ * @version $Id$
+ */
public class DOM3Test extends AbstractTest {
static String SVG_NAMESPACE_URI = "http://www.w3.org/2000/svg";
static String EX_NAMESPACE_URI = "http://www.example.org/";
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/ext/awt/geom/RectListManagerTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/ext/awt/geom/RectListManagerTest.java?view=diff&rev=504106&r1=504105&r2=504106
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/ext/awt/geom/RectListManagerTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/ext/awt/geom/RectListManagerTest.java Tue Feb 6 04:31:06 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -131,7 +131,7 @@
throw new IllegalArgumentException();
}
}
-
+
// url is not a file. It must be a regular URL...
try{
return new URL(url);
@@ -205,7 +205,7 @@
int w = Integer.parseInt(st.nextToken());
int h = Integer.parseInt(st.nextToken());
currRLM.add(new Rectangle(x, y, w, h));
- }
+ }
else if (RLM_PREF.equals(pref)) {
String id = st.nextToken();
Object o = rlms.get(id);
@@ -215,20 +215,20 @@
}
currRLM = (RectListManager)o;
currID = id;
- }
+ }
else if (MERGE_PREF.equals(pref)) {
if (currRLM == null) continue;
int overhead = Integer.parseInt(st.nextToken());
int lineOverhead = Integer.parseInt(st.nextToken());
currRLM.mergeRects(overhead, lineOverhead);
- }
+ }
else if (ADD_PREF.equals(pref)) {
if (currRLM == null) continue;
String id = st.nextToken();
Object o = rlms.get(id);
if (o == null) continue;
currRLM.add((RectListManager)o);
- }
+ }
else if (SUBTRACT_PREF.equals(pref)) {
if (currRLM == null) continue;
String id = st.nextToken();
@@ -236,7 +236,7 @@
if (o == null) continue;
int overhead = Integer.parseInt(st.nextToken());
int lineOverhead = Integer.parseInt(st.nextToken());
- currRLM.subtract((RectListManager)o,
+ currRLM.subtract((RectListManager)o,
overhead, lineOverhead);
}
else if (CONTAINS_ALL_PREF.equals(pref)) {
@@ -246,30 +246,30 @@
if (o == null) continue;
RectListManager rlm = (RectListManager)o;
ps.println("ID: " + currID + " Sz: " + currRLM.size());
-
+
if (currRLM.containsAll(rlm)) {
- ps.println(" Contains all: " + id +
+ ps.println(" Contains all: " + id +
" Sz: " + rlm.size());
} else {
- ps.println(" Does not contain all: " + id +
+ ps.println(" Does not contain all: " + id +
" Sz: " + rlm.size());
}
ps.println();
- }
+ }
else if (REMOVE_ALL_PREF.equals(pref)) {
if (currRLM == null) continue;
String id = st.nextToken();
Object o = rlms.get(id);
if (o == null) continue;
currRLM.removeAll((RectListManager)o);
- }
+ }
else if (RETAIN_ALL_PREF.equals(pref)) {
if (currRLM == null) continue;
String id = st.nextToken();
Object o = rlms.get(id);
if (o == null) continue;
currRLM.retainAll((RectListManager)o);
- }
+ }
else if (PRINT_PREF.equals(pref)) {
if (currRLM == null) continue;
@@ -293,7 +293,7 @@
(Messages.formatMessage(ENTRY_KEY_ERROR_DESCRIPTION, null),
Messages.formatMessage
(ERROR_READING_RECTS,
- new String[]{""+lineNo, rects.toString(),
+ new String[]{ ""+lineNo, rects.toString(),
trace.toString()}))
});
report.setPassed(false);
@@ -303,7 +303,7 @@
InputStream refIS = null;
try {
refIS = var.openStream();
- } catch(Exception e) {
+ } catch(Exception e) {
try {
refIS = ref.openStream();
} catch(Exception ex) {
@@ -343,7 +343,7 @@
report.setDescription(new TestReport.Entry[] {
new TestReport.Entry
(Messages.formatMessage(ENTRY_KEY_ERROR_DESCRIPTION, null),
- Messages.formatMessage(ERROR_NO_REFERENCE,
+ Messages.formatMessage(ERROR_NO_REFERENCE,
new String[]{ref.toString()}))
});
} else {
@@ -351,7 +351,7 @@
report.setDescription(new TestReport.Entry[] {
new TestReport.Entry
(Messages.formatMessage(ENTRY_KEY_ERROR_DESCRIPTION, null),
- Messages.formatMessage(ERROR_WRONG_RESULT,
+ Messages.formatMessage(ERROR_WRONG_RESULT,
new String[]{""+mismatch}))
});
}
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/gvt/TextSelectionTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/gvt/TextSelectionTest.java?view=diff&rev=504106&r1=504105&r2=504106
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/gvt/TextSelectionTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/gvt/TextSelectionTest.java Tue Feb 6 04:31:06 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -123,7 +123,7 @@
* @param end The last character to select
* @param file The reference file.
*/
- public TextSelectionTest(String file, String textID,
+ public TextSelectionTest(String file, String textID,
Integer start, Integer end) {
this.textID = textID;
this.start = start.intValue();
@@ -132,36 +132,36 @@
}
protected String buildRefImgURL(String svgDir, String svgFile){
- return getRefImagePrefix() + svgDir + getRefImageSuffix() +
- svgFile + "-" +textID+ "-" + start + "-" + end +PNG_EXTENSION;
+ return getRefImagePrefix() + svgDir + getRefImageSuffix() +
+ svgFile + '-' +textID+ '-' + start + '-' + end +PNG_EXTENSION;
}
public String buildVariationURL(String svgDir, String svgFile){
- return getVariationPrefix() + svgDir + getVariationSuffix() +
- svgFile + "-" +textID+ "-" + start + "-" + end +PNG_EXTENSION;
+ return getVariationPrefix() + svgDir + getVariationSuffix() +
+ svgFile + '-' +textID+ '-' + start + '-' + end +PNG_EXTENSION;
}
public String buildSaveVariationFile(String svgDir, String svgFile){
- return getSaveVariationPrefix() + svgDir + getSaveVariationSuffix() +
- svgFile + "-" +textID+ "-" + start + "-" + end +PNG_EXTENSION;
+ return getSaveVariationPrefix() + svgDir + getSaveVariationSuffix() +
+ svgFile + '-' +textID+ '-' + start + '-' + end +PNG_EXTENSION;
}
public String buildCandidateReferenceFile(String svgDir, String svgFile){
- return getCandidateReferencePrefix() + svgDir + getCandidateReferenceSuffix() +
- svgFile + "-" +textID+ "-" + start + "-" + end +PNG_EXTENSION;
+ return getCandidateReferencePrefix() + svgDir + getCandidateReferenceSuffix() +
+ svgFile + '-' +textID+ '-' + start + '-' + end +PNG_EXTENSION;
}
/**
* Returns this Test's name
*/
public String getName() {
- return super.getName() + "#" +textID+ "(" + start + "," + end + ")";
+ return super.getName() + '#' +textID+ '(' + start + ',' + end + ')';
}
-
+
public JSVGCanvasHandler createCanvasHandler() {
return new JSVGCanvasHandler(this, this) {
- public JSVGCanvas createCanvas() {
- JSVGCanvas ret = new JSVGCanvas();
+ public JSVGCanvas createCanvas() {
+ JSVGCanvas ret = new JSVGCanvas();
ret.setDocumentState(JSVGCanvas.ALWAYS_DYNAMIC);
return ret;
}
@@ -209,7 +209,7 @@
(Messages.formatMessage(ENTRY_KEY_ERROR_DESCRIPTION, null),
Messages.formatMessage
(ERROR_GETTING_SELECTION,
- new String[]{id, ""+start, ""+end, trace.toString()}))
+ new String[]{id, String.valueOf( start ), String.valueOf( end ), trace.toString()}))
});
report.setPassed(false);
failReport = report;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/Color1.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/Color1.java?view=diff&rev=504106&r1=504105&r2=504106
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/Color1.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/Color1.java Tue Feb 6 04:31:06 2007
@@ -110,7 +110,7 @@
g.fillRect(0, 0, 40, stepHeight);
g.setPaint(labelColor);
- g.drawString("" + opacity, 50, stepHeight/2);
+ g.drawString( String.valueOf( opacity ), 50, stepHeight/2);
g.translate(0, stepHeight);
}
}
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/Rescale.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/Rescale.java?view=diff&rev=504106&r1=504105&r2=504106
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/Rescale.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/Rescale.java Tue Feb 6 04:31:06 2007
@@ -83,11 +83,11 @@
g.translate(0, bi.getHeight() + 30 + 20);
g.drawString("Rescale Red / Green / Blue", 10, 20);
- java.awt.image.RescaleOp redStress = new java.awt.image.RescaleOp(new float[]{ 2f, 1f, 1f },
+ java.awt.image.RescaleOp redStress = new java.awt.image.RescaleOp(new float[]{ 2.0f, 1.0f, 1.0f },
new float[]{ 0, 0, 0 }, null);
- java.awt.image.RescaleOp greenStress = new java.awt.image.RescaleOp(new float[]{ 1f, 2f, 1f },
+ java.awt.image.RescaleOp greenStress = new java.awt.image.RescaleOp(new float[]{ 1.0f, 2.0f, 1.0f },
new float[]{ 0, 0, 0 }, null);
- java.awt.image.RescaleOp blueStress = new java.awt.image.RescaleOp(new float[]{ 1f, 1f, 2f },
+ java.awt.image.RescaleOp blueStress = new java.awt.image.RescaleOp(new float[]{ 1.0f, 1.0f, 2.0f },
new float[]{ 0, 0, 0 }, null);
g.drawImage(bi, redStress, 10, 30);
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java?view=diff&rev=504106&r1=504105&r2=504106
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java Tue Feb 6 04:31:06 2007
@@ -43,7 +43,6 @@
import org.apache.batik.test.DefaultTestReport;
import org.apache.batik.test.TestReport;
-import org.apache.batik.svggen.SVGGraphics2D;
import org.apache.batik.dom.GenericDOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.DOMImplementation;
@@ -289,7 +288,7 @@
return report;
}
-
+
public int computeColumnNumber(String aStr, String bStr){
if(aStr == null || bStr == null){
return -1;
@@ -355,7 +354,7 @@
String namespaceURI = SVGConstants.SVG_NAMESPACE_URI;
Document domFactory = impl.createDocument(namespaceURI, SVG_SVG_TAG, null);
SVGGeneratorContext ctx = SVGGeneratorContext.createDefault(domFactory);
- GraphicContextDefaults defaults
+ GraphicContextDefaults defaults
= new GraphicContextDefaults();
defaults.font = new Font("Arial", Font.PLAIN, 12);
ctx.setGraphicContextDefaults(defaults);
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGGeneratorTests.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGGeneratorTests.java?view=diff&rev=504106&r1=504105&r2=504106
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGGeneratorTests.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGGeneratorTests.java Tue Feb 6 04:31:06 2007
@@ -28,7 +28,7 @@
/**
* This test validates that a given rendering sequence, modeled
- * by a <tt>Painter</tt> by doing several subtests for a
+ * by a <tt>Painter</tt> by doing several subtests for a
* single input class:
* + SVGAccuracyTest with several configurations
* + SVGRenderingAccuracyTest
@@ -39,13 +39,13 @@
* @version $Id$
*/
public class SVGGeneratorTests extends DefaultTestSuite {
- public static final String GENERATOR_REFERENCE_BASE
+ public static final String GENERATOR_REFERENCE_BASE
= "test-references/org/apache/batik/svggen/";
public static final String RENDERING_DIR
= "rendering";
- public static final String ACCEPTED_VARIATION_DIR
+ public static final String ACCEPTED_VARIATION_DIR
= "accepted-variation";
public static final String CANDIDATE_VARIATION_DIR
@@ -85,7 +85,7 @@
}catch(ClassNotFoundException e){
throw new IllegalArgumentException(clName);
}
-
+
Object o = null;
try {
@@ -104,7 +104,7 @@
addTest(makeGeneratorContext(painter, id));
addTest(makeSVGRenderingAccuracyTest(painter, id, PLAIN_GENERATION_PREFIX));
addTest(makeSVGRenderingAccuracyTest(painter, id, CUSTOM_CONTEXT_GENERATION_PREFIX));
- addTest(makeImageCompareTest(painter, id, PLAIN_GENERATION_PREFIX,
+ addTest(makeImageCompareTest(painter, id, PLAIN_GENERATION_PREFIX,
CUSTOM_CONTEXT_GENERATION_PREFIX));
}
@@ -114,7 +114,7 @@
public String getName(){
return "SVGGeneratorTest - " + getId();
}
-
+
protected String getPackageName(){
return "org.apache.batik.svggen";
}
@@ -155,7 +155,7 @@
private Test makeGeneratorContext(Painter painter, String id){
String cl = CUSTOM_CONTEXT_GENERATION_PREFIX + getNonQualifiedClassName(painter);
- GeneratorContext test
+ GeneratorContext test
= new GeneratorContext(painter, makeURL(painter, CUSTOM_CONTEXT_GENERATION_PREFIX));
test.setSaveSVG(new File(GENERATOR_REFERENCE_BASE + CANDIDATE_REF_DIR + "/" + cl + SVG_EXTENSION));
@@ -167,7 +167,7 @@
private Test makeSVGAccuracyTest(Painter painter, String id){
String cl = PLAIN_GENERATION_PREFIX + getNonQualifiedClassName(painter);
- SVGAccuracyTest test
+ SVGAccuracyTest test
= new SVGAccuracyTest(painter, makeURL(painter, PLAIN_GENERATION_PREFIX));
test.setSaveSVG(new File(GENERATOR_REFERENCE_BASE + CANDIDATE_REF_DIR + "/" + cl + SVG_EXTENSION));
@@ -178,7 +178,7 @@
private String getNonQualifiedClassName(Painter painter){
String cl = painter.getClass().getName();
- int n = cl.lastIndexOf(".");
+ int n = cl.lastIndexOf('.');
return cl.substring(n+1);
}
@@ -189,7 +189,7 @@
try{
url = new URL(urlString);
}catch(Exception e){
- throw new Error(); // Should not happen
+ throw new Error( e.getMessage() ); // Should not happen
}
return url;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/JSVGCanvasHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/JSVGCanvasHandler.java?view=diff&rev=504106&r1=504105&r2=504106
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/JSVGCanvasHandler.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/JSVGCanvasHandler.java Tue Feb 6 04:31:06 2007
@@ -42,7 +42,6 @@
import org.apache.batik.swing.gvt.GVTTreeRendererAdapter;
import org.apache.batik.swing.gvt.GVTTreeRendererEvent;
-import org.apache.batik.swing.JSVGCanvas;
import org.apache.batik.swing.svg.SVGDocumentLoaderAdapter;
import org.apache.batik.swing.svg.SVGDocumentLoaderEvent;
import org.apache.batik.swing.svg.SVGLoadEventDispatcherAdapter;
@@ -203,7 +202,7 @@
canvas.addSVGDocumentLoaderListener(ll);
sll = new SVGLoadEventListener();
canvas.addSVGLoadEventDispatcherListener(sll);
-
+
}});
} catch (Throwable t) {
t.printStackTrace();
@@ -330,7 +329,7 @@
}
}
public void managerStarted(UpdateManagerEvent e) {
- bindHost();
+ bindHost();
}
public void managerSuspended(UpdateManagerEvent e) { }
public void managerResumed(UpdateManagerEvent e) { }
@@ -391,5 +390,5 @@
um.addUpdateManagerListener(url);
}
}
-
+
}
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/JSVGInterruptTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/JSVGInterruptTest.java?view=diff&rev=504106&r1=504105&r2=504106
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/JSVGInterruptTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/JSVGInterruptTest.java Tue Feb 6 04:31:06 2007
@@ -22,8 +22,8 @@
import java.awt.geom.AffineTransform;
import java.io.File;
import java.net.MalformedURLException;
+import java.lang.ref.WeakReference;
-import org.apache.batik.swing.JSVGCanvas;
import org.apache.batik.swing.gvt.GVTTreeRendererListener;
import org.apache.batik.swing.gvt.GVTTreeRendererEvent;
import org.apache.batik.swing.svg.SVGDocumentLoaderListener;
@@ -103,7 +103,7 @@
public boolean canvasInit(final JSVGCanvas canvas) {
// System.err.println("In Init");
- theCanvas = canvas;
+ theCanvas = new WeakReference( canvas );
theFrame = handler.getFrame();
registerObjectDesc(canvas, "JSVGCanvas");
registerObjectDesc(handler.getFrame(), "JFrame");
@@ -383,12 +383,39 @@
}
+ /**
+ * a Runnable is run after the given delay has elapsed.
+ * A call to abort() can <i>prevent</i> the start of the Runable before it is
+ * started - it does not abort after it started.
+ */
class DelayRunnable extends Thread {
- int delay;
- Runnable r;
- boolean stop = false;
- boolean complete = false;
- public DelayRunnable(int delay, Runnable r) {
+
+ /**
+ * delay in milliSeconds - must not change after creation.
+ */
+ private final int delay;
+
+ /**
+ * the Runnable to start - must not change after creation.
+ */
+ private final Runnable r;
+
+ volatile boolean stop = false;
+ volatile boolean complete = false;
+
+ /**
+ * @param delay to wait before r is started in milliSeconds
+ * @param r a Runnable to start after delay
+ */
+ DelayRunnable(int delay, Runnable r) {
+
+ if ( delay < 0 ){
+ throw new IllegalArgumentException("delay must be >= 0 ! is:" + delay );
+ }
+ if ( r == null ){
+ throw new IllegalArgumentException("Runnable must not be null!");
+ }
+
this.delay = delay;
this.r = r;
setDaemon(true);
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AbstractImageTranscoderTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AbstractImageTranscoderTest.java?view=diff&rev=504106&r1=504105&r2=504106
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AbstractImageTranscoderTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AbstractImageTranscoderTest.java Tue Feb 6 04:31:06 2007
@@ -45,9 +45,6 @@
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.transcoder.image.ImageTranscoder;
-import org.apache.batik.transcoder.image.PNGTranscoder;
-
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.DefaultTestReport;
import org.apache.batik.test.TestReport;
@@ -103,7 +100,7 @@
throw new IllegalArgumentException();
}
}
-
+
// url is not a file. It must be a regular URL...
try{
return new URL(url);
@@ -121,7 +118,7 @@
report = new DefaultTestReport(this);
try {
- DiffImageTranscoder transcoder =
+ DiffImageTranscoder transcoder =
new DiffImageTranscoder(getReferenceImageData());
Map hints = createTranscodingHints();
@@ -137,7 +134,7 @@
ex.printStackTrace();
report.setPassed(false);
}
-
+
return report;
}
@@ -251,7 +248,7 @@
* @param img the image to write
* @param output the output (ignored)
* @throw TranscoderException if an error occured while storing the
- * image
+ * image
*/
public void writeImage(BufferedImage img, TranscoderOutput output)
throws TranscoderException {
@@ -278,7 +275,7 @@
try {
BufferedImage ref = getImage(new ByteArrayInputStream(refData));
BufferedImage img = getImage(new ByteArrayInputStream(imgData));
- BufferedImage diff =
+ BufferedImage diff =
SVGRenderingAccuracyTest.buildDiffImage(ref, img);
String s = new File(filename).getName();
s = ("test-references/org/apache/batik/transcoder/image/"+
@@ -298,7 +295,7 @@
/**
* 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
@@ -317,7 +314,7 @@
state = false;
return;
}
-
+
if (refImgData.length != imgData.length) {
report.setErrorCode(ERROR_IMAGE_DIFFER);
report.addDescriptionEntry(ERROR_IMAGE_DIFFER, "");
@@ -335,20 +332,20 @@
return;
}
}
-
+
state = true;
}
/**
* Returns true if the reference image is the same than the generated
- * image, false otherwise.
+ * image, false otherwise.
*/
public boolean isIdentical() {
return state;
}
}
- protected BufferedImage getImage(InputStream is)
+ protected BufferedImage getImage(InputStream is)
throws IOException {
ImageTagRegistry reg = ImageTagRegistry.getRegistry();
Filter filt = reg.readStream(is);
@@ -358,7 +355,7 @@
RenderedImage red = filt.createDefaultRendering();
if(red == null)
throw new IOException("Couldn't render Stream");
-
+
BufferedImage img = new BufferedImage(red.getWidth(),
red.getHeight(),
BufferedImage.TYPE_INT_ARGB);
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/util/Base64Test.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/util/Base64Test.java?view=diff&rev=504106&r1=504105&r2=504106
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/util/Base64Test.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/util/Base64Test.java Tue Feb 6 04:31:06 2007
@@ -137,14 +137,14 @@
if (action.equals("ROUND"))
this.ref = in;
- else if (!action.equals("ENCODE") &&
+ else if (!action.equals("ENCODE") &&
!action.equals("DECODE")) {
report.setErrorCode(ERROR_BAD_ACTION_STRING);
report.setDescription(new TestReport.Entry[] {
new TestReport.Entry
(TestMessages.formatMessage
(ENTRY_KEY_ERROR_DESCRIPTION, null),
- TestMessages.formatMessage(ERROR_BAD_ACTION_STRING,
+ TestMessages.formatMessage(ERROR_BAD_ACTION_STRING,
new String[]{action}))
});
report.setPassed(false);
@@ -178,7 +178,7 @@
// Copy the input to the Base64 Encoder (in a seperate thread).
Thread t = new StreamCopier(inIS, os);
-
+
// Read that from the piped output stream.
inIS = new PipedInputStream(pos);
t.start();
@@ -187,11 +187,11 @@
if (action.equals("DECODE")||
action.equals("ROUND")) {
inIS = new Base64DecodeStream(inIS);
- }
+ }
int mismatch = compareStreams(inIS, refIS, action.equals("ENCODE"));
-
+
if (mismatch == -1) {
report.setPassed(true);
return report;
@@ -201,8 +201,8 @@
report.setDescription(new TestReport.Entry[] {
new TestReport.Entry
(TestMessages.formatMessage(ENTRY_KEY_ERROR_DESCRIPTION, null),
- TestMessages.formatMessage(ERROR_WRONG_RESULT,
- new String[]{""+mismatch}))
+ TestMessages.formatMessage(ERROR_WRONG_RESULT,
+ new String[]{ String.valueOf( mismatch )} ))
});
report.setPassed(false);
return report;
@@ -212,7 +212,7 @@
* Returns true if the contents of <tt>is1</tt> match the
* contents of <tt>is2</tt>
*/
- public static int compareStreams(InputStream is1, InputStream is2,
+ public static int compareStreams(InputStream is1, InputStream is2,
boolean skipws) {
byte [] data1 = new byte[100];
byte [] data2 = new byte[100];
@@ -250,7 +250,7 @@
// check if the rest of is2 is whitespace...
for (int i2=0; i2<len2; i2++)
if ((data2[i2] != '\n') &&
- (data2[i2] != '\r') &&
+ (data2[i2] != '\r') &&
(data2[i2] != ' '))
return idx+i2;
off1 = off2 = 0;
@@ -265,7 +265,7 @@
// Check if rest of is1 is whitespace...
for (int i1=0; i1<len1; i1++)
if ((data1[i1] != '\n') &&
- (data1[i1] != '\r') &&
+ (data1[i1] != '\r') &&
(data1[i1] != ' '))
return idx+i1;
off1 = off2 = 0;
@@ -276,14 +276,14 @@
int i2=0;
while((i1<len1) && (i2<len2)) {
if (skipws) {
- if ((data1[i1] == '\n') ||
- (data1[i1] == '\r') ||
+ if ((data1[i1] == '\n') ||
+ (data1[i1] == '\r') ||
(data1[i1] == ' ')) {
i1++;
continue;
}
- if ((data2[i2] == '\n') ||
- (data2[i2] == '\r') ||
+ if ((data2[i2] == '\n') ||
+ (data2[i2] == '\r') ||
(data2[i2] == ' ')) {
i2++;
continue;