diff --git a/pom.xml b/pom.xml index 904d640..0c8f8d9 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.maven maven-parent - 43 + 45 diff --git a/source-release/pom.xml b/source-release/pom.xml index d9a2268..665546e 100644 --- a/source-release/pom.xml +++ b/source-release/pom.xml @@ -46,9 +46,8 @@ under the License. - junit - junit - 4.13.2 + org.junit.jupiter + junit-jupiter-api test @@ -59,7 +58,7 @@ under the License. org.apache.maven.shared maven-verifier - 1.8.0 + 2.0.0-M1 test @@ -128,7 +127,7 @@ under the License. - **/IT*.java + **/*Test.java **/util/* diff --git a/source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java b/source-release/src/test/java/org/apache/its/BasicArchiveCreationTest.java similarity index 87% rename from source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java rename to source-release/src/test/java/org/apache/its/BasicArchiveCreationTest.java index 74872b3..03ab0c9 100644 --- a/source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java +++ b/source-release/src/test/java/org/apache/its/BasicArchiveCreationTest.java @@ -25,18 +25,18 @@ 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.apache.maven.shared.verifier.VerificationException; +import org.apache.maven.shared.verifier.Verifier; +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 { +public class BasicArchiveCreationTest { private static final String BASENAME = "basics"; private static final String VERSION = "1"; @@ -46,14 +46,14 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept File testDir = getTestDir(BASENAME); Verifier verifier = createVerifier(testDir); - verifier.executeGoal("package"); + verifier.addCliArgument("package"); + verifier.execute(); verifier.verifyErrorFreeLog(); - verifier.resetStreams(); // 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_006_CiExcludes.java b/source-release/src/test/java/org/apache/its/CiExcludesTest.java similarity index 90% rename from source-release/src/test/java/org/apache/its/IT_006_CiExcludes.java rename to source-release/src/test/java/org/apache/its/CiExcludesTest.java index 900dd79..685eae0 100644 --- a/source-release/src/test/java/org/apache/its/IT_006_CiExcludes.java +++ b/source-release/src/test/java/org/apache/its/CiExcludesTest.java @@ -25,16 +25,16 @@ import java.util.HashSet; import java.util.Set; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.junit.Test; +import org.apache.maven.shared.verifier.VerificationException; +import org.apache.maven.shared.verifier.Verifier; +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; -public class IT_006_CiExcludes { +public class CiExcludesTest { private static final String BASENAME = "ci-excludes"; private static final String VERSION = "1"; @@ -45,10 +45,10 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept Verifier verifier = createVerifier(testDir); - verifier.executeGoal("package"); + verifier.addCliArgument("package"); + verifier.execute(); verifier.verifyErrorFreeLog(); - verifier.resetStreams(); 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/ExcludeBuildOutputDirectoryTest.java similarity index 93% rename from source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java rename to source-release/src/test/java/org/apache/its/ExcludeBuildOutputDirectoryTest.java index 5158cc7..346ff21 100644 --- a/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java +++ b/source-release/src/test/java/org/apache/its/ExcludeBuildOutputDirectoryTest.java @@ -24,9 +24,9 @@ import java.util.HashSet; import java.util.Set; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.junit.Test; +import org.apache.maven.shared.verifier.VerificationException; +import org.apache.maven.shared.verifier.Verifier; +import org.junit.jupiter.api.Test; import static org.apache.its.util.TestUtils.archivePathFromChild; import static org.apache.its.util.TestUtils.archivePathFromProject; @@ -34,7 +34,7 @@ import static org.apache.its.util.TestUtils.createVerifier; import static org.apache.its.util.TestUtils.getTestDir; -public class IT_001_ExcludeBuildOutputDirectory { +public class ExcludeBuildOutputDirectoryTest { private static final String BASENAME = "build-output-dir"; private static final String VERSION = "1"; diff --git a/source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java b/source-release/src/test/java/org/apache/its/ExcludeSrcDirWithinBuildOutputDirTest.java similarity index 94% rename from source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java rename to source-release/src/test/java/org/apache/its/ExcludeSrcDirWithinBuildOutputDirTest.java index 80ff2dd..170c46d 100644 --- a/source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java +++ b/source-release/src/test/java/org/apache/its/ExcludeSrcDirWithinBuildOutputDirTest.java @@ -24,9 +24,9 @@ import java.util.HashSet; import java.util.Set; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.junit.Test; +import org.apache.maven.shared.verifier.VerificationException; +import org.apache.maven.shared.verifier.Verifier; +import org.junit.jupiter.api.Test; import static org.apache.its.util.TestUtils.archivePathFromChild; import static org.apache.its.util.TestUtils.archivePathFromProject; @@ -34,7 +34,7 @@ import static org.apache.its.util.TestUtils.createVerifier; import static org.apache.its.util.TestUtils.getTestDir; -public class IT_ExcludeSrcDirWithinBuildOutputDir { +public class ExcludeSrcDirWithinBuildOutputDirTest { private static final String BASENAME = "output-dir-contains-src-name"; private static final String VERSION = "1"; diff --git a/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java b/source-release/src/test/java/org/apache/its/IdeExcludesTest.java similarity index 95% rename from source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java rename to source-release/src/test/java/org/apache/its/IdeExcludesTest.java index b16a0e5..5f6a4cf 100644 --- a/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java +++ b/source-release/src/test/java/org/apache/its/IdeExcludesTest.java @@ -25,9 +25,9 @@ import java.util.HashSet; import java.util.Set; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.junit.Test; +import org.apache.maven.shared.verifier.VerificationException; +import org.apache.maven.shared.verifier.Verifier; +import org.junit.jupiter.api.Test; import static org.apache.its.util.TestUtils.archivePathFromChild; import static org.apache.its.util.TestUtils.archivePathFromProject; @@ -35,7 +35,7 @@ import static org.apache.its.util.TestUtils.createVerifier; import static org.apache.its.util.TestUtils.getTestDir; -public class IT_004_IdeExcludes { +public class IdeExcludesTest { private static final String BASENAME = "ide-excludes"; private static final String VERSION = "1"; diff --git a/source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java b/source-release/src/test/java/org/apache/its/IncludeIdeFilesWithinSrcDirTest.java similarity index 96% rename from source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java rename to source-release/src/test/java/org/apache/its/IncludeIdeFilesWithinSrcDirTest.java index 6917e45..c527d8e 100644 --- a/source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java +++ b/source-release/src/test/java/org/apache/its/IncludeIdeFilesWithinSrcDirTest.java @@ -24,9 +24,9 @@ import java.util.HashSet; import java.util.Set; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.junit.Test; +import org.apache.maven.shared.verifier.VerificationException; +import org.apache.maven.shared.verifier.Verifier; +import org.junit.jupiter.api.Test; import static org.apache.its.util.TestUtils.archivePathFromChild; import static org.apache.its.util.TestUtils.archivePathFromProject; @@ -34,7 +34,7 @@ import static org.apache.its.util.TestUtils.createVerifier; import static org.apache.its.util.TestUtils.getTestDir; -public class IT_IncludeIdeFilesWithinSrcDir { +public class IncludeIdeFilesWithinSrcDirTest { private static final String BASENAME = "src-contains-ide-files"; private static final String VERSION = "1"; diff --git a/source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java b/source-release/src/test/java/org/apache/its/IncludeSrcDirWithBuildOutputDirNameTest.java similarity index 93% rename from source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java rename to source-release/src/test/java/org/apache/its/IncludeSrcDirWithBuildOutputDirNameTest.java index 5a0fa76..2306e53 100644 --- a/source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java +++ b/source-release/src/test/java/org/apache/its/IncludeSrcDirWithBuildOutputDirNameTest.java @@ -24,9 +24,9 @@ import java.util.HashSet; import java.util.Set; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.junit.Test; +import org.apache.maven.shared.verifier.VerificationException; +import org.apache.maven.shared.verifier.Verifier; +import org.junit.jupiter.api.Test; import static org.apache.its.util.TestUtils.archivePathFromChild; import static org.apache.its.util.TestUtils.archivePathFromProject; @@ -34,7 +34,7 @@ import static org.apache.its.util.TestUtils.createVerifier; import static org.apache.its.util.TestUtils.getTestDir; -public class IT_002_IncludeSrcDirWithBuildOutputDirName { +public class IncludeSrcDirWithBuildOutputDirNameTest { private static final String BASENAME = "src-contains-output-dir-name"; private static final String VERSION = "1"; diff --git a/source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java b/source-release/src/test/java/org/apache/its/MiscellaneousExcludesTest.java similarity index 93% rename from source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java rename to source-release/src/test/java/org/apache/its/MiscellaneousExcludesTest.java index 43c488a..45eecad 100644 --- a/source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java +++ b/source-release/src/test/java/org/apache/its/MiscellaneousExcludesTest.java @@ -24,9 +24,9 @@ import java.util.HashSet; import java.util.Set; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.junit.Test; +import org.apache.maven.shared.verifier.VerificationException; +import org.apache.maven.shared.verifier.Verifier; +import org.junit.jupiter.api.Test; import static org.apache.its.util.TestUtils.archivePathFromChild; import static org.apache.its.util.TestUtils.archivePathFromProject; @@ -34,7 +34,7 @@ import static org.apache.its.util.TestUtils.createVerifier; import static org.apache.its.util.TestUtils.getTestDir; -public class IT_005_MiscellaneousExcludes { +public class MiscellaneousExcludesTest { private static final String BASENAME = "misc-excludes"; private static final String VERSION = "1"; diff --git a/source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java b/source-release/src/test/java/org/apache/its/SharedResourceInclusionTest.java similarity index 93% rename from source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java rename to source-release/src/test/java/org/apache/its/SharedResourceInclusionTest.java index 5c0378f..8856bdb 100644 --- a/source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java +++ b/source-release/src/test/java/org/apache/its/SharedResourceInclusionTest.java @@ -24,9 +24,9 @@ import java.util.HashSet; import java.util.Set; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.junit.Test; +import org.apache.maven.shared.verifier.VerificationException; +import org.apache.maven.shared.verifier.Verifier; +import org.junit.jupiter.api.Test; import static org.apache.its.util.TestUtils.archivePathFromChild; import static org.apache.its.util.TestUtils.archivePathFromProject; @@ -34,7 +34,7 @@ import static org.apache.its.util.TestUtils.createVerifier; import static org.apache.its.util.TestUtils.getTestDir; -public class IT_003_SharedResourceInclusion { +public class SharedResourceInclusionTest { private static final String BASENAME = "shared-resources"; private static final String VERSION = "1"; diff --git a/source-release/src/test/java/org/apache/its/IT_SingleModule.java b/source-release/src/test/java/org/apache/its/SingleModuleTest.java similarity index 84% rename from source-release/src/test/java/org/apache/its/IT_SingleModule.java rename to source-release/src/test/java/org/apache/its/SingleModuleTest.java index aa75a3b..a3ce3c7 100644 --- a/source-release/src/test/java/org/apache/its/IT_SingleModule.java +++ b/source-release/src/test/java/org/apache/its/SingleModuleTest.java @@ -24,17 +24,17 @@ 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.apache.maven.shared.verifier.VerificationException; +import org.apache.maven.shared.verifier.Verifier; +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 { +public class SingleModuleTest { private static final String BASENAME = "single-module"; private static final String VERSION = "1"; @@ -45,13 +45,13 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept Verifier verifier = createVerifier(testDir); - verifier.executeGoal("package"); + verifier.addCliArgument("package"); + verifier.execute(); verifier.verifyErrorFreeLog(); - 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/ZipAndTarCreationTest.java similarity index 85% rename from source-release/src/test/java/org/apache/its/IT_ZipAndTarCreation.java rename to source-release/src/test/java/org/apache/its/ZipAndTarCreationTest.java index 258cecc..4f1f7be 100644 --- a/source-release/src/test/java/org/apache/its/IT_ZipAndTarCreation.java +++ b/source-release/src/test/java/org/apache/its/ZipAndTarCreationTest.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.apache.maven.shared.verifier.VerificationException; +import org.apache.maven.shared.verifier.Verifier; +import org.junit.jupiter.api.Test; import static org.apache.its.util.TestUtils.archivePathFromChild; import static org.apache.its.util.TestUtils.archivePathFromProject; @@ -36,8 +35,9 @@ 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 { +public class ZipAndTarCreationTest { private static final String BASENAME = "zip-and-tar"; private static final String VERSION = "1"; @@ -48,16 +48,16 @@ public void execute() throws VerificationException, IOException, URISyntaxExcept Verifier verifier = createVerifier(testDir); - verifier.executeGoal("package"); + verifier.addCliArgument("package"); + verifier.execute(); verifier.verifyErrorFreeLog(); - 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..340cd43 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 @@ -28,16 +28,15 @@ import java.util.LinkedHashSet; import java.util.Set; import java.util.zip.ZipEntry; -import java.util.zip.ZipException; import java.util.zip.ZipFile; import org.apache.commons.compress.archivers.ArchiveEntry; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.VerificationException; +import org.apache.maven.shared.verifier.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 +70,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 { @@ -79,8 +78,7 @@ public static void assertTarContents(Set required, Set banned, F LinkedHashSet pathSet = new LinkedHashSet<>(); - for (@SuppressWarnings("unchecked") Enumeration enumeration = tarFile.getEntries(); - enumeration.hasMoreElements(); ) { + for (Enumeration enumeration = tarFile.getEntries(); enumeration.hasMoreElements(); ) { pathSet.add(enumeration.nextElement().getName()); } assertArchiveContents(required, banned, assembly.getAbsolutePath(), pathSet); @@ -91,9 +89,8 @@ 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()); + public static void assertZipContents(Set required, Set banned, File assembly) throws IOException { + assertTrue(assembly.isFile(), "Assembly archive missing: " + assembly); try (ZipFile zf = new ZipFile(assembly)) { LinkedHashSet pathSet = new LinkedHashSet<>(); @@ -123,7 +120,7 @@ private static void assertArchiveContents( } if (!missing.isEmpty() || !banViolations.isEmpty()) { - StringBuffer msg = new StringBuffer(); + StringBuilder msg = new StringBuilder(); msg.append("The following errors were found in:\n\n"); msg.append(assemblyName); msg.append("\n"); @@ -157,9 +154,7 @@ private static void assertArchiveContents( } public static File getTestDir(String name) throws IOException, URISyntaxException { - ClassLoader cloader = Thread.currentThread().getContextClassLoader(); - URL resource = cloader.getResource("maven-projects/" + name); - + URL resource = Thread.currentThread().getContextClassLoader().getResource("maven-projects/" + name); if (resource == null) { throw new IOException("Cannot find test directory: " + name); }