Add test sample for working with Kotlin

jjohannes · jjohannes · commit 9cc529ea2ed7 · 2022-03-23T10:28:10.000+01:00
diff --git a/samples/basic/build-logic/src/main/kotlin/org.my.gradle.java-module.gradle.kts b/samples/basic/build-logic/src/main/kotlin/org.my.gradle.java-module.gradle.kts
@@ -6,6 +6,7 @@ group = "org.my"
 
 tasks.test {
     useJUnitPlatform()
+    jvmArgs("-Dorg.slf4j.simpleLogger.defaultLogLevel=error")
 }
 
 dependencies {
diff --git a/samples/basic/build.out b/samples/basic/build.out
@@ -13,8 +13,6 @@
 > Task :app:compileTestJava
 > Task :app:processTestResources NO-SOURCE
 > Task :app:testClasses
-[Test worker] INFO org.gradle.api.internal.tasks.testing.worker.TestWorker - Gradle Test Executor 1 started executing tests.
-[Test worker] INFO org.gradle.api.internal.tasks.testing.worker.TestWorker - Gradle Test Executor 1 finished executing tests.
 > Task :app:test
 > Task :app:check
 > Task :app:build
diff --git a/samples/configuration-cache/build-logic/src/main/kotlin/org.my.gradle.java-module.gradle.kts b/samples/configuration-cache/build-logic/src/main/kotlin/org.my.gradle.java-module.gradle.kts
@@ -6,6 +6,7 @@ group = "org.my"
 
 tasks.test {
     useJUnitPlatform()
+    jvmArgs("-Dorg.slf4j.simpleLogger.defaultLogLevel=error")
 }
 
 dependencies {
diff --git a/samples/configuration-cache/build.out b/samples/configuration-cache/build.out
@@ -14,8 +14,6 @@
 > Task :app:compileTestJava
 > Task :app:processTestResources NO-SOURCE
 > Task :app:testClasses
-[Test worker] INFO org.gradle.api.internal.tasks.testing.worker.TestWorker - Gradle Test Executor 2 started executing tests.
-[Test worker] INFO org.gradle.api.internal.tasks.testing.worker.TestWorker - Gradle Test Executor 2 finished executing tests.
 > Task :app:test
 > Task :app:check
 > Task :app:build
diff --git a/samples/kotlin/app/build.gradle.kts b/samples/kotlin/app/build.gradle.kts
@@ -0,0 +1,14 @@
+plugins {
+    id("org.my.gradle.kotlin-java-module")
+    id("application")
+}
+
+application {
+    applicationDefaultJvmArgs = listOf("-ea")
+    mainClass.set("org.my.app.AppKt")
+    mainModule.set("org.my.app")
+}
+
+dependencies {
+    runtimeOnly(javaModuleDependencies.gav("org.slf4j.simple"))
+}
diff --git a/samples/kotlin/app/src/main/java/module-info.java b/samples/kotlin/app/src/main/java/module-info.java
@@ -0,0 +1,9 @@
+module org.my.app {
+    requires org.slf4j;
+    requires org.my.lib;
+    requires static org.apache.xmlbeans;
+
+    requires kotlin.stdlib;
+
+    exports org.my.app;
+}
diff --git a/samples/kotlin/app/src/main/kotlin/org/my/app/App.kt b/samples/kotlin/app/src/main/kotlin/org/my/app/App.kt
@@ -0,0 +1,26 @@
+package org.my.app
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import org.apache.xmlbeans.impl.tool.XMLBean
+import org.slf4j.spi.LoggerFactoryBinder
+
+fun main() {
+    App.doWork()
+}
+
+object App {
+    fun doWork(): Boolean {
+        val om = ObjectMapper()
+        if (!om.canSerialize(LoggerFactoryBinder::class.java)) {
+            throw RuntimeException("Boom!")
+        }
+        println(App::class.java.module.name)
+        try {
+            XMLBean()
+            throw RuntimeException("Boom!")
+        } catch (e: NoClassDefFoundError) {
+            // This is expected at runtime!
+        }
+        return true
+    }
+}
diff --git a/samples/kotlin/app/src/test/java/module-info.java b/samples/kotlin/app/src/test/java/module-info.java
@@ -0,0 +1,4 @@
+open module org.my.app.test {
+    requires org.my.app;
+    requires org.junit.jupiter.api;
+}
diff --git a/samples/kotlin/app/src/test/kotlin/org/my/app/test/AppTest.kt b/samples/kotlin/app/src/test/kotlin/org/my/app/test/AppTest.kt
@@ -0,0 +1,15 @@
+package org.my.app.test
+
+import org.junit.jupiter.api.Test
+import org.my.app.App
+
+import org.junit.jupiter.api.Assertions.assertTrue
+
+class AppTest {
+
+    @Test
+    fun appDoesNotExplode() {
+        assertTrue(App.doWork());
+    }
+
+}
diff --git a/samples/kotlin/build-logic/build.gradle.kts b/samples/kotlin/build-logic/build.gradle.kts
@@ -0,0 +1,8 @@
+plugins {
+    `kotlin-dsl`
+}
+
+dependencies {
+    implementation("de.jjohannes.gradle:java-module-dependencies:0.6")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
+}
diff --git a/samples/kotlin/build-logic/settings.gradle.kts b/samples/kotlin/build-logic/settings.gradle.kts
@@ -0,0 +1,8 @@
+pluginManagement {
+    // This is for testing against the latest version of the plugin, remove if you copied this for a real project
+    includeBuild(extra.properties["pluginLocation"] ?: rootDir.parentFile.parentFile.parent)
+}
+
+dependencyResolutionManagement {
+    repositories.gradlePluginPortal()
+}
diff --git a/samples/kotlin/build-logic/src/main/kotlin/org.my.gradle.kotlin-java-module.gradle.kts b/samples/kotlin/build-logic/src/main/kotlin/org.my.gradle.kotlin-java-module.gradle.kts
@@ -0,0 +1,52 @@
+plugins {
+    id("de.jjohannes.java-module-dependencies")
+    id("org.jetbrains.kotlin.jvm")
+}
+
+group = "org.my"
+val moduleName = "${project.group}.${project.name}"
+val testModuleName = "${moduleName}.test"
+
+val javaLanguageVersion = JavaLanguageVersion.of(11)
+java {
+    toolchain.languageVersion.set(javaLanguageVersion)
+}
+kotlin.jvmToolchain {
+    (this as JavaToolchainSpec).languageVersion.set(javaLanguageVersion)
+}
+
+// this is needed because we have a separate compile step in this example with the 'module-info.java' is in 'main/java' and the Kotlin code is in 'main/kotlin'
+tasks.compileJava {
+    // Compiling module-info in the 'main/java' folder needs to see already compiled Kotlin code
+    options.compilerArgs = listOf("--patch-module", "$moduleName=${sourceSets.main.get().output.asPath}")
+}
+
+// Testing with JUnit5 (which is available in modules)
+tasks.compileTestKotlin {
+    // Make sure only module Jars are on the classpath and not the classes folders of the current project
+    classpath = configurations.testCompileClasspath.get()
+}
+tasks.compileTestJava {
+    // Compiling module-info in the 'test/java' folder needs to see already compiled Kotlin code
+    options.compilerArgs = listOf("--patch-module", "$testModuleName=${sourceSets.test.get().output.asPath}")
+    // Make sure only module Jars are on the classpath and not the classes folders of the current project
+    classpath = configurations.testCompileClasspath.get()
+}
+val testJar = tasks.register<Jar>(sourceSets.test.get().jarTaskName) {
+    // Package test code/resources as Jar so that they are a proper module at runtime
+    archiveClassifier.set("tests")
+    from(sourceSets.test.get().output)
+}
+tasks.test {
+    classpath = configurations.testRuntimeClasspath.get() + files(testJar)
+    useJUnitPlatform()
+    jvmArgs("-Dorg.slf4j.simpleLogger.defaultLogLevel=error")
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
+
+dependencies {
+    testRuntimeOnly(javaModuleDependencies.gav("org.junit.jupiter.engine"))
+}
diff --git a/samples/kotlin/build.out b/samples/kotlin/build.out
@@ -0,0 +1,36 @@
+> Task :lib:compileKotlin
+> Task :lib:compileJava
+> Task :lib:processResources NO-SOURCE
+> Task :lib:classes
+> Task :lib:inspectClassesForKotlinIC
+> Task :lib:jar
+> Task :app:compileKotlin
+> Task :app:compileJava
+> Task :app:processResources NO-SOURCE
+> Task :app:classes
+> Task :app:inspectClassesForKotlinIC
+> Task :app:jar
+> Task :app:startScripts
+> Task :app:distTar
+> Task :app:distZip
+> Task :app:assemble
+> Task :app:compileTestKotlin
+> Task :app:compileTestJava
+> Task :app:processTestResources NO-SOURCE
+> Task :app:testClasses
+> Task :app:testJar
+> Task :app:test
+> Task :app:check
+> Task :app:build
+> Task :lib:assemble
+> Task :lib:compileTestKotlin
+> Task :lib:compileTestJava
+> Task :lib:processTestResources NO-SOURCE
+> Task :lib:testClasses
+> Task :lib:testJar
+> Task :lib:test
+> Task :lib:check
+> Task :lib:build
+
+> Task :app:run
+org.my.app
diff --git a/samples/kotlin/build.sample.conf b/samples/kotlin/build.sample.conf
@@ -0,0 +1,2 @@
+executable: gradlew
+expected-output-file: build.out
diff --git a/samples/kotlin/gradle/libs.versions.toml b/samples/kotlin/gradle/libs.versions.toml
@@ -0,0 +1,10 @@
+[versions]
+kotlin_stdlib = "1.6.10"
+
+com_fasterxml_jackson_databind = "2.12.5"
+org_apache_xmlbeans = "5.0.1"
+org_slf4j = "1.7.28"
+org_slf4j_simple = "1.7.28"
+
+org_junit_jupiter_api = "5.7.2"
+org_junit_jupiter_engine = "5.7.2"
diff --git a/samples/kotlin/lib/build.gradle.kts b/samples/kotlin/lib/build.gradle.kts
@@ -0,0 +1,4 @@
+plugins {
+    id("org.my.gradle.kotlin-java-module")
+    id("java-library")
+}
diff --git a/samples/kotlin/lib/src/main/java/module-info.java b/samples/kotlin/lib/src/main/java/module-info.java
@@ -0,0 +1,9 @@
+module org.my.lib {
+    requires transitive com.fasterxml.jackson.databind;
+
+    requires kotlin.stdlib;
+
+    // JDK modules
+    requires java.logging;
+    requires jdk.charsets;
+}
diff --git a/samples/kotlin/lib/src/main/kotlin/org/my/lib/Util.kt b/samples/kotlin/lib/src/main/kotlin/org/my/lib/Util.kt
@@ -0,0 +1,10 @@
+package org.my.lib
+
+import com.fasterxml.jackson.databind.ObjectMapper
+
+class Util {
+
+    fun doWork() {
+        ObjectMapper()
+    }
+}
diff --git a/samples/kotlin/lib/src/test/java/module-info.java b/samples/kotlin/lib/src/test/java/module-info.java
@@ -0,0 +1,4 @@
+open module org.my.lib.test {
+    requires org.my.lib;
+    requires org.junit.jupiter.api;
+}
diff --git a/samples/kotlin/settings.gradle.kts b/samples/kotlin/settings.gradle.kts
@@ -0,0 +1,10 @@
+pluginManagement {
+    includeBuild("build-logic")
+}
+dependencyResolutionManagement {
+    repositories.mavenCentral()
+}
+
+include("app", "lib")
+
+enableFeaturePreview("VERSION_CATALOGS")

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ group = "org.my"`
`6`	`6`
`7`	`7`	`tasks.test {`
`8`	`8`	`useJUnitPlatform()`
	`9`	`+ jvmArgs("-Dorg.slf4j.simpleLogger.defaultLogLevel=error")`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`dependencies {`