Add method to compare zip and tar files

Author: Plamen Totev

src/test/java/org/codehaus/plexus/archiver/zip/ArchiveFileComparator.java

@@ -94,6 +94,22 @@ private static void assertEquals( ArchiveFile file1, TarArchiveEntry entry1,
         is1.close();
         is2.close();
     }
+
+    private static void assertEquals( ArchiveFile file1, TarArchiveEntry entry1,
+                                      ZipFile file2, ZipArchiveEntry entry2 )
+            throws IOException
+    {
+        Assert.assertEquals( entry1.isDirectory(), entry2.isDirectory() );
+
+        final InputStream is1 = file1.getInputStream( entry1 );
+        final InputStream is2 = file2.getInputStream( entry2 );
+        final byte[] bytes1 = IOUtil.toByteArray( is1 );
+        final byte[] bytes2 = IOUtil.toByteArray( is2 );
+        Assert.assertTrue( Arrays.equals( bytes1, bytes2 ) );
+        is1.close();
+        is2.close();
+    }
+
     private static void assertEquals( ZipFile file1, ZipArchiveEntry entry1,
                                       ZipFile file2, ZipArchiveEntry entry2 )
             throws Exception
@@ -136,6 +152,26 @@ public void accept( TarArchiveEntry ze1 )
         Assert.assertTrue( map2.isEmpty() );
     }
 
+    
+    public static void assertEquals( final ArchiveFile file1, final ZipFile file2, final String prefix )
+        throws Exception
+    {
+        final Map<String,ZipArchiveEntry> map2 = getFileEntries( file2 );
+        forEachTarArchiveEntry( file1, new TarArchiveEntryConsumer()
+        {
+            public void accept( TarArchiveEntry ze1 )
+                throws IOException
+            {
+                final String name1 = ze1.getName();
+                final String name2 = prefix == null ? name1 : ( prefix + name1 );
+                ZipArchiveEntry ze2 = map2.remove( name2 );
+                Assert.assertNotNull( ze2 );
+                assertEquals( file1, ze1, file2, ze2 );
+            }
+        } );
+        Assert.assertTrue( map2.isEmpty() );
+    }
+
     public static void assertEquals( org.apache.commons.compress.archivers.zip.ZipFile file1, org.apache.commons.compress.archivers.zip.ZipFile file2, String prefix )
             throws Exception
     {