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

[britter]

Author: britter
Date: Sat Dec 27 22:54:56 2014
New Revision: 1648123

URL: http://svn.apache.org/r1648123
Log:
Use TemporaryFolder test rule instead of handling temporary folders in our 
code. createTempFile can also be replaced by folder.newFile(), but this 
requires some more refactoring in the tests using it.

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=1648123&r1=1648122&r2=1648123&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
 Sat Dec 27 22:54:56 2014
@@ -26,25 +26,18 @@ import java.util.List;
 
 import org.apache.commons.imaging.test.util.FileSystemTraversal;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
 
 public abstract class ImagingTest implements
         ImagingTestConstants, ImagingConstants {
 
-    protected File createTempDirectory() throws IOException {
-        final File tempFolder = new File("tmp");
-        if (!tempFolder.exists()) {
-            tempFolder.mkdirs();
-        }
-        assertTrue(tempFolder.isDirectory());
-        return tempFolder;
-    }
-    
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+
     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;
+        return File.createTempFile(prefix, suffix, folder.newFolder());
     }
 
     protected boolean isPhilHarveyTestImage(final File file) {

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=1648123&r1=1648122&r2=1648123&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
 Sat Dec 27 22:54:56 2014
@@ -418,8 +418,7 @@ public class IcnsRoundTripTest extends I
     private void writeAndReadImageData(final String description, final byte[] 
rawData,
             final int foreground, final int background) throws IOException,
             ImageReadException {
-        final File exportFile = new File(createTempDirectory(), description + 
".icns");
-        exportFile.deleteOnExit();
+        final File exportFile = createTempFile(description, ".icns");
         FileUtils.writeByteArrayToFile(exportFile, rawData);
         final BufferedImage dstImage = Imaging.getBufferedImage(exportFile);