test: Improvements to ArchiveFileComparator

Signed-off-by: Jorge Solórzano <jorsol@gmail.com>

Author: jorsol

pom.xml

@@ -140,6 +140,12 @@
       <version>5.1.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.23.1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

src/test/java/org/codehaus/plexus/archiver/tar/TarArchiverTest.java

@@ -58,6 +58,7 @@
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.Os;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**
@@ -527,19 +528,7 @@ public void testGzipFIleHandleLeak()
         final File tarFile2 = tarHandler.createTarfile2( tarFile );
         final TarFile cmp1 = tarHandler.newTarFile( tarFile );
         final TarFile cmp2 = new TarFile( tarFile2 );
-        ArchiveFileComparator.forEachTarArchiveEntry( cmp1, new ArchiveFileComparator.TarArchiveEntryConsumer()
-        {
-
-            @Override
-            public void accept( TarArchiveEntry ze1 )
-                throws IOException
-            {
-                final String name1 = ze1.getName();
-                assertNotNull( name1 );
-
-            }
-
-        } );
+        ArchiveFileComparator.forEachTarArchiveEntry( cmp1, ze1 -> Assert.assertNotNull( ze1.getName() ) );
         cmp1.close();
         cmp2.close();
 
@@ -571,7 +560,7 @@ private void testCreateResourceCollection( TarHandler tarHandler )
         final File tarFile2 = tarHandler.createTarfile2( tarFile );
         final TarFile cmp1 = tarHandler.newTarFile( tarFile );
         final TarFile cmp2 = new TarFile( tarFile2 );
-        ArchiveFileComparator.assertEquals( cmp1, cmp2, "prfx/" );
+        ArchiveFileComparator.assertTarEquals( cmp1, cmp2, "prfx/" );
         cmp1.close();
         cmp2.close();
     }
@@ -591,7 +580,7 @@ public void testSymlinkArchivedFileSet()
 
         final TarFile cmp1 = new TarFile( tarFile );
         final TarFile cmp2 = new TarFile( tarFile2 );
-        ArchiveFileComparator.assertEquals( cmp1, cmp2, "" );
+        ArchiveFileComparator.assertTarEquals( cmp1, cmp2, "" );
     }
 
 }