You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by bo...@apache.org on 2011/08/01 13:33:33 UTC
svn commit: r1152744 -
/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportTest.java
Author: bodewig
Date: Mon Aug 1 11:33:32 2011
New Revision: 1152744
URL: http://svn.apache.org/viewvc?rev=1152744&view=rev
Log:
three more archives with 100k files generated by different archivers. The archives themselves are linked from COMPRESS-36
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportTest.java
Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportTest.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportTest.java?rev=1152744&r1=1152743&r2=1152744&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportTest.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportTest.java Mon Aug 1 11:33:32 2011
@@ -61,25 +61,19 @@ public class Zip64SupportTest {
}
@Test public void read100KFilesUsingInputStream() throws Throwable {
- FileInputStream fin = new FileInputStream(get100KFileFile());
- ZipArchiveInputStream zin = null;
- try {
- zin = new ZipArchiveInputStream(fin);
- int files = 0;
- ZipArchiveEntry zae = null;
- while ((zae = zin.getNextZipEntry()) != null) {
- if (!zae.isDirectory()) {
- files++;
- assertEquals(0, zae.getSize());
- }
- }
- assertEquals(ONE_HUNDRED_THOUSAND, files);
- } finally {
- if (zin != null) {
- zin.close();
- }
- fin.close();
- }
+ read100KFilesImpl(get100KFileFile());
+ }
+
+ @Test public void read100KFilesGeneratedBy7ZIPUsingInputStream() throws Throwable {
+ read100KFilesImpl(get100KFileFileGeneratedBy7ZIP());
+ }
+
+ @Test public void read100KFilesGeneratedByWinCFUsingInputStream() throws Throwable {
+ read100KFilesImpl(get100KFileFileGeneratedByWinCF());
+ }
+
+ @Test public void read100KFilesGeneratedByJava7JarUsingInputStream() throws Throwable {
+ read100KFilesImpl(get100KFileFileGeneratedByJava7Jar());
}
private static final ZipOutputTest write100KFiles =
@@ -1325,6 +1319,18 @@ public class Zip64SupportTest {
return getFile("/100k_Files.zip");
}
+ private static File get100KFileFileGeneratedBy7ZIP() throws Throwable {
+ return getFile("/100k_Files_7ZIP.zip");
+ }
+
+ private static File get100KFileFileGeneratedByWinCF() throws Throwable {
+ return getFile("/100k_Files_WindowsCompressedFolders.zip");
+ }
+
+ private static File get100KFileFileGeneratedByJava7Jar() throws Throwable {
+ return getFile("/100k_Files_jar.zip");
+ }
+
private static File getTempFile(String testName) throws Throwable {
File f = File.createTempFile("commons-compress-" + testName, ".zip");
f.deleteOnExit();
@@ -1373,6 +1379,28 @@ public class Zip64SupportTest {
}
}
+ private static void read100KFilesImpl(File f) throws IOException {
+ FileInputStream fin = new FileInputStream(f);
+ ZipArchiveInputStream zin = null;
+ try {
+ zin = new ZipArchiveInputStream(fin);
+ int files = 0;
+ ZipArchiveEntry zae = null;
+ while ((zae = zin.getNextZipEntry()) != null) {
+ if (!zae.isDirectory()) {
+ files++;
+ assertEquals(0, zae.getSize());
+ }
+ }
+ assertEquals(ONE_HUNDRED_THOUSAND, files);
+ } finally {
+ if (zin != null) {
+ zin.close();
+ }
+ fin.close();
+ }
+ }
+
private static long getLengthAndPositionAtCentralDirectory(RandomAccessFile a)
throws IOException {
final long end = a.length();