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


The following commit(s) were added to refs/heads/master by this push:
     new e156afc7 Parameterize list scanner tests
e156afc7 is described below

commit e156afc739a4a43baa895e7589ac41b70a5af1f0
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Thu Nov 19 01:08:46 2026 +0100

    Parameterize list scanner tests
---
 archetype-common/pom.xml                           |  5 ++
 .../archetype/common/util/TestListScanner.java     | 74 +++++++---------------
 2 files changed, 28 insertions(+), 51 deletions(-)

diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml
index 6b374f0f..65f67d09 100644
--- a/archetype-common/pom.xml
+++ b/archetype-common/pom.xml
@@ -132,6 +132,11 @@
       <artifactId>junit-jupiter-api</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-testing</artifactId>
diff --git 
a/archetype-common/src/test/java/org/apache/maven/archetype/common/util/TestListScanner.java
 
b/archetype-common/src/test/java/org/apache/maven/archetype/common/util/TestListScanner.java
index 7966eed2..94eed1a6 100644
--- 
a/archetype-common/src/test/java/org/apache/maven/archetype/common/util/TestListScanner.java
+++ 
b/archetype-common/src/test/java/org/apache/maven/archetype/common/util/TestListScanner.java
@@ -18,10 +18,11 @@
  */
 package org.apache.maven.archetype.common.util;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -29,61 +30,32 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 /** @author <a href="mailto:[email protected]";>Brian Fox</a> */
 public class TestListScanner {
 
-    @Test
-    public void testUnixPaths() {
-        List<String> archetypeResources = new ArrayList<>();
-
-        archetypeResources.add("pom.xml");
-        archetypeResources.add("App.java");
-        archetypeResources.add("src/main/c/App.c");
-        archetypeResources.add("src/main/java/App.java");
-        archetypeResources.add("src/main/java/inner/package/App2.java");
-        archetypeResources.add("src/main/mdo/App.mdo");
-        archetypeResources.add("src/main/resources/App.properties");
-        archetypeResources.add("src/main/resources/inner/dir/App2.properties");
-        archetypeResources.add("src/test/c/AppTest.c");
-        archetypeResources.add("src/test/java/AppTest.java");
-        archetypeResources.add("src/test/mdo/AppTest.mdo");
-        archetypeResources.add("src/test/resources/AppTest.properties");
-
-        ListScanner scanner = new ListScanner();
-        scanner.setBasedir("src/main/java");
-        scanner.setIncludes("**/*.java");
-        scanner.setCaseSensitive(true);
-
-        List<String> result = scanner.scan(archetypeResources);
-
-        assertEquals(2, result.size());
-        assertTrue(result.contains("src/main/java/App.java"));
-        assertTrue(result.contains("src/main/java/inner/package/App2.java"));
-    }
-
-    @Test
-    public void testWindowsPaths() {
-        List<String> archetypeResources = new ArrayList<>();
-
-        archetypeResources.add("pom.xml");
-        archetypeResources.add("App.java");
-        archetypeResources.add("src\\main\\c\\App.c");
-        archetypeResources.add("src\\main\\java\\App.java");
-        archetypeResources.add("src\\main\\java\\inner\\package\\App2.java");
-        archetypeResources.add("src\\main\\mdo\\App.mdo");
-        archetypeResources.add("src\\main\\resources\\App.properties");
-        
archetypeResources.add("src\\main\\resources\\inner\\dir\\App2.properties");
-        archetypeResources.add("src\\test\\c\\AppTest.c");
-        archetypeResources.add("src\\test\\java\\AppTest.java");
-        archetypeResources.add("src\\test\\mdo\\AppTest.mdo");
-        archetypeResources.add("src\\test\\resources\\AppTest.properties");
+    @ParameterizedTest
+    @CsvSource({"/", "\\"})
+    public void testPaths(String separator) {
+        List<String> archetypeResources = Arrays.asList(
+                "pom.xml",
+                "App.java",
+                String.join(separator, "src", "main", "c", "App.c"),
+                String.join(separator, "src", "main", "java", "App.java"),
+                String.join(separator, "src", "main", "java", "inner", 
"package", "App2.java"),
+                String.join(separator, "src", "main", "mdo", "App.mdo"),
+                String.join(separator, "src", "main", "resources", 
"App.properties"),
+                String.join(separator, "src", "main", "resources", "inner", 
"dir", "App2.properties"),
+                String.join(separator, "src", "test", "c", "AppTest.c"),
+                String.join(separator, "src", "test", "java", "AppTest.java"),
+                String.join(separator, "src", "test", "mdo", "AppTest.mdo"),
+                String.join(separator, "src", "test", "resources", 
"AppTest.properties"));
 
         ListScanner scanner = new ListScanner();
-        scanner.setBasedir("src\\main\\java");
-        scanner.setIncludes("**\\*.java");
+        scanner.setBasedir(String.join(separator, "src", "main", "java"));
+        scanner.setIncludes("**" + separator + "*.java");
         scanner.setCaseSensitive(true);
 
         List<String> result = scanner.scan(archetypeResources);
 
         assertEquals(2, result.size());
-        assertTrue(result.contains("src\\main\\java\\App.java"));
-        
assertTrue(result.contains("src\\main\\java\\inner\\package\\App2.java"));
+        assertTrue(result.contains(String.join(separator, "src", "main", 
"java", "App.java")));
+        assertTrue(result.contains(String.join(separator, "src", "main", 
"java", "inner", "package", "App2.java")));
     }
 }

Reply via email to