vhardy 01/09/07 07:49:09
Modified: test-sources/org/apache/batik/test/svg
SVGRenderingAccuracyTest.java
Log:
Added resolution of file URLs.
Revision Changes Path
1.8 +27 -7
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SVGRenderingAccuracyTest.java 2001/07/18 22:04:55 1.7
+++ SVGRenderingAccuracyTest.java 2001/09/07 14:49:09 1.8
@@ -18,6 +18,7 @@
import java.io.PrintWriter;
import java.net.URL;
+import java.net.MalformedURLException;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -60,7 +61,7 @@
* all pixel values are the same).
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Hardy</a>
- * @version $Id: SVGRenderingAccuracyTest.java,v 1.7 2001/07/18 22:04:55 deweese
Exp $
+ * @version $Id: SVGRenderingAccuracyTest.java,v 1.8 2001/09/07 14:49:09 vhardy Exp
$
*/
public class SVGRenderingAccuracyTest implements Test{
/**
@@ -244,12 +245,31 @@
throw new IllegalArgumentException();
}
- this.svgURL = svgURL;
+ this.svgURL = getSVGURL(svgURL.toString());
this.refImgURL = refImgURL;
this.variationURL = variationURL;
this.saveVariation = saveVariation;
}
+ private URL getSVGURL(String s) {
+ URL url = null;
+
+ try{
+ File f = new File(s);
+ if(f.exists()){
+ url = f.toURL();
+ }
+ else{
+ url = new URL(s);
+ }
+ }catch(MalformedURLException e){
+ // Cannot happen because s is originall a URL,
+ // see constructor.
+ }
+
+ return url;
+ }
+
/**
* Sets the File where the variation from the reference image should be
* stored
@@ -330,7 +350,7 @@
}
ImageTranscoder transcoder = getImageTranscoder();
- TranscoderInput src = new TranscoderInput(svgURL.toExternalForm());
+ TranscoderInput src = new TranscoderInput(svgURL.toString());
TranscoderOutput dst = new TranscoderOutput(tmpFileOS);
try{
@@ -343,7 +363,7 @@
report.setDescription(new TestReport.Entry[]{
new
TestReport.Entry(Messages.formatMessage(ENTRY_KEY_ERROR_DESCRIPTION, null),
Messages.formatMessage(ERROR_CANNOT_TRANSCODE_SVG,
- new
String[]{svgURL.toExternalForm(),
+ new String[]{svgURL.toString(),
e.getClass().getName(),
e.getMessage(),
trace.toString()
@@ -358,7 +378,7 @@
report.setDescription(new TestReport.Entry[]{
new
TestReport.Entry(Messages.formatMessage(ENTRY_KEY_ERROR_DESCRIPTION, null),
Messages.formatMessage(ERROR_CANNOT_TRANSCODE_SVG,
- new
String[]{svgURL.toExternalForm(),
+ new String[]{svgURL.toString(),
e.getClass().getName(),
e.getMessage(),
trace.toString()
@@ -380,7 +400,7 @@
report.setDescription( new TestReport.Entry[]{
new
TestReport.Entry(Messages.formatMessage(ENTRY_KEY_ERROR_DESCRIPTION, null),
Messages.formatMessage(ERROR_CANNOT_OPEN_REFERENCE_IMAGE,
- new
Object[]{refImgURL.toExternalForm(),
+ new Object[]{refImgURL.toString(),
e.getMessage()})) });
report.setPassed(false);
tmpFile.delete();
@@ -411,7 +431,7 @@
report.setDescription(new TestReport.Entry[]{
new
TestReport.Entry(Messages.formatMessage(ENTRY_KEY_ERROR_DESCRIPTION, null),
Messages.formatMessage(ERROR_ERROR_WHILE_COMPARING_FILES,
- new
Object[]{refImgURL.toExternalForm(),
+ new Object[]{refImgURL.toString(),
tmpFile.getAbsolutePath(),
e.getMessage()}))});
report.setPassed(false);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
