vhardy 02/05/07 09:50:18
Modified: test-sources/org/apache/batik/test/svg
SVGRenderingAccuracyTest.java
Log:
Now, candidate-references are removed before running accuracy tests. Furthermore,
deleteOnExit has been move to avoid sometimes too early candidate reference deletion
Revision Changes Path
1.29 +20 -14
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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- SVGRenderingAccuracyTest.java 7 Mar 2002 09:02:57 -0000 1.28
+++ SVGRenderingAccuracyTest.java 7 May 2002 16:50:17 -0000 1.29
@@ -67,7 +67,7 @@
* all pixel values are the same).
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Hardy</a>
- * @version $Id: SVGRenderingAccuracyTest.java,v 1.28 2002/03/07 09:02:57 tkormann
Exp $
+ * @version $Id: SVGRenderingAccuracyTest.java,v 1.29 2002/05/07 16:50:17 vhardy
Exp $
*/
public class SVGRenderingAccuracyTest extends AbstractTest {
/**
@@ -431,6 +431,16 @@
= new DefaultTestReport(this);
//
+ // First, do clean-up
+ //
+ if (candidateReference != null){
+ if (candidateReference.exists()){
+ candidateReference.delete();
+ }
+ }
+
+
+ //
// Render the SVG image into a raster. We use the
// ImageTranscoder to convert the SVG into a raster in
// a temporary file.
@@ -441,7 +451,6 @@
tmpFile = File.createTempFile(TEMP_FILE_PREFIX,
TEMP_FILE_SUFFIX,
null);
- tmpFile.deleteOnExit();
}catch(IOException e){
report.setErrorCode(ERROR_CANNOT_CREATE_TEMP_FILE);
report.setDescription(new TestReport.Entry[] {
@@ -453,6 +462,7 @@
return report;
}
+
FileOutputStream tmpFileOS = null;
try{
@@ -465,6 +475,7 @@
new
String[]{tmpFile.getAbsolutePath(),
e.getMessage()})) });
report.setPassed(false);
+ tmpFile.deleteOnExit();
return report;
}
@@ -488,6 +499,7 @@
trace.toString()
})) });
report.setPassed(false);
+ tmpFile.deleteOnExit();
return report;
}catch(Exception e){
StringWriter trace = new StringWriter();
@@ -503,6 +515,7 @@
trace.toString()
})) });
report.setPassed(false);
+ tmpFile.deleteOnExit();
return report;
}
@@ -525,9 +538,6 @@
// Try and save tmp file as a candidate variation
boolean deleteTmp = true;
if (candidateReference != null){
- if (candidateReference.exists()){
- candidateReference.delete();
- }
deleteTmp = tmpFile.renameTo(candidateReference);
}
@@ -549,6 +559,7 @@
e.getMessage()}))});
report.setPassed(false);
tmpFile.delete();
+ tmpFile.deleteOnExit();
return report;
}
@@ -565,13 +576,11 @@
tmpFile.getAbsolutePath(),
e.getMessage()}))});
if (candidateReference != null){
- if (candidateReference.exists()){
- candidateReference.delete();
- }
tmpFile.renameTo(candidateReference);
}
report.setPassed(false);
+ tmpFile.deleteOnExit();
return report;
}
@@ -644,13 +653,11 @@
diffFile) });
if (candidateReference != null){
- if (candidateReference.exists()){
- candidateReference.delete();
- }
tmpFile.renameTo(candidateReference);
}
report.setPassed(false);
+ tmpFile.deleteOnExit();
return report;
}
}catch(Exception e){
@@ -668,13 +675,11 @@
trace.toString()})) });
if (candidateReference != null){
- if (candidateReference.exists()){
- candidateReference.delete();
- }
tmpFile.renameTo(candidateReference);
}
report.setPassed(false);
+ tmpFile.deleteOnExit();
return report;
}
}
@@ -684,6 +689,7 @@
// Yahooooooo! everything worked out well.
//
report.setPassed(true);
+ tmpFile.deleteOnExit();
return report;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
