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

slachiewicz pushed a commit to branch agent/harness-default-resources-40x
in repository https://gitbox.apache.org/repos/asf/maven.git

commit ea94e604d879845158247f4bf90f8f4327f90682
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sun Nov 8 11:12:38 2026 +0100

    Declare default resource directories in the @MojoTest project
---
 .../apache/maven/testing/plugin/MojoExtension.java | 14 +++++++++++
 .../api/plugin/testing/MojoExtensionModelTest.java | 28 ++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git 
a/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoExtension.java
 
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoExtension.java
index 408137a001..13e187fe28 100644
--- 
a/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoExtension.java
+++ 
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoExtension.java
@@ -380,12 +380,26 @@ public void beforeEach(ExtensionContext context) throws 
Exception {
                                                 .resolve("src/main/java")
                                                 .toString())
                                         .build(),
+                                Source.newBuilder()
+                                        .scope("main")
+                                        .lang("resources")
+                                        .directory(basedirPath
+                                                .resolve("src/main/resources")
+                                                .toString())
+                                        .build(),
                                 Source.newBuilder()
                                         .scope("test")
                                         .lang("java")
                                         .directory(basedirPath
                                                 .resolve("src/test/java")
                                                 .toString())
+                                        .build(),
+                                Source.newBuilder()
+                                        .scope("test")
+                                        .lang("resources")
+                                        .directory(basedirPath
+                                                .resolve("src/test/resources")
+                                                .toString())
                                         .build()))
                         .testOutputDirectory(
                                 
basedirPath.resolve("target/test-classes").toString())
diff --git 
a/impl/maven-testing/src/test/java/org/apache/maven/api/plugin/testing/MojoExtensionModelTest.java
 
b/impl/maven-testing/src/test/java/org/apache/maven/api/plugin/testing/MojoExtensionModelTest.java
index a6b2df0855..4cc7167124 100644
--- 
a/impl/maven-testing/src/test/java/org/apache/maven/api/plugin/testing/MojoExtensionModelTest.java
+++ 
b/impl/maven-testing/src/test/java/org/apache/maven/api/plugin/testing/MojoExtensionModelTest.java
@@ -24,6 +24,7 @@
 import org.apache.maven.api.Project;
 import org.apache.maven.api.di.Inject;
 import org.apache.maven.api.model.Model;
+import org.apache.maven.api.model.Source;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -73,6 +74,33 @@ void mergedModelIncludesDefaultBuildPaths() {
                 "Output directory from defaultModel should be present after 
merge");
     }
 
+    @Test
+    void defaultModelDeclaresSourceAndResourceDirectories() {
+        assertSource("main", "java", "src/main/java");
+        assertSource("main", "resources", "src/main/resources");
+        assertSource("test", "java", "src/test/java");
+        assertSource("test", "resources", "src/test/resources");
+    }
+
+    @Test
+    @InjectMojo(goal = COORDINATES, pom = MINIMAL_POM)
+    void mergedModelKeepsDefaultResourceDirectories() {
+        assertSource("main", "resources", "src/main/resources");
+        assertSource("test", "resources", "src/test/resources");
+    }
+
+    private void assertSource(String scope, String lang, String directory) {
+        Path expected = 
Paths.get(org.apache.maven.testing.plugin.MojoExtension.getBasedir())
+                .resolve(directory);
+        assertTrue(
+                project.getModel().getBuild().getSources().stream()
+                        .filter(source -> scope.equals(source.getScope()) && 
lang.equals(source.getLang()))
+                        .map(Source::getDirectory)
+                        .anyMatch(dir -> Paths.get(dir).equals(expected)),
+                () -> "Expected a " + scope + " " + lang + " source at " + 
expected + ", got "
+                        + project.getModel().getBuild().getSources());
+    }
+
     @Test
     @InjectMojo(goal = COORDINATES, pom = MINIMAL_POM)
     void storedModelHasAlignedPaths() {

Reply via email to