Migrate to JUnit 5

* Migrate org.junit.* to org.junit.jupiter.api.*
* Fix the assertions. In JUnit 5 the message is
  the last argument, not the first. Move all messages
  to the end of the arguments list.
* Replace JUnit4 rules with JUnit 5 build-in extensions.
* Remove dependency to hamcrest as it is used only in
  single test. Use the JUnit5 assertions instead.
* Sisu's InjectedTest setup and tearDown methods are
  not annotated with the JUnit5 annotations - @beforeeach
  and @AfterEach. Override those methods in TestSupport
  and place the respective annotations so those methods
  are invoked before/after each test.
* @beforeeach and @AfterEach are not inherited when
  the method is overridden. Place the appropriate
  annotation where there are such methods, so they
  are executed before/after each test.

Closes #81

Author: plamentotev

pom.xml

@@ -34,6 +34,7 @@
     <javaVersion>8</javaVersion>
     <sisuVersion>0.3.5</sisuVersion>
     <slf4jVersion>1.7.36</slf4jVersion>
+    <junitVersion>5.8.2</junitVersion>
     <project.build.outputTimestamp>2022-06-23T09:57:49Z</project.build.outputTimestamp>
   </properties>
 
@@ -104,21 +105,15 @@
     </dependency>
     <!-- Test dependencies -->
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.2</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junitVersion}</version>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.hamcrest</groupId>
-          <artifactId>hamcrest-core</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <version>2.2</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>${junitVersion}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/test/java/org/codehaus/plexus/archiver/AbstractArchiverTest.java

@@ -3,17 +3,17 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class AbstractArchiverTest
 {
 
     private AbstractArchiver archiver;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception
     {
         this.archiver = new AbstractArchiver()

src/test/java/org/codehaus/plexus/archiver/AbstractUnArchiverTest.java

@@ -21,17 +21,15 @@
 import java.util.Date;
 
 import org.codehaus.plexus.components.io.filemappers.FileMapper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.rules.TemporaryFolder;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.greaterThan;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Unit test for {@link AbstractUnArchiver}
@@ -40,15 +38,9 @@
  */
 public class AbstractUnArchiverTest
 {
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
-    @Rule
-    public TemporaryFolder temporaryFolder = new TemporaryFolder();
-
     private AbstractUnArchiver abstractUnArchiver;
 
-    @Before
+    @BeforeEach
     public void setUp()
     {
         this.abstractUnArchiver = new AbstractUnArchiver()
@@ -69,129 +61,121 @@ protected void execute()
         };
     }
 
-    @After
+    @AfterEach
     public void tearDown()
     {
         this.abstractUnArchiver = null;
     }
 
     @Test
-    public void shouldThrowExceptionBecauseRewrittenPathIsOutOfDirectory()
-        throws ArchiverException, IOException
+    public void shouldThrowExceptionBecauseRewrittenPathIsOutOfDirectory( @TempDir File targetFolder )
+        throws ArchiverException
     {
         // given
-        this.thrown.expectMessage( "Entry is outside of the target directory (../PREFIX/ENTRYNAME.SUFFIX)" );
-        final File targetFolder = temporaryFolder.newFolder();
-        final FileMapper[] fileMappers = new FileMapper[] { new FileMapper()
-        {
-            @Override
-            public String getMappedFileName( String pName )
-            {
-                return "../PREFIX/" + pName;
-            }
-        }, new FileMapper()
-        {
-            @Override
-            public String getMappedFileName( String pName )
-            {
-                return pName + ".SUFFIX";
-            }
-        } };
+        final FileMapper[] fileMappers = new FileMapper[] { pName -> "../PREFIX/" + pName, pName -> pName + ".SUFFIX"};
 
         // when
-        this.abstractUnArchiver.extractFile( null, targetFolder, null, "ENTRYNAME", null, false, null, null,
-                                             fileMappers );
-
+        Exception exception = assertThrows( ArchiverException.class, () ->
+            abstractUnArchiver.extractFile( null, targetFolder, null, "ENTRYNAME", null, false, null, null, fileMappers ) );
         // then
         // ArchiverException is thrown providing the rewritten path
+        assertEquals( "Entry is outside of the target directory (../PREFIX/ENTRYNAME.SUFFIX)", exception.getMessage() );
     }
 
     @Test
-    public void shouldExtractWhenFileOnDiskDoesNotExist() throws IOException
+    public void shouldExtractWhenFileOnDiskDoesNotExist(  @TempDir File temporaryFolder ) throws IOException
     {
         // given
-        File file = new File( temporaryFolder.getRoot(), "whatever.txt" ); // does not create the file!
+        File file = new File( temporaryFolder, "whatever.txt" ); // does not create the file!
         String entryname = file.getName();
         Date entryDate = new Date();
 
         // when & then
-        assertThat( this.abstractUnArchiver.shouldExtractEntry( temporaryFolder.getRoot(), file, entryname, entryDate ), is ( true ) );
+        assertTrue( abstractUnArchiver.shouldExtractEntry( temporaryFolder, file, entryname, entryDate ) );
     }
 
     @Test
-    public void shouldNotExtractWhenFileOnDiskIsNewerThanEntryInArchive() throws IOException
+    public void shouldNotExtractWhenFileOnDiskIsNewerThanEntryInArchive( @TempDir File temporaryFolder ) throws IOException
     {
         // given
-        File file = temporaryFolder.newFile();
+        File file = new File( temporaryFolder, "whatever.txt" );
+        file.createNewFile();
         file.setLastModified( System.currentTimeMillis() );
         String entryname = file.getName();
         Date entryDate = new Date( 0 );
 
         // when & then
-        assertThat( this.abstractUnArchiver.shouldExtractEntry( temporaryFolder.getRoot(), file, entryname, entryDate ), is ( false ) );
+        assertFalse( this.abstractUnArchiver.shouldExtractEntry( temporaryFolder, file, entryname, entryDate ) );
     }
 
     @Test
-    public void shouldNotExtractWhenFileOnDiskIsNewerThanEntryInArchive_andWarnAboutDifferentCasing() throws IOException
+    public void shouldNotExtractWhenFileOnDiskIsNewerThanEntryInArchive_andWarnAboutDifferentCasing( @TempDir File temporaryFolder )
+        throws IOException
     {
         // given
-        File file = temporaryFolder.newFile();
+        File file = new File( temporaryFolder, "whatever.txt" );
+        file.createNewFile();
         file.setLastModified( System.currentTimeMillis() );
         String entryname = file.getName().toUpperCase();
         Date entryDate = new Date( 0 );
 
         // when & then
-        assertThat( this.abstractUnArchiver.shouldExtractEntry( temporaryFolder.getRoot(), file, entryname, entryDate ), is ( false ) );
-        assertThat( this.abstractUnArchiver.casingMessageEmitted.get(), greaterThan(0)  );
+        assertFalse( this.abstractUnArchiver.shouldExtractEntry( temporaryFolder, file, entryname, entryDate ) );
+        assertTrue( this.abstractUnArchiver.casingMessageEmitted.get() > 0 );
     }
 
     @Test
-    public void shouldExtractWhenEntryInArchiveIsNewerThanFileOnDisk() throws IOException
+    public void shouldExtractWhenEntryInArchiveIsNewerThanFileOnDisk( @TempDir File temporaryFolder ) throws IOException
     {
         // given
-        File file = temporaryFolder.newFile();
+        File file = new File( temporaryFolder, "whatever.txt" );
+        file.createNewFile();
         file.setLastModified( 0 );
         String entryname = file.getName().toUpperCase();
         Date entryDate = new Date( System.currentTimeMillis() );
 
         // when & then
         this.abstractUnArchiver.setOverwrite( true );
-        assertThat( this.abstractUnArchiver.shouldExtractEntry( temporaryFolder.getRoot(), file, entryname, entryDate ), is( true ) );
+        assertTrue( this.abstractUnArchiver.shouldExtractEntry( temporaryFolder, file, entryname, entryDate ) );
 
         // when & then
         this.abstractUnArchiver.setOverwrite( false );
-        assertThat( this.abstractUnArchiver.shouldExtractEntry( temporaryFolder.getRoot(), file, entryname, entryDate ), is( false ) );
+        assertFalse( this.abstractUnArchiver.shouldExtractEntry( temporaryFolder, file, entryname, entryDate ) );
     }
 
     @Test
-    public void shouldExtractWhenEntryInArchiveIsNewerThanFileOnDiskAndWarnAboutDifferentCasing() throws IOException
+    public void shouldExtractWhenEntryInArchiveIsNewerThanFileOnDiskAndWarnAboutDifferentCasing( @TempDir File temporaryFolder )
+        throws IOException
     {
         // given
-        File file = temporaryFolder.newFile();
+        File file = new File( temporaryFolder, "whatever.txt" );
+        file.createNewFile();
         file.setLastModified( 0 );
         String entryname = file.getName().toUpperCase();
         Date entryDate = new Date( System.currentTimeMillis() );
 
         // when & then
         this.abstractUnArchiver.setOverwrite( true );
-        assertThat( this.abstractUnArchiver.shouldExtractEntry( temporaryFolder.getRoot(), file, entryname, entryDate ), is( true ) );
+        assertTrue( this.abstractUnArchiver.shouldExtractEntry( temporaryFolder, file, entryname, entryDate ) );
         this.abstractUnArchiver.setOverwrite( false );
-        assertThat( this.abstractUnArchiver.shouldExtractEntry( temporaryFolder.getRoot(), file, entryname, entryDate ), is( false ) );
-        assertThat( this.abstractUnArchiver.casingMessageEmitted.get(), greaterThan(0)  );
+        assertFalse( this.abstractUnArchiver.shouldExtractEntry( temporaryFolder, file, entryname, entryDate ) );
+        assertTrue( this.abstractUnArchiver.casingMessageEmitted.get() > 0 );
     }
 
     @Test
-    public void shouldNotWarnAboutDifferentCasingForDirectoryEntries() throws IOException
+    public void shouldNotWarnAboutDifferentCasingForDirectoryEntries( @TempDir File temporaryFolder )
+        throws IOException
     {
         // given
-        File file = temporaryFolder.newFolder();
+        File file = new File( temporaryFolder, "whatever.txt" );
+        file.createNewFile();
         file.setLastModified( 0 );
         String entryname = file.getName() + '/'; // archive entries for directories end with a '/'
         Date entryDate = new Date();
 
         // when & then
         this.abstractUnArchiver.setOverwrite( true );
-        assertThat( this.abstractUnArchiver.shouldExtractEntry( temporaryFolder.getRoot(), file, entryname, entryDate ), is( true ) );
-        assertThat( this.abstractUnArchiver.casingMessageEmitted.get(), equalTo( 0 ) );
+        assertTrue( this.abstractUnArchiver.shouldExtractEntry( temporaryFolder, file, entryname, entryDate ) );
+        assertEquals( 0, this.abstractUnArchiver.casingMessageEmitted.get() );
     }
 }

src/test/java/org/codehaus/plexus/archiver/DotDirectiveArchiveFinalizerTest.java

@@ -3,9 +3,9 @@
 import java.io.File;
 import java.util.jar.JarFile;
 import org.codehaus.plexus.archiver.jar.JarArchiver;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * @author Jason van Zyl

src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java

@@ -12,10 +12,10 @@
 import org.codehaus.plexus.archiver.tar.TarArchiver;
 import org.codehaus.plexus.archiver.tar.TarLongFileMode;
 import org.codehaus.plexus.util.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Erik Engstrom

src/test/java/org/codehaus/plexus/archiver/EmptyDirectoryTest.java

@@ -26,9 +26,9 @@
 import java.io.File;
 import org.codehaus.plexus.archiver.tar.TarArchiver;
 import org.codehaus.plexus.archiver.tar.TarLongFileMode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Daniel Krisher

src/test/java/org/codehaus/plexus/archiver/SymlinkTest.java

@@ -10,10 +10,10 @@
 import org.codehaus.plexus.archiver.zip.ZipArchiver;
 import org.codehaus.plexus.archiver.zip.ZipUnArchiver;
 import org.codehaus.plexus.util.Os;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Kristian Rosenvold

src/test/java/org/codehaus/plexus/archiver/TestSupport.java

@@ -5,13 +5,27 @@
 import java.nio.file.Paths;
 
 import org.eclipse.sisu.launch.InjectedTest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 /**
  * Test support class.
  */
 public abstract class TestSupport
         extends InjectedTest
 {
+    @Override
+    @BeforeEach
+    public void setUp() throws Exception {
+        super.setUp();
+    }
+
+    @Override
+    @AfterEach
+    public void tearDown() throws Exception {
+        super.tearDown();
+    }
+
     private static Path basedir()
     {
         return Paths.get( System.getProperty( "basedir", ( new File( "" ) ).getAbsolutePath() ) );

src/test/java/org/codehaus/plexus/archiver/bzip2/BZip2ArchiverTest.java

@@ -36,12 +36,12 @@
 import org.codehaus.plexus.archiver.zip.ZipArchiver;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Emmanuel Venisse

src/test/java/org/codehaus/plexus/archiver/gzip/GZipArchiverTest.java

@@ -36,13 +36,12 @@
 import org.codehaus.plexus.archiver.zip.ZipArchiver;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Emmanuel Venisse