svn commit: r936730 - /httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/entity/TestFileEntity.java

[se...@apache.org]

Author: sebb
Date: Thu Apr 22 10:15:24 2010
New Revision: 936730

URL: http://svn.apache.org/viewvc?rev=936730&view=rev
Log:
Ensure temporary file is closed.
Fail if test does not clear up temp. files

Modified:
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/entity/TestFileEntity.java

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/entity/TestFileEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/entity/TestFileEntity.java?rev=936730&r1=936729&r2=936730&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/entity/TestFileEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/entity/TestFileEntity.java Thu Apr 22 10:15:24 2010
@@ -30,6 +30,7 @@ package org.apache.http.entity;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.InputStream;
 
 import junit.framework.TestCase;
 
@@ -51,11 +52,13 @@ public class TestFileEntity extends Test
         FileEntity httpentity = new FileEntity(tmpfile, HTTP.ISO_8859_1);
         
         assertEquals(tmpfile.length(), httpentity.getContentLength());
-        assertNotNull(httpentity.getContent());
+        final InputStream content = httpentity.getContent();
+        assertNotNull(content);
+        content.close();
         assertTrue(httpentity.isRepeatable());
         assertFalse(httpentity.isStreaming());        
         if (!tmpfile.delete()){
-            System.out.println("Failed to delete: "+tmpfile);
+            fail("Failed to delete: "+tmpfile);
         }
     }
 
@@ -90,7 +93,7 @@ public class TestFileEntity extends Test
             assertEquals(i, bytes[i]);
         }
         if (!tmpfile.delete()){
-            System.out.println("Failed to delete: "+tmpfile);
+            fail("Failed to delete: "+tmpfile);
         }
 
         try {