This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git

commit 4c751a952b15a5ce05437cf5eabf6f5e517c8467
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sat Oct 31 10:41:05 2026 +0000

    Simplify unit tests and share repository session setup
---
 .../maven/archetype/common/TestPomManager.java     |  30 ++----
 .../archetype/common/util/TestXMLOutputter.java    |   2 +-
 .../generator/DefaultArchetypeGeneratorTest.java   | 116 ++++-----------------
 .../apache/maven/archetype/old/ArchetypeTest.java  |  65 ++++++------
 .../descriptor/ArchetypeDescriptorBuilderTest.java |  40 +++----
 .../DefaultRepositoryCrawlerTest.java              |   8 +-
 .../LocalCatalogArchetypeDataSourceTest.java       |   9 +-
 .../archetype/test/ArchetypeGenerationTest.java    |  15 +--
 .../InternalCatalogArchetypesVerificationTest.java |   8 +-
 .../maven/archetype/test/RepositorySessions.java   |  46 ++++++++
 10 files changed, 139 insertions(+), 200 deletions(-)

diff --git 
a/archetype-common/src/test/java/org/apache/maven/archetype/common/TestPomManager.java
 
b/archetype-common/src/test/java/org/apache/maven/archetype/common/TestPomManager.java
index 2209f2a7..37e9dc0f 100644
--- 
a/archetype-common/src/test/java/org/apache/maven/archetype/common/TestPomManager.java
+++ 
b/archetype-common/src/test/java/org/apache/maven/archetype/common/TestPomManager.java
@@ -22,7 +22,6 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -37,20 +36,17 @@ 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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class TestPomManager {
 
     // ref: https://www.baeldung.com/java-pretty-print-xml
     // https://bugs.openjdk.java.net/browse/JDK-8262285?attachmentViewMode=list
     @Test
-    public void testAddModulePomPackaging() throws Exception {
+    public void testAddModulePomPackaging(@TempDir Path dir) throws Exception {
         PomManager pomManager = new DefaultPomManager();
 
-        Path pomPath = Paths.get(
-                
getClass().getResource("/projects/pom-manager/pom-sample-1.xml").toURI());
-        Path pomDestPath = 
pomPath.getParent().resolve("pom-sample-1-copied.xml");
-        Files.copy(pomPath, pomDestPath, StandardCopyOption.REPLACE_EXISTING);
+        Path pomDestPath = copySample("pom-sample-1.xml", dir);
 
         final int moduleNumber = 4;
         for (int i = 0; i < moduleNumber; i++) {
@@ -64,22 +60,18 @@ public class TestPomManager {
     }
 
     @Test
-    public void testAddModuleNonPomPackaging() throws Exception {
+    public void testAddModuleNonPomPackaging(@TempDir Path dir) throws 
Exception {
         PomManager pomManager = new DefaultPomManager();
 
-        Path pomPath = Paths.get(
-                
getClass().getResource("/projects/pom-manager/pom-sample-2.xml").toURI());
-        Path pomDestPath = 
pomPath.getParent().resolve("pom-sample-1-copied.xml");
-        Files.copy(pomPath, pomDestPath, StandardCopyOption.REPLACE_EXISTING);
+        Path pomDestPath = copySample("pom-sample-2.xml", dir);
 
-        Exception expectedException = null;
-        try {
-            pomManager.addModule(pomDestPath.toFile(), "test");
-        } catch (InvalidPackaging e) {
-            expectedException = e;
-        }
+        assertThrows(InvalidPackaging.class, () -> 
pomManager.addModule(pomDestPath.toFile(), "test"));
+    }
 
-        assertNotNull(expectedException);
+    private Path copySample(String name, Path dir) throws Exception {
+        Path source = Paths.get(
+                getClass().getResource("/projects/pom-manager/" + 
name).toURI());
+        return Files.copy(source, dir.resolve(name));
     }
 
     @Test
diff --git 
a/archetype-common/src/test/java/org/apache/maven/archetype/common/util/TestXMLOutputter.java
 
b/archetype-common/src/test/java/org/apache/maven/archetype/common/util/TestXMLOutputter.java
index a6bf5a78..91de9813 100644
--- 
a/archetype-common/src/test/java/org/apache/maven/archetype/common/util/TestXMLOutputter.java
+++ 
b/archetype-common/src/test/java/org/apache/maven/archetype/common/util/TestXMLOutputter.java
@@ -45,6 +45,6 @@ public class TestXMLOutputter {
         StringWriter sw = new StringWriter();
         new XMLOutputter().output(doc, sw);
 
-        assertTrue(sw.toString().indexOf(content) > -1);
+        assertTrue(sw.toString().contains(content));
     }
 }
diff --git 
a/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java
 
b/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java
index dc8e1f63..666cc9aa 100644
--- 
a/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java
+++ 
b/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java
@@ -25,10 +25,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.util.Properties;
 
 import org.apache.maven.archetype.ArchetypeGenerationRequest;
 import org.apache.maven.archetype.ArchetypeGenerationResult;
+import org.apache.maven.archetype.test.RepositorySessions;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.codehaus.plexus.testing.PlexusTest;
@@ -37,8 +39,6 @@ import org.codehaus.plexus.util.xml.XmlStreamReader;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.repository.LocalRepositoryManager;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -293,93 +293,26 @@ public class DefaultArchetypeGeneratorTest {
     public void testGenerateFileSetArchetype() throws Exception {
         ArchetypeGenerationRequest request = 
createArchetypeGenerationRequest("generate-12", ARCHETYPE_FILESET);
 
-        File projectFile = new File(projectDirectory, "pom.xml");
-
         FileUtils.forceDelete(projectDirectory);
 
         generateProjectFromArchetype(request);
 
-        
assertTemplateContentGeneratedWithFileSetArchetype("src/main/java/file/value/package/App.java",
 "file-value");
-        assertTemplateContentGeneratedWithFileSetArchetype(
-                "src/main/java/file/value/package/inner/package/App2.java", 
"file-value");
-
-        
assertTemplateCopiedWithFileSetArchetype("src/main/java/file/value/package/App.ogg");
-
-        
assertTemplateContentGeneratedWithFileSetArchetype("src/main/resources/App.properties",
 "file-value");
-        
assertTemplateContentGeneratedWithFileSetArchetype("src/main/resources/file-value/touch.txt",
 "file-value");
-        assertTemplateContentGeneratedWithFileSetArchetype(
-                "src/main/resources/file-value/touch_root.txt", "file-value");
-
-        
assertTemplateCopiedWithFileSetArchetype("src/main/resources/some-dir/App.png");
-
-        
assertTemplateContentGeneratedWithFileSetArchetype("src/site/site.xml", 
"file-value");
-        
assertTemplateContentGeneratedWithFileSetArchetype("src/site/apt/usage.apt", 
"file-value");
-        assertTemplateContentGeneratedWithFileSetArchetype(".classpath", 
"file-value");
-        assertTemplateContentGeneratedWithFileSetArchetype("profiles.xml", 
"file-value");
-
-        Model model = readPom(projectFile);
-        assertNull(model.getParent());
-        assertEquals("file-value", model.getGroupId());
-        assertEquals("file-value", model.getArtifactId());
-        assertEquals("file-value", model.getVersion());
+        assertFileSetArchetypeGenerated();
 
         // GH-274: a module directory name ("openapi") that contains the 
fileSet directory's own
         // name ("api") as a substring must not corrupt the output path of 
files in that fileSet.
         assertTemplateCopiedWithFileSetArchetype("openapi/api/index.ts");
 
-        assertTemplateContentGeneratedWithFileSetArchetype(
-                "subproject/src/main/java/file/value/package/App.java", 
"subproject");
-
-        model = readPom(new File(projectDirectory, "subproject/pom.xml"));
-        assertNotNull(model.getParent());
-        assertEquals("file-value", model.getParent().getGroupId());
-        assertEquals("file-value", model.getParent().getArtifactId());
-        assertEquals("file-value", model.getParent().getVersion());
-        assertEquals("file-value", model.getGroupId());
-        assertEquals("subproject", model.getArtifactId());
-        assertEquals("file-value", model.getVersion());
-
-        assertTemplateContentGeneratedWithFileSetArchetype(
-                
"subproject/subsubproject/src/main/java/file/value/package/App.java", 
"subsubproject");
-
         assertTemplateContentGeneratedWithFileSetArchetype(
                 "subproject/subsubproject/src/main/java/file/value/package/"
-                        + 
"file-value/inner/subsubproject/innest/Somefile-valueClasssubsubproject.java",
-                "subsubproject");
-
-        assertTemplateContentGeneratedWithFileSetArchetype(
-                "subproject/subsubproject/src/main/java/file/value/package/"
-                        /* + "file-value/inner/subsubproject/innest/" + */
-                        + "ArbitraryProperty-file-value.java",
-                "subsubproject");
-
-        assertTemplateContentGeneratedWithFileSetArchetype(
-                "subproject/subsubproject/src/main/java/file/value/package/"
-                        /* + "file-value/inner/subsubproject/innest/" + */
                         + "M_subsubproject_prop1Testprop2file-value.java",
                 "subsubproject");
 
-        // Test that undefined properties are safely ignored (and skipped)
-        assertTemplateContentGeneratedWithFileSetArchetype(
-                "subproject/subsubproject/src/main/java/file/value/package/"
-                        /* + "file-value/inner/subsubproject/innest/" + */
-                        + 
"SkipsUndefinedProperty-__undefined-property__-file-value.java",
-                "subsubproject");
-
-        model = readPom(new File(projectDirectory, 
"subproject/subsubproject/pom.xml"));
-        assertNotNull(model.getParent());
-        assertEquals("file-value", model.getParent().getGroupId());
-        assertEquals("subproject", model.getParent().getArtifactId());
-        assertEquals("file-value", model.getParent().getVersion());
-        assertEquals("file-value", model.getGroupId());
-        assertEquals("subsubproject", model.getArtifactId());
-        assertEquals("file-value", model.getVersion());
-
         // Module "demoapi" has a fileSet directory "api" that is also a 
substring of the module's own
         // directory name, e.g. "demoapi" contains "api" (see GitHub issue 
#274).
         
assertTemplateContentGeneratedWithFileSetArchetype("demoapi/api/Marker.properties",
 "demoapi");
 
-        model = readPom(new File(projectDirectory, "demoapi/pom.xml"));
+        Model model = readPom(new File(projectDirectory, "demoapi/pom.xml"));
         assertNotNull(model.getParent());
         assertEquals("file-value", model.getParent().getGroupId());
         assertEquals("file-value", model.getParent().getArtifactId());
@@ -418,10 +351,9 @@ public class DefaultArchetypeGeneratorTest {
 
         ArchetypeGenerationResult result = 
generateProjectFromArchetypeWithFailure(request);
 
-        assertTrue(
-                result.getCause().getMessage().startsWith("Archetype 
archetypes:basic:1.0 is not configured")
-                        && result.getCause().getMessage().endsWith("Property 
property-without-default-4 is missing."),
-                "Exception not correct");
+        String message = result.getCause().getMessage();
+        assertTrue(message.startsWith("Archetype archetypes:basic:1.0 is not 
configured"), message);
+        assertTrue(message.endsWith("Property property-without-default-4 is 
missing."), message);
     }
 
     @Test
@@ -429,21 +361,24 @@ public class DefaultArchetypeGeneratorTest {
         ArchetypeGenerationRequest request =
                 createArchetypeGenerationRequest("generate-13", 
ARCHETYPE_FILESET_WITH_POSTCREATE_SCRIPT);
 
-        File projectFile = new File(projectDirectory, "pom.xml");
-
         FileUtils.forceDelete(projectDirectory);
 
         generateProjectFromArchetype(request);
 
+        assertFileSetArchetypeGenerated();
+
+        File templateFile = new File(projectDirectory, 
"src/main/java/file/value/package/ToDelete.java");
+        assertFalse(templateFile.exists(), templateFile + " should have been 
removed (by post-generate.groovy script");
+    }
+
+    /** Asserts the output shared by the generated fileset archetypes. */
+    private void assertFileSetArchetypeGenerated() throws Exception {
         
assertTemplateContentGeneratedWithFileSetArchetype("src/main/java/file/value/package/App.java",
 "file-value");
         assertTemplateContentGeneratedWithFileSetArchetype(
                 "src/main/java/file/value/package/inner/package/App2.java", 
"file-value");
 
         
assertTemplateCopiedWithFileSetArchetype("src/main/java/file/value/package/App.ogg");
 
-        File templateFile = new File(projectDirectory, 
"src/main/java/file/value/package/ToDelete.java");
-        assertFalse(templateFile.exists(), templateFile + " should have been 
removed (by post-generate.groovy script");
-
         
assertTemplateContentGeneratedWithFileSetArchetype("src/main/resources/App.properties",
 "file-value");
         
assertTemplateContentGeneratedWithFileSetArchetype("src/main/resources/file-value/touch.txt",
 "file-value");
         assertTemplateContentGeneratedWithFileSetArchetype(
@@ -456,7 +391,7 @@ public class DefaultArchetypeGeneratorTest {
         assertTemplateContentGeneratedWithFileSetArchetype(".classpath", 
"file-value");
         assertTemplateContentGeneratedWithFileSetArchetype("profiles.xml", 
"file-value");
 
-        Model model = readPom(projectFile);
+        Model model = readPom(new File(projectDirectory, "pom.xml"));
         assertNull(model.getParent());
         assertEquals("file-value", model.getGroupId());
         assertEquals("file-value", model.getArtifactId());
@@ -483,15 +418,12 @@ public class DefaultArchetypeGeneratorTest {
                 "subsubproject");
 
         assertTemplateContentGeneratedWithFileSetArchetype(
-                "subproject/subsubproject/src/main/java/file/value/package/"
-                        /* + "file-value/inner/subsubproject/innest/" + */
-                        + "ArbitraryProperty-file-value.java",
+                
"subproject/subsubproject/src/main/java/file/value/package/ArbitraryProperty-file-value.java",
                 "subsubproject");
 
         // Test that undefined properties are safely ignored (and skipped)
         assertTemplateContentGeneratedWithFileSetArchetype(
                 "subproject/subsubproject/src/main/java/file/value/package/"
-                        /* + "file-value/inner/subsubproject/innest/" + */
                         + 
"SkipsUndefinedProperty-__undefined-property__-file-value.java",
                 "subsubproject");
 
@@ -532,10 +464,8 @@ public class DefaultArchetypeGeneratorTest {
 
         request.setProperties(ADDITIONAL_PROPERTIES);
 
-        DefaultRepositorySystemSession repositorySession = new 
DefaultRepositorySystemSession();
-        LocalRepositoryManager localRepositoryManager =
-                repositorySystem.newLocalRepositoryManager(repositorySession, 
new LocalRepository(localRepository));
-        repositorySession.setLocalRepositoryManager(localRepositoryManager);
+        DefaultRepositorySystemSession repositorySession =
+                RepositorySessions.withLocalRepository(repositorySystem, new 
File(localRepository));
 
         request.setRepositorySession(repositorySession);
         return request;
@@ -585,13 +515,7 @@ public class DefaultArchetypeGeneratorTest {
     }
 
     private void copy(final File in, final File out) throws IOException {
-        assertTrue(!out.exists() || out.delete());
-        assertFalse(out.exists());
-
-        FileUtils.copyFile(in, out);
-
-        assertTrue(out.exists());
-        assertTrue(in.exists());
+        Files.copy(in.toPath(), out.toPath(), 
StandardCopyOption.REPLACE_EXISTING);
     }
 
     private Properties loadProperties(File propertyFile) throws IOException {
diff --git 
a/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
 
b/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
index cb0ea416..953b543b 100644
--- 
a/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
+++ 
b/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
@@ -36,6 +36,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.maven.archetype.ArchetypeGenerationRequest;
 import org.apache.maven.archetype.ArchetypeVelocityEngine;
 import org.apache.maven.archetype.exception.InvalidPackaging;
+import org.apache.maven.archetype.test.RepositorySessions;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.velocity.VelocityContext;
@@ -47,8 +48,6 @@ import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
-import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.repository.LocalRepositoryManager;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.repository.RepositoryPolicy;
 import org.eclipse.aether.resolution.ArtifactRequest;
@@ -60,8 +59,8 @@ import org.xmlunit.diff.Diff;
 import static org.codehaus.plexus.testing.PlexusExtension.getTestFile;
 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;
-import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author <a href="mailto:[email protected]";>Jason van Zyl</a>
@@ -101,10 +100,8 @@ public class ArchetypeTest {
         List<RemoteRepository> remoteRepositories = new ArrayList<>();
         remoteRepositories.add(remoteRepository);
 
-        DefaultRepositorySystemSession repositorySession = new 
DefaultRepositorySystemSession();
-        LocalRepositoryManager localRepositoryManager =
-                repositorySystem.newLocalRepositoryManager(repositorySession, 
new LocalRepository(mavenRepoLocal));
-        repositorySession.setLocalRepositoryManager(localRepositoryManager);
+        DefaultRepositorySystemSession repositorySession =
+                RepositorySessions.withLocalRepository(repositorySystem, new 
File(mavenRepoLocal));
 
         ArchetypeGenerationRequest request = new ArchetypeGenerationRequest()
                 .setPackage("org.apache.maven.quickstart")
@@ -185,32 +182,32 @@ public class ArchetypeTest {
             throw new ArchetypeTemplateProcessingException("Error reading 
generated POM", e);
         }
         assertEquals(
-                generatedModel.getArtifactId(),
                 templateModel.getArtifactId(),
+                generatedModel.getArtifactId(),
                 "Generated POM ArtifactId is not equivalent to expected 
result.");
         assertEquals(
-                generatedModel.getGroupId(),
                 templateModel.getGroupId(),
+                generatedModel.getGroupId(),
                 "Generated POM GroupId is not equivalent to expected result.");
         assertEquals(
-                generatedModel.getId(),
                 templateModel.getId(),
+                generatedModel.getId(),
                 "Generated POM Id is not equivalent to expected result.");
         assertEquals(
-                generatedModel.getVersion(),
                 templateModel.getVersion(),
+                generatedModel.getVersion(),
                 "Generated POM Version is not equivalent to expected result.");
         assertEquals(
-                generatedModel.getPackaging(),
                 templateModel.getPackaging(),
+                generatedModel.getPackaging(),
                 "Generated POM Packaging is not equivalent to expected 
result.");
         assertEquals(
-                generatedModel.getDevelopers(),
                 templateModel.getDevelopers(),
+                generatedModel.getDevelopers(),
                 "Generated POM Developers is not equivalent to expected 
result.");
         assertEquals(
-                generatedModel.getScm(),
                 templateModel.getScm(),
+                generatedModel.getScm(),
                 "Generated POM Scm is not equivalent to expected result.");
     }
 
@@ -378,30 +375,26 @@ public class ArchetypeTest {
     }
 
     @Test
-    public void testAddModuleToParentPOMNoPackaging() throws Exception {
-        try {
-            String pom = "<project>\n</project>";
-            DefaultOldArchetype.addModuleToParentPom("myArtifactId1", new 
StringReader(pom), new StringWriter());
-            fail("Should fail to add a module to a JAR packaged project");
-        } catch (InvalidPackaging e) {
-            // great!
-            assertEquals(
-                    "Unable to add module to the current project as it is not 
of packaging type 'pom'",
-                    e.getLocalizedMessage());
-        }
+    public void testAddModuleToParentPOMNoPackaging() {
+        String pom = "<project>\n</project>";
+        InvalidPackaging e = assertThrows(
+                InvalidPackaging.class,
+                () -> DefaultOldArchetype.addModuleToParentPom(
+                        "myArtifactId1", new StringReader(pom), new 
StringWriter()));
+        assertEquals(
+                "Unable to add module to the current project as it is not of 
packaging type 'pom'",
+                e.getLocalizedMessage());
     }
 
     @Test
-    public void testAddModuleToParentPOMJarPackaging() throws Exception {
-        try {
-            String pom = "<project>\n  <packaging>jar</packaging>\n</project>";
-            DefaultOldArchetype.addModuleToParentPom("myArtifactId1", new 
StringReader(pom), new StringWriter());
-            fail("Should fail to add a module to a JAR packaged project");
-        } catch (InvalidPackaging e) {
-            // great!
-            assertEquals(
-                    "Unable to add module to the current project as it is not 
of packaging type 'pom'",
-                    e.getLocalizedMessage());
-        }
+    public void testAddModuleToParentPOMJarPackaging() {
+        String pom = "<project>\n  <packaging>jar</packaging>\n</project>";
+        InvalidPackaging e = assertThrows(
+                InvalidPackaging.class,
+                () -> DefaultOldArchetype.addModuleToParentPom(
+                        "myArtifactId1", new StringReader(pom), new 
StringWriter()));
+        assertEquals(
+                "Unable to add module to the current project as it is not of 
packaging type 'pom'",
+                e.getLocalizedMessage());
     }
 }
diff --git 
a/archetype-common/src/test/java/org/apache/maven/archetype/old/descriptor/ArchetypeDescriptorBuilderTest.java
 
b/archetype-common/src/test/java/org/apache/maven/archetype/old/descriptor/ArchetypeDescriptorBuilderTest.java
index 93b0a06b..f5287175 100644
--- 
a/archetype-common/src/test/java/org/apache/maven/archetype/old/descriptor/ArchetypeDescriptorBuilderTest.java
+++ 
b/archetype-common/src/test/java/org/apache/maven/archetype/old/descriptor/ArchetypeDescriptorBuilderTest.java
@@ -25,7 +25,9 @@ import 
org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author <a href="mailto:[email protected]";>Jason van Zyl</a>
@@ -57,7 +59,7 @@ public class ArchetypeDescriptorBuilderTest {
 
         assertNotNull(descriptor.getSourceDescriptor("source0"));
 
-        assertEquals(true, 
descriptor.getSourceDescriptor("source0").isFiltered());
+        assertTrue(descriptor.getSourceDescriptor("source0").isFiltered());
 
         assertNotNull(descriptor.getSourceDescriptor("source0").getEncoding());
 
@@ -65,7 +67,7 @@ public class ArchetypeDescriptorBuilderTest {
 
         assertNotNull(descriptor.getSourceDescriptor("source1"));
 
-        assertEquals(true, 
descriptor.getSourceDescriptor("source1").isFiltered());
+        assertTrue(descriptor.getSourceDescriptor("source1").isFiltered());
 
         assertNotNull(descriptor.getSourceDescriptor("source1").getEncoding());
 
@@ -75,7 +77,7 @@ public class ArchetypeDescriptorBuilderTest {
 
         assertNotNull(descriptor.getResourceDescriptor("resource0"));
 
-        assertEquals(true, 
descriptor.getResourceDescriptor("resource0").isFiltered());
+        assertTrue(descriptor.getResourceDescriptor("resource0").isFiltered());
 
         
assertNotNull(descriptor.getResourceDescriptor("resource0").getEncoding());
 
@@ -83,7 +85,7 @@ public class ArchetypeDescriptorBuilderTest {
 
         assertNotNull(descriptor.getResourceDescriptor("resource1"));
 
-        assertEquals(true, 
descriptor.getResourceDescriptor("resource1").isFiltered());
+        assertTrue(descriptor.getResourceDescriptor("resource1").isFiltered());
 
         
assertNotNull(descriptor.getResourceDescriptor("resource1").getEncoding());
 
@@ -93,7 +95,7 @@ public class ArchetypeDescriptorBuilderTest {
 
         assertNotNull(descriptor.getTestSourceDescriptor("testSource0"));
 
-        assertEquals(true, 
descriptor.getTestSourceDescriptor("testSource0").isFiltered());
+        
assertTrue(descriptor.getTestSourceDescriptor("testSource0").isFiltered());
 
         
assertNotNull(descriptor.getTestSourceDescriptor("testSource0").getEncoding());
 
@@ -101,7 +103,7 @@ public class ArchetypeDescriptorBuilderTest {
 
         assertNotNull(descriptor.getTestSourceDescriptor("testSource1"));
 
-        assertEquals(true, 
descriptor.getTestSourceDescriptor("testSource1").isFiltered());
+        
assertTrue(descriptor.getTestSourceDescriptor("testSource1").isFiltered());
 
         
assertNotNull(descriptor.getTestSourceDescriptor("testSource1").getEncoding());
 
@@ -111,7 +113,7 @@ public class ArchetypeDescriptorBuilderTest {
 
         assertNotNull(descriptor.getTestResourceDescriptor("testResource0"));
 
-        assertEquals(true, 
descriptor.getTestResourceDescriptor("testResource0").isFiltered());
+        
assertTrue(descriptor.getTestResourceDescriptor("testResource0").isFiltered());
 
         
assertNotNull(descriptor.getTestResourceDescriptor("testResource0").getEncoding());
 
@@ -119,7 +121,7 @@ public class ArchetypeDescriptorBuilderTest {
 
         assertNotNull(descriptor.getTestResourceDescriptor("testResource1"));
 
-        assertEquals(true, 
descriptor.getTestResourceDescriptor("testResource1").isFiltered());
+        
assertTrue(descriptor.getTestResourceDescriptor("testResource1").isFiltered());
 
         
assertNotNull(descriptor.getTestResourceDescriptor("testResource1").getEncoding());
     }
@@ -153,7 +155,7 @@ public class ArchetypeDescriptorBuilderTest {
 
         assertNotNull(descriptor.getSourceDescriptor("source0"));
 
-        assertEquals(true, 
descriptor.getSourceDescriptor("source0").isFiltered());
+        assertTrue(descriptor.getSourceDescriptor("source0").isFiltered());
 
         assertEquals("utf-8", 
descriptor.getSourceDescriptor("source0").getEncoding());
 
@@ -161,7 +163,7 @@ public class ArchetypeDescriptorBuilderTest {
 
         assertNotNull(descriptor.getSourceDescriptor("source1"));
 
-        assertEquals(true, 
descriptor.getSourceDescriptor("source1").isFiltered());
+        assertTrue(descriptor.getSourceDescriptor("source1").isFiltered());
 
         assertEquals("utf-8", 
descriptor.getSourceDescriptor("source1").getEncoding());
 
@@ -171,7 +173,7 @@ public class ArchetypeDescriptorBuilderTest {
 
         assertNotNull(descriptor.getResourceDescriptor("resource0"));
 
-        assertEquals(false, 
descriptor.getResourceDescriptor("resource0").isFiltered());
+        
assertFalse(descriptor.getResourceDescriptor("resource0").isFiltered());
 
         
assertNotNull(descriptor.getResourceDescriptor("resource0").getEncoding());
 
@@ -179,7 +181,7 @@ public class ArchetypeDescriptorBuilderTest {
 
         assertNotNull(descriptor.getResourceDescriptor("resource1"));
 
-        assertEquals(true, 
descriptor.getResourceDescriptor("resource1").isFiltered());
+        assertTrue(descriptor.getResourceDescriptor("resource1").isFiltered());
 
         assertEquals("iso-8859-1", 
descriptor.getResourceDescriptor("resource1").getEncoding());
 
@@ -189,7 +191,7 @@ public class ArchetypeDescriptorBuilderTest {
 
         assertNotNull(descriptor.getTestSourceDescriptor("testSource0"));
 
-        assertEquals(true, 
descriptor.getTestSourceDescriptor("testSource0").isFiltered());
+        
assertTrue(descriptor.getTestSourceDescriptor("testSource0").isFiltered());
 
         assertEquals("utf-8", 
descriptor.getTestSourceDescriptor("testSource0").getEncoding());
 
@@ -197,7 +199,7 @@ public class ArchetypeDescriptorBuilderTest {
 
         assertNotNull(descriptor.getTestSourceDescriptor("testSource1"));
 
-        assertEquals(true, 
descriptor.getTestSourceDescriptor("testSource1").isFiltered());
+        
assertTrue(descriptor.getTestSourceDescriptor("testSource1").isFiltered());
 
         assertEquals("utf-8", 
descriptor.getTestSourceDescriptor("testSource1").getEncoding());
 
@@ -207,7 +209,7 @@ public class ArchetypeDescriptorBuilderTest {
 
         assertNotNull(descriptor.getTestResourceDescriptor("testResource0"));
 
-        assertEquals(true, 
descriptor.getTestResourceDescriptor("testResource0").isFiltered());
+        
assertTrue(descriptor.getTestResourceDescriptor("testResource0").isFiltered());
 
         assertEquals(
                 "us-ascii",
@@ -217,8 +219,7 @@ public class ArchetypeDescriptorBuilderTest {
 
         assertNotNull(descriptor.getTestResourceDescriptor("testResource1"));
 
-        assertEquals(
-                false, 
descriptor.getTestResourceDescriptor("testResource1").isFiltered());
+        
assertFalse(descriptor.getTestResourceDescriptor("testResource1").isFiltered());
 
         
assertNotNull(descriptor.getTestResourceDescriptor("testResource1").getEncoding());
 
@@ -228,8 +229,7 @@ public class ArchetypeDescriptorBuilderTest {
 
         assertNotNull(descriptor.getSiteResourceDescriptor("siteResource0"));
 
-        assertEquals(
-                false, 
descriptor.getSiteResourceDescriptor("siteResource0").isFiltered());
+        
assertFalse(descriptor.getSiteResourceDescriptor("siteResource0").isFiltered());
 
         
assertNotNull(descriptor.getSiteResourceDescriptor("siteResource0").getEncoding());
 
@@ -237,7 +237,7 @@ public class ArchetypeDescriptorBuilderTest {
 
         assertNotNull(descriptor.getSiteResourceDescriptor("siteResource1"));
 
-        assertEquals(true, 
descriptor.getSiteResourceDescriptor("siteResource1").isFiltered());
+        
assertTrue(descriptor.getSiteResourceDescriptor("siteResource1").isFiltered());
 
         assertEquals(
                 "utf-16", 
descriptor.getSiteResourceDescriptor("siteResource1").getEncoding());
diff --git 
a/archetype-common/src/test/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawlerTest.java
 
b/archetype-common/src/test/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawlerTest.java
index 728363dc..4a7d4e0e 100644
--- 
a/archetype-common/src/test/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawlerTest.java
+++ 
b/archetype-common/src/test/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawlerTest.java
@@ -27,7 +27,7 @@ import org.codehaus.plexus.testing.PlexusTest;
 import org.junit.jupiter.api.Test;
 
 import static org.codehaus.plexus.testing.PlexusExtension.getTestFile;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author rafale
@@ -46,10 +46,8 @@ public class DefaultRepositoryCrawlerTest {
         File repository = 
getTestFile("target/test-classes/repositories/central");
 
         ArchetypeCatalog result = instance.crawl(repository);
-        assertTrue(
-                (5 <= result.getArchetypes().size()) && 
(result.getArchetypes().size() <= 8),
-                "result.getArchetypes().size() = " + 
result.getArchetypes().size() + " should be in [5,8], result = "
-                        + result);
+        // basic, partial, site, old, fileset and fileset_with_postscript, 
prepared by the antrun executions in pom.xml
+        assertEquals(6, result.getArchetypes().size(), () -> "unexpected 
catalog: " + result);
 
         // TODO: should write to another directory
         //        instance.writeCatalog(result, new File(repository, 
"archetype-catalog.xml"));
diff --git 
a/archetype-common/src/test/java/org/apache/maven/archetype/source/LocalCatalogArchetypeDataSourceTest.java
 
b/archetype-common/src/test/java/org/apache/maven/archetype/source/LocalCatalogArchetypeDataSourceTest.java
index 0f77c955..20dc0134 100644
--- 
a/archetype-common/src/test/java/org/apache/maven/archetype/source/LocalCatalogArchetypeDataSourceTest.java
+++ 
b/archetype-common/src/test/java/org/apache/maven/archetype/source/LocalCatalogArchetypeDataSourceTest.java
@@ -45,11 +45,10 @@ import org.apache.maven.archetype.ArchetypeManager;
 import org.apache.maven.archetype.catalog.Archetype;
 import org.apache.maven.archetype.catalog.ArchetypeCatalog;
 import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
+import org.apache.maven.archetype.test.RepositorySessions;
 import org.codehaus.plexus.testing.PlexusTest;
 import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.repository.LocalRepositoryManager;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -89,10 +88,8 @@ public class LocalCatalogArchetypeDataSourceTest {
     @Test
     public void testLocalCatalog() {
 
-        DefaultRepositorySystemSession repositorySession = new 
DefaultRepositorySystemSession();
-        LocalRepositoryManager localRepositoryManager = 
repositorySystem.newLocalRepositoryManager(
-                repositorySession, new 
LocalRepository(getTestFile("target/test-classes/repositories/test-catalog")));
-        repositorySession.setLocalRepositoryManager(localRepositoryManager);
+        DefaultRepositorySystemSession repositorySession = 
RepositorySessions.withLocalRepository(
+                repositorySystem, 
getTestFile("target/test-classes/repositories/test-catalog"));
 
         ArchetypeCatalog result = archetype.getLocalCatalog(repositorySession);
 
diff --git 
a/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
 
b/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
index f27478b0..a01fbbf5 100644
--- 
a/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
+++ 
b/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
@@ -32,12 +32,10 @@ import org.codehaus.plexus.testing.PlexusTest;
 import org.codehaus.plexus.util.FileUtils;
 import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.repository.LocalRepositoryManager;
 import org.junit.jupiter.api.Test;
 
 import static org.codehaus.plexus.testing.PlexusExtension.getBasedir;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /** @author Jason van Zyl */
 @PlexusTest
@@ -52,10 +50,8 @@ public class ArchetypeGenerationTest {
     @Test
     public void testProjectGenerationFromAnArchetype() throws Exception {
 
-        DefaultRepositorySystemSession repositorySession = new 
DefaultRepositorySystemSession();
-        LocalRepositoryManager localRepositoryManager = 
repositorySystem.newLocalRepositoryManager(
-                repositorySession, new 
LocalRepository("target/test-classes/repositories/central"));
-        repositorySession.setLocalRepositoryManager(localRepositoryManager);
+        DefaultRepositorySystemSession repositorySession = 
RepositorySessions.withLocalRepository(
+                repositorySystem, new 
File("target/test-classes/repositories/central"));
 
         ArchetypeCatalog catalog = 
archetype.getLocalCatalog(repositorySession);
 
@@ -104,9 +100,6 @@ public class ArchetypeGenerationTest {
 
         ArchetypeGenerationResult result = 
archetype.generateProjectFromArchetype(agr);
 
-        if (result.getCause() != null) {
-            result.getCause().printStackTrace(System.err);
-            fail(result.getCause().getMessage());
-        }
+        assertNull(result.getCause(), () -> "Archetype wasn't generated 
successfully: " + result.getCause());
     }
 }
diff --git 
a/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerificationTest.java
 
b/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerificationTest.java
index 5f50e04e..614e5c36 100644
--- 
a/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerificationTest.java
+++ 
b/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerificationTest.java
@@ -32,8 +32,6 @@ import org.codehaus.plexus.testing.PlexusTest;
 import org.codehaus.plexus.util.FileUtils;
 import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.repository.LocalRepositoryManager;
 import org.junit.jupiter.api.Test;
 
 import static org.codehaus.plexus.testing.PlexusExtension.getBasedir;
@@ -73,10 +71,8 @@ public class InternalCatalogArchetypesVerificationTest {
             // this should be also default ...
             archetype.setRepository(CENTRAL);
 
-            DefaultRepositorySystemSession repositorySession = new 
DefaultRepositorySystemSession();
-            LocalRepositoryManager localRepositoryManager = 
repositorySystem.newLocalRepositoryManager(
-                    repositorySession, new 
LocalRepository("target/test-classes/repositories/local"));
-            
repositorySession.setLocalRepositoryManager(localRepositoryManager);
+            DefaultRepositorySystemSession repositorySession = 
RepositorySessions.withLocalRepository(
+                    repositorySystem, new 
File("target/test-classes/repositories/local"));
 
             ArchetypeGenerationRequest request = new 
ArchetypeGenerationRequest(archetype)
                     .setGroupId("org.apache.maven.archetype.test")
diff --git 
a/archetype-common/src/test/java/org/apache/maven/archetype/test/RepositorySessions.java
 
b/archetype-common/src/test/java/org/apache/maven/archetype/test/RepositorySessions.java
new file mode 100644
index 00000000..89398497
--- /dev/null
+++ 
b/archetype-common/src/test/java/org/apache/maven/archetype/test/RepositorySessions.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.archetype.test;
+
+import java.io.File;
+
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.repository.LocalRepository;
+
+/** Builds repository sessions backed by a local repository directory, for 
tests. */
+public final class RepositorySessions {
+
+    private RepositorySessions() {}
+
+    /**
+     * Creates a session whose local repository is the given directory.
+     *
+     * @param repositorySystem the repository system
+     * @param localRepository the local repository directory
+     * @return a new session
+     */
+    public static DefaultRepositorySystemSession withLocalRepository(
+            RepositorySystem repositorySystem, File localRepository) {
+        DefaultRepositorySystemSession session = new 
DefaultRepositorySystemSession();
+        session.setLocalRepositoryManager(
+                repositorySystem.newLocalRepositoryManager(session, new 
LocalRepository(localRepository)));
+        return session;
+    }
+}

Reply via email to