svn commit: r1157058 - /commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java

[bodewig]

Author: bodewig
Date: Fri Aug 12 11:49:28 2011
New Revision: 1157058

URL: http://svn.apache.org/viewvc?rev=1157058&view=rev
Log:
Interop tests with WinZip

Modified:
    
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java

Modified: 
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java?rev=1157058&r1=1157057&r2=1157058&view=diff
==============================================================================
--- 
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
 (original)
+++ 
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
 Fri Aug 12 11:49:28 2011
@@ -62,6 +62,11 @@ public class Zip64SupportIT {
         read5GBOfZerosImpl(get5GBZerosFileGeneratedByJava7Jar(), 
"5GB_of_Zeros");
     }
 
+    @Test public void read5GBOfZerosGeneratedByWinZIPUsingInputStream()
+        throws Throwable {
+        read5GBOfZerosImpl(get5GBZerosFileGeneratedByWinZIP(), "5GB_of_Zeros");
+    }
+
     @Test public void read100KFilesUsingInputStream() throws Throwable {
         read100KFilesImpl(get100KFileFile());
     }
@@ -81,6 +86,11 @@ public class Zip64SupportIT {
         read100KFilesImpl(get100KFileFileGeneratedByJava7Jar());
     }
 
+    @Test public void read100KFilesGeneratedByWinZIPUsingInputStream()
+        throws Throwable {
+        read100KFilesImpl(get100KFileFileGeneratedByWinZIP());
+    }
+
     @Test public void read5GBOfZerosUsingZipFile() throws Throwable {
         read5GBOfZerosUsingZipFileImpl(get5GBZerosFile(), "5GB_of_Zeros");
     }
@@ -97,6 +107,12 @@ public class Zip64SupportIT {
                                        "5GB_of_Zeros");
     }
 
+    @Test public void read5GBOfZerosGeneratedByWinZIPUsingZipFile()
+        throws Throwable {
+        read5GBOfZerosUsingZipFileImpl(get5GBZerosFileGeneratedByWinZIP(),
+                                       "5GB_of_Zeros");
+    }
+
     @Test public void read100KFilesUsingZipFile() throws Throwable {
         read100KFilesUsingZipFileImpl(get100KFileFile());
     }
@@ -116,6 +132,11 @@ public class Zip64SupportIT {
         read100KFilesUsingZipFileImpl(get100KFileFileGeneratedByJava7Jar());
     }
 
+    @Test public void read100KFilesGeneratedByWinZIPUsingZipFile()
+        throws Throwable {
+        read100KFilesUsingZipFileImpl(get100KFileFileGeneratedByWinZIP());
+    }
+
     private static ZipOutputTest write100KFiles() {
         return write100KFiles(Zip64Mode.AsNeeded);
     }
@@ -2274,6 +2295,10 @@ public class Zip64SupportIT {
         return getFile("/5GB_of_Zeros_jar.zip");
     }
 
+    private static File get5GBZerosFileGeneratedByWinZIP() throws Throwable {
+        return getFile("/5GB_of_Zeros_7ZIP.zip");
+    }
+
     private static File get100KFileFile() throws Throwable {
         return getFile("/100k_Files.zip");
     }
@@ -2290,6 +2315,10 @@ public class Zip64SupportIT {
         return getFile("/100k_Files_jar.zip");
     }
 
+    private static File get100KFileFileGeneratedByWinZIP() throws Throwable {
+        return getFile("/100k_Files_WinZIP.zip");
+    }
+
     private static File getTempFile(String testName) throws Throwable {
         File f = File.createTempFile("commons-compress-" + testName, ".zip");
         f.deleteOnExit();