Return-Path: 
 <commits-return-3801-apmail-aries-commits-archive=aries.apache.org@aries.apache.org>
X-Original-To: apmail-aries-commits-archive@www.apache.org
Delivered-To: apmail-aries-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id BDCED4311
	for <apmail-aries-commits-archive@www.apache.org>;
 Tue, 17 May 2011 17:57:31 +0000 (UTC)
Received: (qmail 43183 invoked by uid 500); 17 May 2011 17:57:31 -0000
Delivered-To: apmail-aries-commits-archive@aries.apache.org
Received: (qmail 43125 invoked by uid 500); 17 May 2011 17:57:31 -0000
Mailing-List: contact commits-help@aries.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@aries.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@aries.apache.org>
List-Post: <mailto:commits@aries.apache.org>
List-Id: <commits.aries.apache.org>
Reply-To: dev@aries.apache.org
Delivered-To: mailing list commits@aries.apache.org
Received: (qmail 43115 invoked by uid 99); 17 May 2011 17:57:31 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 May 2011 17:57:31 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 May 2011 17:57:30 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 627EC23889ED; Tue, 17 May 2011 17:57:10 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1104439 -
 /aries/trunk/application/application-utils/src/test/java/org/apache/aries/application/utils/filesystem/FileSystemTest.java
Date: Tue, 17 May 2011 17:57:10 -0000
To: commits@aries.apache.org
From: mahrwald@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110517175710.627EC23889ED@eris.apache.org>

Author: mahrwald
Date: Tue May 17 17:57:10 2011
New Revision: 1104439

URL: http://svn.apache.org/viewvc?rev=1104439&view=rev
Log:
ARIES-652: And the tests of course :)

Modified:
    aries/trunk/application/application-utils/src/test/java/org/apache/aries/application/utils/filesystem/FileSystemTest.java

Modified: aries/trunk/application/application-utils/src/test/java/org/apache/aries/application/utils/filesystem/FileSystemTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-utils/src/test/java/org/apache/aries/application/utils/filesystem/FileSystemTest.java?rev=1104439&r1=1104438&r2=1104439&view=diff
==============================================================================
--- aries/trunk/application/application-utils/src/test/java/org/apache/aries/application/utils/filesystem/FileSystemTest.java (original)
+++ aries/trunk/application/application-utils/src/test/java/org/apache/aries/application/utils/filesystem/FileSystemTest.java Tue May 17 17:57:10 2011
@@ -35,8 +35,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.jar.Manifest;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
+import org.apache.aries.application.filesystem.ICloseableDirectory;
 import org.apache.aries.application.filesystem.IDirectory;
 import org.apache.aries.application.filesystem.IFile;
 import org.apache.aries.application.utils.AppConstants;
@@ -83,6 +85,7 @@ public class FileSystemTest
     File desiredFile = new File(baseDir, AppConstants.APPLICATION_MF);
     
     runBasicDirTest(dir, desiredFile.length(), desiredFile.lastModified());
+    runBasicDirTest(dir.toCloseable(), desiredFile.length(), desiredFile.lastModified());
   }
   
   /**
@@ -165,7 +168,10 @@ public class FileSystemTest
 	  assertNotNull(inner);
 	  
 	  File desiredFile = new File(new File(getTestResourceDir(), "/app1"), AppConstants.APPLICATION_MF);  
+	  
+	  // no size information when stream reading :(
 	  runBasicDirTest(inner, "app2.zip/", -1, desiredFile.lastModified());
+	  runBasicDirTest(inner.toCloseable(), "app2.zip/", desiredFile.length(), desiredFile.lastModified());
   }
   
   /**
@@ -184,6 +190,61 @@ public class FileSystemTest
     File desiredFile = new File(new File(getTestResourceDir(), "/app1"), AppConstants.APPLICATION_MF);
     
     runBasicDirTest(dir, desiredFile.length(), desiredFile.lastModified());
+    runBasicDirTest(dir.toCloseable(), desiredFile.length(), desiredFile.lastModified());
+  }
+  
+  @Test
+  public void zipCloseableZipSimplePerformanceTest() throws IOException
+  {
+	  int N = 100000;
+	  File baseDir = new File("fileSystemTest/app2.zip");
+
+	  ZipFile zip = new ZipFile(baseDir);	  
+	  
+	  long start = System.currentTimeMillis();
+	  for (int i=0; i<N; i++) {
+		  ZipEntry ze = zip.getEntry(AppConstants.APPLICATION_MF);
+		  InputStream is = zip.getInputStream(ze);
+		  is.close();
+	  }
+	  long duration = System.currentTimeMillis() - start;
+
+	  
+	  // normal zip files 
+	  
+	  ICloseableDirectory dir = FileSystem.getFSRoot(baseDir).toCloseable();
+
+	  start = System.currentTimeMillis();
+	  for (int i=0; i<N; i++) {
+		  IFile appMf = dir.getFile(AppConstants.APPLICATION_MF);
+		  InputStream is = appMf.open();
+		  is.close();
+	  }
+	  long duration2 = System.currentTimeMillis() - start;
+	  
+	  dir.close();
+	  // within an order of magnitude
+	  assertTrue("ZipFile: "+duration+", IDirectory: "+duration2 , duration2 < 10*duration );
+	  
+	  
+	  // nested zip files
+	  
+	  IDirectory outer = FileSystem.getFSRoot(new File("fileSystemTest/outer.zip"));
+	  IFile innerFile = outer.getFile("app2.zip");
+	  dir = innerFile.convertNested().toCloseable();
+	  
+	  start = System.currentTimeMillis();
+	  for (int i=0; i<N; i++) {
+		  IFile appMf = dir.getFile(AppConstants.APPLICATION_MF);
+		  InputStream is = appMf.open();
+		  is.close();
+	  }
+	  long duration3 = System.currentTimeMillis() - start;
+	  
+	  dir.close();
+	  // within an order of magnitude
+	  assertTrue("ZipFile: "+duration+", IDirectory: "+duration3 , duration3 < 10*duration );
+	  
   }
   
   /**