From c63653183c161ab315ac3e659d304bf74cfdfb51 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sun, 2 Nov 2025 12:46:09 +0000 Subject: [PATCH] Migrate JUnit 4 `TestCase` to JUnit Jupiter Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.java.testing.junit5.MigrateJUnitTestCase?organizationId=QUxML09wZW4gU291cmNlL05ldGZsaXggKyBTcHJpbmcgKyBBcGFjaGUvQXBhY2hlL0FwYWNoZSBNYXZlbg%3D%3D Co-authored-by: Moderne --- .../java/org/apache/its/IT_000_BasicArchiveCreation.java | 4 ++-- .../src/test/java/org/apache/its/IT_SingleModule.java | 4 ++-- .../test/java/org/apache/its/IT_ZipAndTarCreation.java | 6 +++--- .../src/test/java/org/apache/its/util/TestUtils.java | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java b/source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java index 74872b3..0614692 100644 --- a/source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java +++ b/source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java @@ -25,7 +25,6 @@ import java.util.HashSet; import java.util.Set; -import junit.framework.Assert; import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; import org.junit.Test; @@ -35,6 +34,7 @@ import static org.apache.its.util.TestUtils.assertZipContents; import static org.apache.its.util.TestUtils.createVerifier; import static org.apache.its.util.TestUtils.getTestDir; +import static org.junit.jupiter.api.Assertions.assertFalse; public class IT_000_BasicArchiveCreation { @@ -53,7 +53,7 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept // make sure the tar did NOT get created by default File tarAssemblyFile = new File(testDir, "target/" + BASENAME + "-" + VERSION + "-source-release.tar.gz"); - Assert.assertFalse("tar assembly should not have been created", tarAssemblyFile.exists()); + assertFalse(tarAssemblyFile.exists(), "tar assembly should not have been created"); File assembly = new File(testDir, "target/" + BASENAME + "-" + VERSION + "-source-release.zip"); diff --git a/source-release/src/test/java/org/apache/its/IT_SingleModule.java b/source-release/src/test/java/org/apache/its/IT_SingleModule.java index aa75a3b..26f1197 100644 --- a/source-release/src/test/java/org/apache/its/IT_SingleModule.java +++ b/source-release/src/test/java/org/apache/its/IT_SingleModule.java @@ -24,7 +24,6 @@ import java.util.HashSet; import java.util.Set; -import junit.framework.Assert; import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; import org.junit.Test; @@ -33,6 +32,7 @@ import static org.apache.its.util.TestUtils.assertZipContents; import static org.apache.its.util.TestUtils.createVerifier; import static org.apache.its.util.TestUtils.getTestDir; +import static org.junit.jupiter.api.Assertions.assertTrue; public class IT_SingleModule { @@ -51,7 +51,7 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept verifier.resetStreams(); File zipAssemblyFile = new File(testDir, "target/" + BASENAME + "-" + VERSION + "-source-release.zip"); - Assert.assertTrue("zip assembly should have been created", zipAssemblyFile.exists()); + assertTrue(zipAssemblyFile.exists(), "zip assembly should have been created"); Set required = new HashSet<>(); diff --git a/source-release/src/test/java/org/apache/its/IT_ZipAndTarCreation.java b/source-release/src/test/java/org/apache/its/IT_ZipAndTarCreation.java index 258cecc..9922838 100644 --- a/source-release/src/test/java/org/apache/its/IT_ZipAndTarCreation.java +++ b/source-release/src/test/java/org/apache/its/IT_ZipAndTarCreation.java @@ -25,7 +25,6 @@ import java.util.HashSet; import java.util.Set; -import junit.framework.Assert; import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; import org.junit.Test; @@ -36,6 +35,7 @@ import static org.apache.its.util.TestUtils.assertZipContents; import static org.apache.its.util.TestUtils.createVerifier; import static org.apache.its.util.TestUtils.getTestDir; +import static org.junit.jupiter.api.Assertions.assertTrue; public class IT_ZipAndTarCreation { @@ -54,10 +54,10 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept verifier.resetStreams(); File tarAssemblyFile = new File(testDir, "target/" + BASENAME + "-" + VERSION + "-source-release.tar.gz"); - Assert.assertTrue("tar assembly should have been created", tarAssemblyFile.exists()); + assertTrue(tarAssemblyFile.exists(), "tar assembly should have been created"); File zipAssemblyFile = new File(testDir, "target/" + BASENAME + "-" + VERSION + "-source-release.zip"); - Assert.assertTrue("zip assembly should have been created", zipAssemblyFile.exists()); + assertTrue(zipAssemblyFile.exists(), "zip assembly should have been created"); Set required = new HashSet<>(); diff --git a/source-release/src/test/java/org/apache/its/util/TestUtils.java b/source-release/src/test/java/org/apache/its/util/TestUtils.java index a8bcfb6..f7b9979 100644 --- a/source-release/src/test/java/org/apache/its/util/TestUtils.java +++ b/source-release/src/test/java/org/apache/its/util/TestUtils.java @@ -36,8 +36,8 @@ import org.apache.maven.it.Verifier; import org.codehaus.plexus.archiver.tar.GZipTarFile; -import static junit.framework.Assert.assertTrue; -import static junit.framework.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class TestUtils { @@ -71,7 +71,7 @@ public static String archivePathFromProject(String artifactId, String version, S } public static void assertTarContents(Set required, Set banned, File assembly) throws IOException { - assertTrue("Assembly archive missing: " + assembly, assembly.isFile()); + assertTrue(assembly.isFile(), "Assembly archive missing: " + assembly); GZipTarFile tarFile = null; try { @@ -93,7 +93,7 @@ public static void assertTarContents(Set required, Set banned, F public static void assertZipContents(Set required, Set banned, File assembly) throws ZipException, IOException { - assertTrue("Assembly archive missing: " + assembly, assembly.isFile()); + assertTrue(assembly.isFile(), "Assembly archive missing: " + assembly); try (ZipFile zf = new ZipFile(assembly)) { LinkedHashSet pathSet = new LinkedHashSet<>();