Add symbolic links check when comparing archives

plamentotev · plamentotev · commit 356473d1c676 · 2015-11-23T23:01:43.000+02:00
diff --git a/src/test/java/org/codehaus/plexus/archiver/zip/ArchiveFileComparator.java b/src/test/java/org/codehaus/plexus/archiver/zip/ArchiveFileComparator.java
@@ -83,6 +83,7 @@ private static void assertEquals( ArchiveFile file1, TarArchiveEntry entry1,
         throws IOException
     {
         Assert.assertEquals( entry1.isDirectory(), entry2.isDirectory() );
+        Assert.assertEquals( entry1.isSymbolicLink(), entry2.isSymbolicLink() );
         Assert.assertEquals( entry1.getModTime().getTime(), entry2.getModTime().getTime() );
 
         final InputStream is1 = file1.getInputStream( entry1 );
@@ -98,6 +99,7 @@ private static void assertEquals( ZipFile file1, ZipArchiveEntry entry1,
             throws Exception
     {
         Assert.assertEquals( entry1.isDirectory(), entry2.isDirectory() );
+        Assert.assertEquals( entry1.isUnixSymlink(), entry2.isUnixSymlink() );
         long timeDelta = entry1.getLastModifiedDate().getTime() - entry2.getLastModifiedDate().getTime();
         Assert.assertTrue( Math.abs( timeDelta ) <= 1000 );
 

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ private static void assertEquals( ArchiveFile file1, TarArchiveEntry entry1,`
`83`	`83`	`throws IOException`
`84`	`84`	`{`
`85`	`85`	`Assert.assertEquals( entry1.isDirectory(), entry2.isDirectory() );`
	`86`	`+ Assert.assertEquals( entry1.isSymbolicLink(), entry2.isSymbolicLink() );`
`86`	`87`	`Assert.assertEquals( entry1.getModTime().getTime(), entry2.getModTime().getTime() );`
`87`	`88`
`88`	`89`	`final InputStream is1 = file1.getInputStream( entry1 );`
`@@ -98,6 +99,7 @@ private static void assertEquals( ZipFile file1, ZipArchiveEntry entry1,`
`98`	`99`	`throws Exception`
`99`	`100`	`{`
`100`	`101`	`Assert.assertEquals( entry1.isDirectory(), entry2.isDirectory() );`
	`102`	`+ Assert.assertEquals( entry1.isUnixSymlink(), entry2.isUnixSymlink() );`
`101`	`103`	`long timeDelta = entry1.getLastModifiedDate().getTime() - entry2.getLastModifiedDate().getTime();`
`102`	`104`	`Assert.assertTrue( Math.abs( timeDelta ) <= 1000 );`
`103`	`105`