svn commit: r758786 - /commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java

[se...@apache.org]

Author: sebb
Date: Thu Mar 26 18:18:49 2009
New Revision: 758786

URL: http://svn.apache.org/viewvc?rev=758786&view=rev
Log:
Ensure temp archives are deleted

Modified:
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java?rev=758786&r1=758785&r2=758786&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java Thu Mar 26 18:18:49 2009
@@ -42,9 +42,12 @@
     protected File dir;
     protected File resultDir;
 
+    private File archive;
+
     protected void setUp() throws Exception {
         dir = mkdir("dir");
         resultDir = mkdir("dir-result");
+        archive = null;
     }
 
     protected static File mkdir(String name) throws IOException {
@@ -62,9 +65,14 @@
         rmdir(dir);
         rmdir(resultDir);
         dir = resultDir = null;
+        if (archive != null) {
+            if (!archive.delete()){
+                throw new Exception("Could not delete "+archive.getPath());
+            }
+        }
     }
 
-    protected static void rmdir(File f) throws IOException {
+    protected static void rmdir(File f) {
         String[] s = f.list();
         if (s != null) {
             for (int i = 0; i < s.length; i++) {
@@ -100,9 +108,9 @@
         ArchiveOutputStream out = null;
         OutputStream stream = null;
         try {
-            File temp = File.createTempFile("test", "." + archivename);
+            archive = File.createTempFile("test", "." + archivename);
 
-            stream = new FileOutputStream(temp);
+            stream = new FileOutputStream(archive);
             out = new ArchiveStreamFactory().createArchiveOutputStream(
                     archivename, stream);
 
@@ -167,7 +175,7 @@
             IOUtils.copy(new FileInputStream(file6), out);
             out.closeArchiveEntry();
 
-            return temp;
+            return archive;
         } finally {
             if (out != null) {
                 out.close();