Migrate to JUnit 5

Author: centic9

build.gradle

@@ -23,10 +23,16 @@ dependencies {
 
 	runtimeOnly 'org.slf4j:slf4j-simple:2.0.16'
 
-	testImplementation 'org.junit.vintage:junit-vintage-engine:5.11.3'
+	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.3'
+	testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.3'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.3'
 	testImplementation 'org.dstadler:commons-test:1.0.0.21'
 }
 
+test {
+	useJUnitPlatform()
+}
+
 wrapper {
     gradleVersion = '8.5'
 }

src/test/java/org/dstadler/jgit/JGitReproducerTest.java

@@ -12,23 +12,22 @@
 import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 import org.eclipse.jgit.treewalk.TreeWalk;
-import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 
 /**
  * Some tests to try to narrow down/reproduce some problems in JGit itself.
  */
 public class JGitReproducerTest {
     @Test
     public void testSymlink() throws Exception {
-        Assume.assumeFalse("Symbolic links do not work on Windows", SystemUtils.IS_OS_WINDOWS);
+        Assumptions.assumeFalse(SystemUtils.IS_OS_WINDOWS, "Symbolic links do not work on Windows");
 
         try (Repository repository = createNewRepository()) {
             commitSymbolicLink(repository);
@@ -71,8 +70,8 @@ private TreeWalk buildTreeWalk(Repository repository, RevTree tree, @SuppressWar
     private void commitSymbolicLink(Repository repository) throws IOException, GitAPIException {
         try (Git git = new Git(repository)) {
             // create a symbolic link
-            Path newLink = Paths.get(repository.getDirectory().getParentFile().getAbsolutePath(), "link");
-            Path target = Paths.get("/tmp");
+            Path newLink = Path.of(repository.getDirectory().getParentFile().getAbsolutePath(), "link");
+            Path target = Path.of("/tmp");
             Files.createSymbolicLink(newLink, target);
 
             // run the add-call

src/test/java/org/dstadler/jgit/ValidateGitRepository.java

@@ -10,7 +10,7 @@
 import java.util.List;
 import java.util.Set;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
 public class ValidateGitRepository {

src/test/java/org/dstadler/jgitfs/JGitFSTest.java

@@ -2,15 +2,16 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.SystemUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.dstadler.commons.testing.PrivateConstructorCoverage;
 import org.dstadler.commons.testing.TestHelpers;
-import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class JGitFSTest {
 
@@ -39,8 +40,8 @@ public void testMainOneArgFileDot() {
 
     @Test
     public void testMainOneArgDot() throws Exception {
-		Assume.assumeFalse("Not executed on Windows for now because of https://github.com/EtiennePerot/fuse-jna/issues/40",
-				SystemUtils.IS_OS_WINDOWS);
+		Assumptions.assumeFalse(SystemUtils.IS_OS_WINDOWS,
+				"Not executed on Windows for now because of https://github.com/EtiennePerot/fuse-jna/issues/40");
 
         try {
 			JGitFS.main("--test-only", ".");
@@ -73,8 +74,8 @@ public void testMainCurrentProject() {
 
     @Test
     public void testMainMultiple() throws Exception {
-        Assume.assumeFalse("Not executed on Windows for now because of https://github.com/EtiennePerot/fuse-jna/issues/44",
-				SystemUtils.IS_OS_WINDOWS);
+        Assumptions.assumeFalse(SystemUtils.IS_OS_WINDOWS,
+				"Not executed on Windows for now because of https://github.com/EtiennePerot/fuse-jna/issues/44");
 
         try {
             // if we have one that works and the last one an invalid one we get an exception, but did the mounting
@@ -90,7 +91,7 @@ public void testMainMultiple() throws Exception {
         } catch (@SuppressWarnings("unused") IOException e) {
             // happens when run in CloudBees, but could not find out details...
         } catch (IllegalStateException e) {
-            assertTrue("Had: " + e.getMessage(), e.getMessage().contains("invalidrepo"));
+            assertTrue(e.getMessage().contains("invalidrepo"), "Had: " + e.getMessage());
         }
     }
 
@@ -125,9 +126,9 @@ public void testMount() throws Exception {
             }
         } catch (IOException e) {
             // happens when run in CloudBees, but could not find out details...
-            Assume.assumeNoException("In some CI environments this will fail", e);
+            Assumptions.abort("In some CI environments this will fail\n" + ExceptionUtils.getStackTrace(e));
         } catch (UnsatisfiedLinkError e) {
-            Assume.assumeNoException("Will fail on Windows", e);
+            Assumptions.abort("Will fail on Windows\n" + ExceptionUtils.getStackTrace(e));
         }
     }
 
@@ -157,9 +158,9 @@ public void testMountGitDirTwice() throws Exception {
             }
         } catch (IOException e) {
             // happens when run in CloudBees, but could not find out details...
-            Assume.assumeNoException("In some CI environments this will fail", e);
+            Assumptions.abort("In some CI environments this will fail\n" + ExceptionUtils.getStackTrace(e));
         } catch (UnsatisfiedLinkError e) {
-            Assume.assumeNoException("Will fail on Windows", e);
+            Assumptions.abort("Will fail on Windows\n" + ExceptionUtils.getStackTrace(e));
         }
     }
 
@@ -189,9 +190,9 @@ public void testMountPointTwice() throws Exception {
             }
         } catch (IOException e) {
             // happens when run in CloudBees, but could not find out details...
-            Assume.assumeNoException("In some CI environments this will fail", e);
+            Assumptions.abort("In some CI environments this will fail\n" + ExceptionUtils.getStackTrace(e));
         } catch (UnsatisfiedLinkError e) {
-            Assume.assumeNoException("Will fail on Windows", e);
+            Assumptions.abort("Will fail on Windows\n" + ExceptionUtils.getStackTrace(e));
         }
     }
 }

src/test/java/org/dstadler/jgitfs/JGitFilesystemSubmoduleTest.java

@@ -6,19 +6,19 @@
 import net.fusejna.types.TypeMode.NodeType;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class JGitFilesystemSubmoduleTest {
     private static final String CLONE_URL = "https://github.com/githubtraining/example-dependency.git";
@@ -28,7 +28,7 @@ public class JGitFilesystemSubmoduleTest {
 
     private JGitFilesystem fs;
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() throws GitAPIException {
         // clone sample repo if not available yet
         if (!CLONE_DIR.exists()) {
@@ -42,12 +42,12 @@ public static void setUpClass() throws GitAPIException {
         }
     }
 
-    @Before
+    @BeforeEach
     public void setUp() throws IOException {
         fs = new JGitFilesystem(CLONE_DIR.getAbsolutePath(), false);
     }
 
-    @After
+    @AfterEach
     public void tearDown() throws IOException {
         fs.close();
     }
@@ -57,8 +57,7 @@ public void testSimple() {
         ByteBuffer buffer = ByteBuffer.allocate(1000);
         assertEquals(0, fs.readlink("/branch/master", buffer, 1000));
 
-        assertEquals("A commit-ish link should be written to the buffer, but had: " + new String(buffer.array(), 0, buffer.position()),
-                1000 - 51, buffer.remaining());
+        assertEquals(1000 - 51, buffer.remaining(), "A commit-ish link should be written to the buffer, but had: " + new String(buffer.array(), 0, buffer.position()));
         // e.g. ../commit/43/27273e69afcd040ba1b4d3766ea1f43e0024f3
         String commit = new String(buffer.array(), 0, buffer.position()).substring(2);
 
@@ -78,15 +77,14 @@ public void testSubmodulesGitLink() {
         ByteBuffer buffer = ByteBuffer.allocate(1000);
 
         assertEquals(0, fs.readlink("/branch/master", buffer, 1000));
-        assertEquals("A commit-ish link should be written to the buffer, but had: " + new String(buffer.array(), 0, buffer.position()),
-                1000 - 51, buffer.remaining());
+        assertEquals(1000 - 51, buffer.remaining(), "A commit-ish link should be written to the buffer, but had: " + new String(buffer.array(), 0, buffer.position()));
         // e.g. ../commit/43/27273e69afcd040ba1b4d3766ea1f43e0024f3
         String commit = new String(buffer.array(), 0, buffer.position()).substring(2);
 
         // check that we can read the gitlink
         buffer = ByteBuffer.allocate(1000);
         assertEquals(0, fs.readlink(commit + "/js", buffer, 1000));
-        assertEquals("Incorrect number of bytes written to the buffer", 930, buffer.remaining());
+        assertEquals(930, buffer.remaining(), "Incorrect number of bytes written to the buffer");
 
         assertEquals("../../../submodule/js/commit/c3/c588713233609f5bbbb2d9e7f3fb4a660f3f72",
                 new String(buffer.array(), 0, buffer.position()));