From f251bc4f328f029f10768f03c06f2e291253ba8b Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sun, 2 Nov 2025 12:51:56 +0000 Subject: [PATCH] JUnit Jupiter migration from JUnit 4.x Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.java.testing.junit5.JUnit4to5Migration?organizationId=QUxML09wZW4gU291cmNlL05ldGZsaXggKyBTcHJpbmcgKyBBcGFjaGUvQXBhY2hlL0FwYWNoZSBNYXZlbg%3D%3D Co-authored-by: Moderne --- source-release/pom.xml | 15 ++++++++++----- .../apache/its/IT_000_BasicArchiveCreation.java | 6 +++--- .../its/IT_001_ExcludeBuildOutputDirectory.java | 2 +- ...T_002_IncludeSrcDirWithBuildOutputDirName.java | 2 +- .../its/IT_003_SharedResourceInclusion.java | 2 +- .../java/org/apache/its/IT_004_IdeExcludes.java | 2 +- .../apache/its/IT_005_MiscellaneousExcludes.java | 2 +- .../java/org/apache/its/IT_006_CiExcludes.java | 2 +- .../its/IT_ExcludeSrcDirWithinBuildOutputDir.java | 2 +- .../its/IT_IncludeIdeFilesWithinSrcDir.java | 2 +- .../test/java/org/apache/its/IT_SingleModule.java | 6 +++--- .../java/org/apache/its/IT_ZipAndTarCreation.java | 8 ++++---- .../test/java/org/apache/its/util/TestUtils.java | 8 ++++---- 13 files changed, 32 insertions(+), 27 deletions(-) diff --git a/source-release/pom.xml b/source-release/pom.xml index d9a2268..ab0fcab 100644 --- a/source-release/pom.xml +++ b/source-release/pom.xml @@ -46,14 +46,13 @@ under the License. - junit - junit - 4.13.2 + org.codehaus.plexus + plexus-utils test - org.codehaus.plexus - plexus-utils + org.junit.jupiter + junit-jupiter test @@ -61,6 +60,12 @@ under the License. maven-verifier 1.8.0 test + + + junit + junit + + org.codehaus.plexus 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..7083e7d 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,16 +25,16 @@ 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; +import org.junit.jupiter.api.Test; import static org.apache.its.util.TestUtils.archivePathFromChild; import static org.apache.its.util.TestUtils.archivePathFromProject; 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_001_ExcludeBuildOutputDirectory.java b/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java index 5158cc7..fc307a4 100644 --- a/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java +++ b/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java @@ -26,7 +26,7 @@ import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.its.util.TestUtils.archivePathFromChild; import static org.apache.its.util.TestUtils.archivePathFromProject; diff --git a/source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java b/source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java index 5a0fa76..67be1b7 100644 --- a/source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java +++ b/source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java @@ -26,7 +26,7 @@ import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.its.util.TestUtils.archivePathFromChild; import static org.apache.its.util.TestUtils.archivePathFromProject; diff --git a/source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java b/source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java index 5c0378f..5d2afdb 100644 --- a/source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java +++ b/source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java @@ -26,7 +26,7 @@ import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.its.util.TestUtils.archivePathFromChild; import static org.apache.its.util.TestUtils.archivePathFromProject; diff --git a/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java b/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java index b16a0e5..904cf17 100644 --- a/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java +++ b/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java @@ -27,7 +27,7 @@ import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.its.util.TestUtils.archivePathFromChild; import static org.apache.its.util.TestUtils.archivePathFromProject; diff --git a/source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java b/source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java index 43c488a..83a1722 100644 --- a/source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java +++ b/source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java @@ -26,7 +26,7 @@ import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.its.util.TestUtils.archivePathFromChild; import static org.apache.its.util.TestUtils.archivePathFromProject; diff --git a/source-release/src/test/java/org/apache/its/IT_006_CiExcludes.java b/source-release/src/test/java/org/apache/its/IT_006_CiExcludes.java index 900dd79..cdac56e 100644 --- a/source-release/src/test/java/org/apache/its/IT_006_CiExcludes.java +++ b/source-release/src/test/java/org/apache/its/IT_006_CiExcludes.java @@ -27,7 +27,7 @@ import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.its.util.TestUtils.archivePathFromProject; import static org.apache.its.util.TestUtils.assertZipContents; diff --git a/source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java b/source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java index 80ff2dd..aeb197b 100644 --- a/source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java +++ b/source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java @@ -26,7 +26,7 @@ import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.its.util.TestUtils.archivePathFromChild; import static org.apache.its.util.TestUtils.archivePathFromProject; diff --git a/source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java b/source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java index 6917e45..b8416b3 100644 --- a/source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java +++ b/source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java @@ -26,7 +26,7 @@ import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.its.util.TestUtils.archivePathFromChild; import static org.apache.its.util.TestUtils.archivePathFromProject; 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..2677dc9 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,15 +24,15 @@ 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; +import org.junit.jupiter.api.Test; import static org.apache.its.util.TestUtils.archivePathFromProject; 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..69d1871 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,10 +25,9 @@ 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; +import org.junit.jupiter.api.Test; import static org.apache.its.util.TestUtils.archivePathFromChild; import static org.apache.its.util.TestUtils.archivePathFromProject; @@ -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<>();