Add late extendsFrom implementation

Author: jjohannes

src/main/java/org/gradlex/javamodule/testing/JavaModuleTestingExtension.java

@@ -11,6 +11,7 @@
 import org.gradle.api.Action;
 import org.gradle.api.Describable;
 import org.gradle.api.Project;
+import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.ConfigurationContainer;
 import org.gradle.api.artifacts.dsl.DependencyHandler;
 import org.gradle.api.file.RegularFile;
@@ -61,6 +62,7 @@ public JavaModuleTestingExtension(Project project) {
                 whitebox(jvmTestSuite, conf -> conf.getOpensTo().add("org.junit.platform.commons"));
             }
         });
+        project.afterEvaluate(this::lateConfigureExtendsFrom);
     }
 
     /**
@@ -281,12 +283,10 @@ private void configureJvmTestSuiteForWhitebox(
 
         addDependencyForRequires(
                 whiteboxJvmTestSuite,
-                project,
                 testSources.getImplementationConfigurationName(),
                 whiteboxJvmTestSuite.getRequires());
         addDependencyForRequires(
                 whiteboxJvmTestSuite,
-                project,
                 testSources.getRuntimeOnlyConfigurationName(),
                 whiteboxJvmTestSuite.getRequiresRuntime());
     }
@@ -360,4 +360,30 @@ private void revertJvmTestSuiteForWhitebox(JvmTestSuite jvmTestSuite) {
             test.getJvmArgumentProviders().removeIf(p -> p instanceof WhiteboxTestRuntimeArgumentProvider);
         });
     }
+
+    private void lateConfigureExtendsFrom(Project project) {
+        ConfigurationContainer configurations = project.getConfigurations();
+        whiteboxOrClasspathTestSuites.forEach((testSources, sourcesUnderTest) -> {
+            extendsFrom(
+                    configurations,
+                    testSources.getImplementationConfigurationName(),
+                    sourcesUnderTest.getImplementationConfigurationName());
+            extendsFrom(
+                    configurations,
+                    testSources.getRuntimeOnlyConfigurationName(),
+                    sourcesUnderTest.getRuntimeOnlyConfigurationName());
+            extendsFrom(
+                    configurations,
+                    testSources.getCompileOnlyConfigurationName(),
+                    sourcesUnderTest.getCompileOnlyConfigurationName());
+        });
+    }
+
+    private void extendsFrom(ConfigurationContainer configurations, String testScope, String underTestScope) {
+        Configuration testScopeConf = configurations.getByName(testScope);
+        Configuration underTestScopeConf = configurations.getByName(underTestScope);
+        if (!testScopeConf.getExtendsFrom().contains(underTestScopeConf)) {
+            testScopeConf.extendsFrom(underTestScopeConf);
+        }
+    }
 }

src/test/java/org/gradlex/javamodule/testing/test/CoreFunctionalityTest.java

@@ -13,6 +13,42 @@ class CoreFunctionalityTest {
 
     @Test
     void testCompileOnly_extends_compileOnly_for_whitebox_test_suites() {
+        build.appBuildFile.appendText(
+                """
+            javaModuleTesting.whitebox(testing.suites["test"]) {
+                requires.add("org.junit.jupiter.api")
+            }
+            dependencies {
+                compileOnly("jakarta.servlet:jakarta.servlet-api:6.1.0")
+            }""");
+        build.file("app/src/main/java/org/example/app/ServletImpl.java")
+                .writeText(
+                        """
+            package org.example.app;
+            public abstract class ServletImpl implements jakarta.servlet.Servlet { }
+            """);
+        build.file("app/src/test/java/org/example/app/test/ServletMock.java")
+                .writeText(
+                        """
+            package org.example.app.test;
+            public abstract class ServletMock extends org.example.app.ServletImpl { }
+            """);
+        build.appModuleInfoFile.writeText(
+                """
+            module org.example.app {
+                requires static jakarta.servlet;
+            }
+            """);
+
+        var result = build.runner("compileTestJava").build();
+        var compileTestResult = result.task(":app:compileTestJava");
+
+        assertThat(compileTestResult).isNotNull();
+        assertThat(compileTestResult.getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
+    }
+
+    @Test
+    void testCompileOnly_extends_compileOnly_for_classpath_test_suites() {
         build.appBuildFile.appendText(
                 """
             javaModuleTesting.classpath(testing.suites["test"])
@@ -44,4 +80,48 @@ public abstract class ServletMock extends org.example.app.ServletImpl { }
         assertThat(compileTestResult).isNotNull();
         assertThat(compileTestResult.getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
     }
+
+    @Test
+    void testImplementation_extends_implementation_for_whitebox_test_suites() {
+        build.useTestFixturesPlugin();
+        build.appBuildFile.appendText(
+                """
+            javaModuleTesting.whitebox(testing.suites["test"]) {
+                requires.add("org.junit.jupiter.api")
+                sourcesUnderTest.set(sourceSets.testFixtures)
+            }
+            dependencies {
+                testFixturesImplementation("jakarta.servlet:jakarta.servlet-api:6.1.0")
+            }""");
+        build.file("app/src/testFixtures/java/org/example/app/Main.java")
+                .writeText("""
+            package org.example.app;
+            public class Main {}
+            """);
+        build.file("app/src/testFixtures/java/org/example/app/ServletImpl.java")
+                .writeText(
+                        """
+            package org.example.app;
+            public abstract class ServletImpl implements jakarta.servlet.Servlet { }
+            """);
+        build.file("app/src/test/java/org/example/app/test/ServletMock.java")
+                .writeText(
+                        """
+            package org.example.app.test;
+            public abstract class ServletMock extends org.example.app.ServletImpl { }
+            """);
+        build.file("app/src/testFixtures/java/module-info.java")
+                .writeText(
+                        """
+            module org.example.fixtures {
+                requires static jakarta.servlet;
+            }
+            """);
+
+        var result = build.runner("compileTestJava").build();
+        var compileTestResult = result.task(":app:compileTestJava");
+
+        assertThat(compileTestResult).isNotNull();
+        assertThat(compileTestResult.getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
+    }
 }