svn commit: r1544652 - in /commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging: ImagingTest.java formats/icns/IcnsRoundTripTest.java

[da...@apache.org]

Author: damjan
Date: Fri Nov 22 19:18:23 2013
New Revision: 1544652

URL: http://svn.apache.org/r1544652
Log:
Clean up some tests.


Modified:
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java?rev=1544652&r1=1544651&r2=1544652&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java Fri Nov 22 19:18:23 2013
@@ -33,14 +33,18 @@ import org.apache.commons.imaging.util.D
 public abstract class ImagingTest extends TestCase implements
         ImagingTestConstants, ImagingConstants {
 
-    protected File createTempFile(final String prefix, final String suffix)
-            throws IOException {
+    protected File createTempDirectory() throws IOException {
         final File tempFolder = new File("tmp");
         if (!tempFolder.exists()) {
             tempFolder.mkdirs();
         }
         assertTrue(tempFolder.isDirectory());
-
+        return tempFolder;
+    }
+    
+    protected File createTempFile(final String prefix, final String suffix)
+            throws IOException {
+        final File tempFolder = createTempDirectory();
         final File result = File.createTempFile(prefix, suffix, tempFolder);
         result.deleteOnExit();
         return result;

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java?rev=1544652&r1=1544651&r2=1544652&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java Fri Nov 22 19:18:23 2013
@@ -406,14 +406,10 @@ public class IcnsRoundTripTest extends I
     private void writeAndReadImageData(final String description, final byte[] rawData,
             final int foreground, final int background) throws IOException,
             ImageReadException {
-        // Uncomment to generate ICNS files that can be tested with MacOS:
-        final File exportFile = new File("/tmp/" + description + ".icns");
+        final File exportFile = new File(createTempDirectory(), description + ".icns");
+        exportFile.deleteOnExit();
         IoUtils.writeToFile(rawData, exportFile);
-
-        final File tempFile = createTempFile("temp", ".icns");
-        IoUtils.writeToFile(rawData, tempFile);
-
-        final BufferedImage dstImage = Imaging.getBufferedImage(tempFile);
+        final BufferedImage dstImage = Imaging.getBufferedImage(exportFile);
 
         assertNotNull(dstImage);
         assertTrue(dstImage.getWidth() == image[0].length);