Inject classpath into test + use individual test projects

build.gradle

@@ -25,6 +25,19 @@ repositories {
     }
 }
 
+// Write the plugin's classpath to a file to share with the tests
+task createClasspathManifest {
+    def outputDir = file("$buildDir/$name")
+
+    inputs.files sourceSets.main.runtimeClasspath
+    outputs.dir outputDir
+
+    doLast {
+        outputDir.mkdirs()
+        file("$outputDir/plugin-classpath.txt").text = sourceSets.main.runtimeClasspath.join("\n")
+    }
+}
+
 dependencies {
     implementation gradleApi()
 
@@ -34,6 +47,8 @@ dependencies {
     testImplementation gradleTestKit()
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.2'
+    // Add the classpath file to the test runtime classpath
+    testRuntimeOnly files(createClasspathManifest)
 }
 
 test {

src/test/java/org/openjfx/gradle/JavaFXPluginSmokeTest.java

@@ -31,47 +31,76 @@
 
 import org.gradle.testkit.runner.GradleRunner;
 import org.gradle.testkit.runner.TaskOutcome;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class JavaFXPluginSmokeTest {
 
+    private List<File> pluginClasspath;
+
+    @BeforeAll
+    public void setup() {
+        pluginClasspath = pluginClasspath();
+    }
+
     @Test
     void smokeTestModular() {
         var result = GradleRunner.create()
-                .withProjectDir(new File("test-project"))
+                .withProjectDir(new File("test-project/modular"))
                 .withGradleVersion("6.0.1")
                 .withArguments("clean", "build", "run", "--stacktrace", "--refresh-dependencies")
+                .withPluginClasspath(pluginClasspath)
                 .forwardOutput()
                 .build();
 
-        assertEquals(TaskOutcome.SUCCESS, result.task(":modular:run").getOutcome(), "Failed build!");
+        assertEquals(TaskOutcome.SUCCESS, result.task(":run").getOutcome(), "Failed build!");
     }
 
     @Test
     void smokeTestNonModular() {
         var result = GradleRunner.create()
-                .withProjectDir(new File("test-project"))
+                .withProjectDir(new File("test-project/non-modular"))
                 .withGradleVersion("6.0.1")
                 .withArguments("clean", "build", "run", "--stacktrace", "--refresh-dependencies")
+                .withPluginClasspath(pluginClasspath)
                 .forwardOutput()
                 .build();
 
-        assertEquals(TaskOutcome.SUCCESS, result.task(":non-modular:run").getOutcome(), "Failed build!");
+        assertEquals(TaskOutcome.SUCCESS, result.task(":run").getOutcome(), "Failed build!");
     }
 
     @Test
     void smokeTestTransitive() {
         var result = GradleRunner.create()
-                .withProjectDir(new File("test-project"))
+                .withProjectDir(new File("test-project/transitive"))
                 .withGradleVersion("6.0.1")
                 .withArguments("clean", "build", "run", "--stacktrace", "--refresh-dependencies")
+                .withPluginClasspath(pluginClasspath)
                 .forwardOutput()
                 .build();
 
-        assertEquals(TaskOutcome.SUCCESS, result.task(":transitive:run").getOutcome(), "Failed build!");
+        assertEquals(TaskOutcome.SUCCESS, result.task(":run").getOutcome(), "Failed build!");
+    }
+
+    private List<File> pluginClasspath() {
+        try {
+            var pluginClasspathResource = Objects.requireNonNull(getClass().getResource("../../../../createClasspathManifest/plugin-classpath.txt")).toURI();
+            return Files.readAllLines(Paths.get(pluginClasspathResource)).stream().map(File::new).collect(Collectors.toList());
+        } catch (IOException | URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
     }
 }

test-project/modular/build.gradle

@@ -1,3 +1,12 @@
+plugins {
+    id 'application'
+    id 'org.openjfx.javafxplugin'
+}
+
+repositories {
+    mavenCentral()
+}
+
 mainClassName = 'org.openjfx.gradle.javafx.test/org.openjfx.gradle.javafx.test.Main'
 
 javafx {

test-project/modular/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'modular'

test-project/non-modular/build.gradle

@@ -1,3 +1,12 @@
+plugins {
+    id 'application'
+    id 'org.openjfx.javafxplugin'
+}
+
+repositories {
+    mavenCentral()
+}
+
 mainClassName = 'org.openjfx.gradle.javafx.test.Main'
 
 javafx {

test-project/non-modular/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'non-modular'

test-project/transitive/build.gradle

@@ -1,3 +1,12 @@
+plugins {
+    id 'application'
+    id 'org.openjfx.javafxplugin'
+}
+
+repositories {
+    mavenCentral()
+}
+
 mainClassName = 'org.openjfx.gradle.javafx.test.Main'
 
 javafx {

test-project/transitive/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'transitive'