You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ja...@apache.org on 2008/08/13 06:47:57 UTC

svn commit: r685439 - /maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java

Author: janb
Date: Tue Aug 12 21:47:57 2008
New Revision: 685439

URL: http://svn.apache.org/viewvc?rev=685439&view=rev
Log:
Ensure test code closes Files for windows.

Modified:
    maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java

Modified: maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java?rev=685439&r1=685438&r2=685439&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java Tue Aug 12 21:47:57 2008
@@ -128,7 +128,9 @@
         File stagedFile = new File (batchDir, "file1.txt");
         System.err.println("Checking existence of "+stagedFile.getCanonicalPath());
         assertTrue(stagedFile.exists());
-        assertEquals(data1,IO.toString(new FileInputStream(stagedFile)));
+        FileInputStream fis = new FileInputStream(stagedFile);
+        assertEquals(data1,IO.toString(fis));
+        fis.close();
 
         request.setMethod("PUT");
         request.setURI("/context/file2.txt");
@@ -142,7 +144,9 @@
         batchDir = new File (_stagingDir, "999999");
         stagedFile = new File (batchDir, "file2.txt");
         assertTrue(stagedFile.exists());
-        assertEquals(data2,IO.toString(new FileInputStream(stagedFile)));
+        fis = new FileInputStream(stagedFile);
+        assertEquals(data2,IO.toString(fis));
+        fis.close();
 
         // test POST commit
         request = new HttpTester();
@@ -187,9 +191,11 @@
         stagedFile = new File(stagedFile, "foo");
         stagedFile = new File (stagedFile, "file1.txt");
         System.err.println("Checking existence of "+stagedFile.getCanonicalPath());
+        FileInputStream fis = new FileInputStream(stagedFile);
         assertTrue(stagedFile.exists());
-        assertEquals(data1,IO.toString(new FileInputStream(stagedFile)));
-
+        assertEquals(data1,IO.toString(fis));
+        fis.close();
+        
         request.setMethod("PUT");
         request.setVersion("HTTP/1.1");
         request.setHeader("Host","tester");
@@ -204,8 +210,10 @@
         batchDir = new File (_stagingDir, "999999");
         stagedFile = new File (batchDir, "file2.txt");
         assertTrue(stagedFile.exists());
-        assertEquals(data2,IO.toString(new FileInputStream(stagedFile)));
-
+        fis = new FileInputStream(stagedFile);
+        assertEquals(data2,IO.toString(fis));
+        fis.close();
+        
         // test POST discard
         request = new HttpTester();
         request.setMethod("POST");