Run integration tests with jvmToolchain(8)

Author: Abduqodiri Qurbonzoda

integration/src/main/kotlin/kotlinx/benchmark/integration/ProjectBuilder.kt

@@ -5,6 +5,7 @@ class ProjectBuilder {
     private val targets = mutableMapOf<String, BenchmarkTarget>()
 
     var kotlinVersion: String = System.getProperty("kotlin_version")
+    var jvmToolchain: Int = 8
 
     fun configuration(name: String, configuration: BenchmarkConfiguration.() -> Unit = {}) {
         configurations[name] = BenchmarkConfiguration().apply(configuration)
@@ -27,15 +28,15 @@ benchmark {
 }
             """.trimIndent()
 
-        return generateBuildScript(kotlinVersion) + "\n\n" + original + "\n\n" + script
+        return generateBuildScript(kotlinVersion, jvmToolchain) + "\n\n" + original + "\n\n" + script
     }
 }
 
 private val kotlin_repo = System.getProperty("kotlin_repo_url").let {
     if (it.isNullOrBlank()) "" else "maven { url '$it' }"
 }
 
-private fun generateBuildScript(kotlinVersion: String) =
+private fun generateBuildScript(kotlinVersion: String, jvmToolchain: Int) =
     """
     buildscript {
         repositories {
@@ -57,4 +58,8 @@ private fun generateBuildScript(kotlinVersion: String) =
         maven { url '${System.getProperty("runtime_repo_url")}' }
         mavenCentral()
     }
+    
+    kotlin {
+        jvmToolchain($jvmToolchain)
+    }
     """.trimIndent()

integration/src/test/kotlin/kotlinx/benchmark/integration/GradleTest.kt

@@ -22,11 +22,14 @@ abstract class GradleTest {
         print: Boolean = false,
         gradleVersion: GradleTestVersion? = null,
         kotlinVersion: String? = null,
+        jvmToolchain: Int? = null,
         build: ProjectBuilder.() -> Unit = {}
     ): Runner {
         val builder = ProjectBuilder().apply {
             kotlinVersion?.let { this.kotlinVersion = it }
+            jvmToolchain?.let { this.jvmToolchain = it }
         }.apply(build)
+        rootProjectDir.deleteRecursively()
         templates.resolve(name).copyRecursively(rootProjectDir)
         file("build.gradle").modify(builder::build)
         val settingsFile = file("settings.gradle")

integration/src/test/kotlin/kotlinx/benchmark/integration/JvmToolchainsTest.kt

@@ -7,7 +7,12 @@ import kotlin.test.assertEquals
 class JvmToolchainsTest : GradleTest() {
     @Test
     fun testHigherVersionThanInGradle() {
-        val runner = project("kmp-with-toolchain/higher-version-than-in-gradle", true, GradleTestVersion.v8_0)
+        val runner = project(
+            "kmp-with-toolchain/higher-version-than-in-gradle",
+            print = true,
+            GradleTestVersion.v8_0,
+            jvmToolchain = 21
+        )
         runner.runAndSucceed("benchmark") {
             assertEquals(TaskOutcome.SUCCESS, task(":jvmBenchmark")!!.outcome)
             assertOutputDoesNotContain("<failure>")
@@ -16,10 +21,16 @@ class JvmToolchainsTest : GradleTest() {
 
     @Test
     fun testMinSupportedVersion() {
-        val runner = project("kmp-with-toolchain/min-supported-version", true)
-        runner.runAndSucceed("benchmark") {
-            assertEquals(TaskOutcome.SUCCESS, task(":jvmBenchmark")!!.outcome)
-            assertOutputDoesNotContain("<failure>")
+        for (jvmToolchain in listOf(8, 11, 17, 21)) {
+            val runner = project(
+                "kmp-with-toolchain/min-supported-version",
+                print = true,
+                jvmToolchain = jvmToolchain
+            )
+            runner.runAndSucceed("benchmark") {
+                assertEquals(TaskOutcome.SUCCESS, task(":jvmBenchmark")!!.outcome)
+                assertOutputDoesNotContain("<failure>")
+            }
         }
     }
 }

integration/src/test/resources/templates/kmp-with-toolchain/higher-version-than-in-gradle/build.gradle

@@ -1,5 +1,4 @@
 kotlin {
-    jvmToolchain(21)
     jvm {}
 
     sourceSets {

integration/src/test/resources/templates/kmp-with-toolchain/higher-version-than-in-gradle/src/commonMain/kotlin/CommonBenchmark.kt renamed to integration/src/test/resources/templates/kmp-with-toolchain/higher-version-than-in-gradle/src/jvmMain/kotlin/JvmBenchmark.kt

@@ -1,15 +1,23 @@
 package test
 
 import kotlinx.benchmark.*
-import kotlin.math.*
 
 // Don't really need to measure anything here, just check that the benchmark works
 @State(Scope.Benchmark)
 @Warmup(iterations = 0)
 @Measurement(iterations = 1, time = 100, timeUnit = BenchmarkTimeUnit.MILLISECONDS)
 @OutputTimeUnit(BenchmarkTimeUnit.MILLISECONDS)
 @BenchmarkMode(Mode.Throughput)
-open class CommonBenchmark {
+open class JvmBenchmark {
+    private val arrayList = java.util.ArrayList<Int>()
+
+    @Setup
+    fun setup() {
+        // Methods from JDK21
+        arrayList.addFirst(0)
+        arrayList.addLast(1)
+    }
+
     @Benchmark
-    open fun mathBenchmark() = 3.14
+    open fun benchmark() = arrayList.size
 }

integration/src/test/resources/templates/kmp-with-toolchain/min-supported-version/build.gradle

@@ -1,5 +1,4 @@
 kotlin {
-    jvmToolchain(8)
     jvm {}
 
     sourceSets {