Add failing test

Author: big-andy-coates

src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java

@@ -37,7 +37,7 @@ void before() throws IOException {
     }
 
     @CartesianProductTest(name = "smokeTest({arguments})")
-    @CartesianValueSource(strings = {"test-project", "test-project-kotlin", "test-project-groovy"})
+    @CartesianValueSource(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"})
     @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0", "7.2"})
     void smokeTest(String projectName, String gradleVersion) {
         LOGGER.lifecycle("Executing smokeTest of {} with Gradle {}", projectName, gradleVersion);
@@ -60,7 +60,7 @@ void smokeTest(String projectName, String gradleVersion) {
     }
 
     @CartesianProductTest(name = "smokeTestRun({arguments})")
-    @CartesianValueSource(strings = {"test-project", "test-project-kotlin", "test-project-groovy"})
+    @CartesianValueSource(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"})
     @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0", "7.2"})
     void smokeTestRun(String projectName, String gradleVersion) {
         LOGGER.lifecycle("Executing smokeTestRun of {} with Gradle {}", projectName, gradleVersion);
@@ -158,7 +158,7 @@ private static void assertExpectedClassFileFormats(
     }
 
     @CartesianProductTest(name = "smokeTestDist({arguments})")
-    @CartesianValueSource(strings = {"test-project", "test-project-kotlin", "test-project-groovy"})
+    @CartesianValueSource(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"})
     @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0", "7.2"})
     void smokeTestDist(String projectName, String gradleVersion) {
         LOGGER.lifecycle("Executing smokeTestDist of {} with Gradle {}", projectName, gradleVersion);
@@ -199,7 +199,7 @@ void smokeTestDist(String projectName, String gradleVersion) {
     }
 
     @CartesianProductTest(name = "smokeTestRunDemo({arguments})")
-    @CartesianValueSource(strings = {"test-project", "test-project-kotlin", "test-project-groovy"})
+    @CartesianValueSource(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"})
     @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0", "7.2"})
     void smokeTestRunDemo(String projectName, String gradleVersion) {
         LOGGER.lifecycle("Executing smokeTestRunDemo of {} with Gradle {}", projectName, gradleVersion);
@@ -218,7 +218,7 @@ void smokeTestRunDemo(String projectName, String gradleVersion) {
     }
 
     @CartesianProductTest(name = "smokeTestRunStartScripts({arguments})")
-    @CartesianValueSource(strings = {"test-project", "test-project-kotlin", "test-project-groovy"})
+    @CartesianValueSource(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"})
     @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0", "7.2"})
     void smokeTestRunStartScripts(String projectName, String gradleVersion) {
         LOGGER.lifecycle("Executing smokeTestRunScripts of {} with Gradle {}", projectName, gradleVersion);
@@ -248,7 +248,9 @@ private static void assertTasksSuccessful(BuildResult result, String subprojectN
     }
 
     private static boolean checkCombination(String projectName, String gradleVersion) {
-        if(projectName.equals("test-project-kotlin") && gradleVersion.compareTo("6.4") < 0) {
+        final boolean kotlin_NotSupported = projectName.startsWith("test-project-kotlin") && gradleVersion.compareTo("6.4") < 0;
+        final boolean kotlin1_7_NotSupported = projectName.equals("test-project-kotlin") && gradleVersion.compareTo("6.6") < 0;
+        if (kotlin_NotSupported || kotlin1_7_NotSupported) {
             LOGGER.lifecycle("Unsupported combination: {} / Gradle {}. Test skipped", projectName, gradleVersion);
             return false;
         }

test-project-kotlin-pre-1-7/README.md

@@ -0,0 +1,40 @@
+Introduction
+===
+
+This Kotlin test project can be used as a standalone test project to verify the published plugin.
+It is also used as an internal test project for testing unpublished plugin changes.
+
+Standalone test product
+===
+To run this product as a standalone test product use this command (launched from `test-project-kotlin` directory):
+```
+../gradlew clean build
+```
+
+It will use the most recent plugin version from Gradle maven repository to compile the test project with
+modules and run the unit tests.
+
+Testing locally published plugin
+===
+
+You can publish the plugin locally by running this command from the root directory:
+
+`./gradlew publishToMavenLocal`
+
+You can test the locally published plugin by running the following command from `test-project-kotlin` directory.
+
+`../gradlew -c local_maven_settings.gradle clean build` 
+
+It will use the locally published version of the plugin to compile the test project with 
+modules and run the unit tests.
+
+
+Internal test project
+===
+
+This mode is enabled in `ModulePluginSmokeTest` by passing an extra parameter (`-c smoke_test_settings.gradle`).
+`smoke_test_settings.gradle` script configures plugin management for `build.gradle.kts` so that the plugin cannot be resolved from
+a Gradle plugin repository. Instead, it relies on the smoke test to make the plugin under development available
+to the test project by sharing a classpath (using Gradle TestKit).
+
+__CAUTION:__ This approach won't work outside of the smoke test, it will break the build because the plugin jar won't be resolved.

test-project-kotlin-pre-1-7/build.gradle.kts

@@ -0,0 +1,59 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    kotlin("jvm") version "1.3.72" apply false
+    id("org.javamodularity.moduleplugin") version "1.8.11" apply false
+}
+
+subprojects {
+    apply(plugin = "kotlin")
+    apply(plugin = "org.javamodularity.moduleplugin")
+
+    //region https://docs.gradle.org/current/userguide/kotlin_dsl.html#using_kotlin_delegated_properties
+    val test by tasks.existing(Test::class)
+    val build by tasks
+    val javadoc by tasks
+
+    val implementation by configurations
+    val testImplementation by configurations
+    val testRuntimeOnly by configurations
+
+    val jUnitVersion: String by project
+    val jUnitPlatformVersion: String by project
+    //endregion
+
+    //region KOTLIN
+    tasks.withType<KotlinCompile> {
+        kotlinOptions.jvmTarget = "1.8"
+    }
+    dependencies {
+        implementation(kotlin("stdlib-jdk8"))
+    }
+    //endregion
+
+    repositories {
+        mavenCentral()
+    }
+
+    configure<org.javamodularity.moduleplugin.extensions.ModularityExtension> {
+        improveEclipseClasspathFile()
+        moduleVersion("1.2.3")
+    }
+
+    test {
+        useJUnitPlatform()
+
+        testLogging {
+            events("PASSED", "FAILED", "SKIPPED", "STANDARD_OUT")
+        }
+    }
+
+    dependencies {
+        testImplementation("org.junit.jupiter:junit-jupiter-api:$jUnitVersion")
+        testImplementation("org.junit.jupiter:junit-jupiter-params:$jUnitVersion")
+        testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$jUnitVersion")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher:$jUnitPlatformVersion")
+    }
+
+//    build.dependsOn(javadoc) // TODO: No public or protected classes found to document
+}

test-project-kotlin-pre-1-7/gradle.properties

@@ -0,0 +1,2 @@
+jUnitVersion = 5.6.2
+jUnitPlatformVersion = 1.6.2

test-project-kotlin-pre-1-7/greeter.api/build.gradle.kts

@@ -0,0 +1,21 @@
+import org.javamodularity.moduleplugin.extensions.CompileModuleOptions
+import org.javamodularity.moduleplugin.extensions.TestModuleOptions
+
+//region NO-OP (DSL testing)
+tasks.compileJava {
+    extensions.configure<CompileModuleOptions> {
+        addModules = listOf()
+        compileModuleInfoSeparately = false
+    }
+}
+
+tasks.test {
+    extensions.configure<TestModuleOptions> {
+        addModules = listOf()
+        runOnClasspath = false
+    }
+}
+
+modularity {
+}
+//endregion

test-project-kotlin-pre-1-7/greeter.api/src/main/java/module-info.java

@@ -0,0 +1,4 @@
+module greeter.api {
+    exports examples.greeter.api;
+    requires kotlin.stdlib;
+}

test-project-kotlin-pre-1-7/greeter.api/src/main/kotlin/examples/greeter/api/Greeter.kt

@@ -0,0 +1,5 @@
+package examples.greeter.api
+
+interface Greeter {
+    fun hello(): String
+}

test-project-kotlin-pre-1-7/greeter.javaexec/build.gradle.kts

@@ -0,0 +1,28 @@
+import org.javamodularity.moduleplugin.tasks.ModularJavaExec
+
+val moduleName: String by project
+
+dependencies {
+    implementation(project(":greeter.api"))
+    runtimeOnly(project(":greeter.provider"))
+}
+
+patchModules.config = listOf(
+        "java.annotation=jsr305-3.0.2.jar"
+)
+modularity {
+    patchModule("java.annotation", "jsr250-api-1.0.jar")
+}
+
+File("${project.projectDir}/src/main/kotlin/demo")
+        .listFiles({ _, name -> Regex("Demo.*\\.kt") matches name })
+        .forEach { file ->
+            val demoClassName = file.name.removeSuffix(".kt")
+            tasks.create<ModularJavaExec>("run$demoClassName") {
+                group = "Demo"
+                description = "Run the $demoClassName program"
+                mainClass.set("demo.${demoClassName}Kt")
+                mainModule.set(moduleName)
+                jvmArgs = listOf("-Xmx128m")
+            }
+        }

test-project-kotlin-pre-1-7/greeter.javaexec/src/main/java/module-info.java

@@ -0,0 +1,8 @@
+import examples.greeter.api.Greeter;
+
+module greeter.javaexec {
+    requires greeter.api;
+    requires kotlin.stdlib;
+
+    uses Greeter;
+}

test-project-kotlin-pre-1-7/greeter.javaexec/src/main/kotlin/demo/Demo1.kt

@@ -0,0 +1,12 @@
+package demo
+
+import examples.greeter.api.Greeter
+
+import java.util.ServiceLoader
+
+fun main(args: Array<String>) {
+    val greeter = ServiceLoader.load(Greeter::class.java)
+            .findFirst()
+            .orElseThrow{RuntimeException("No Greeter found!")}
+    println("Demo1: " + greeter.hello())
+}