azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Tests] Use custom test tasks instead of gradle test suites for kgp functionalTests

Browse Source 
^KT-57380 Verification Pending
This commit is contained in:
Sebastian Sellmair
2023-03-16 18:59:05 +01:00
committed by Space Team
parent 40270a9c72
commit 4039ccbb05
1 changed files with 68 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+44 -78
View File
@@ -1,12 +1,10 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import com.github.jengelman.gradle.plugins.shadow.transformers.DontIncludeResourceTransformer import com.github.jengelman.gradle.plugins.shadow.transformers.DontIncludeResourceTransformer
import org.jetbrains.dokka.gradle.DokkaTask
import org.jetbrains.kotlin.pill.PillExtension import org.jetbrains.kotlin.pill.PillExtension
plugins { plugins {
id("gradle-plugin-common-configuration") id("gradle-plugin-common-configuration")
id("jps-compatible") id("jps-compatible")
`jvm-test-suite`
} }
repositories { repositories {
@@ -214,58 +212,61 @@ gradlePlugin {
// Gradle plugins functional tests // Gradle plugins functional tests
if (!kotlinBuildProperties.isInJpsBuildIdeaSync) { if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
testing { val functionalTestSourceSet = sourceSets.create("functionalTest") {
suites { compileClasspath += mainSourceSet.output
val functionalTest by registering(JvmTestSuite::class) runtimeClasspath += mainSourceSet.output
val functionalRegressionTest by registering(JvmTestSuite::class) { configurations.getByName(implementationConfigurationName) {
sources { extendsFrom(configurations.getByName(mainSourceSet.implementationConfigurationName))
java { extendsFrom(configurations.getByName(testSourceSet.implementationConfigurationName))
setSrcDirs(listOf("src/functionalTest/kotlin")) }
configurations.getByName(runtimeOnlyConfigurationName) {
extendsFrom(configurations.getByName(mainSourceSet.runtimeOnlyConfigurationName))
extendsFrom(configurations.getByName(testSourceSet.runtimeOnlyConfigurationName))
} }
} }
targets.all { val functionalTestCompilation = kotlin.target.compilations.getByName("functionalTest")
testTask.configure { functionalTestCompilation.associateWith(kotlin.target.compilations.getByName("main"))
include("**/org/jetbrains/kotlin/gradle/regressionTests/**") functionalTestCompilation.associateWith(kotlin.target.compilations.getByName("common"))
}
}
}
val functionalDependencyResolutionTest by registering(JvmTestSuite::class) { tasks.register<Test>("functionalTest")
sources {
java {
setSrcDirs(listOf("src/functionalTest/kotlin"))
}
}
targets.all { tasks.register<Test>("functionalUnitTest") {
testTask.configure {
include("**/org/jetbrains/kotlin/gradle/dependencyResolutionTests/**")
}
}
}
val functionalUnitTest by registering(JvmTestSuite::class) {
sources {
java {
setSrcDirs(listOf("src/functionalTest/kotlin"))
}
}
targets.all {
testTask.configure {
include("**/org/jetbrains/kotlin/gradle/unitTests/**") include("**/org/jetbrains/kotlin/gradle/unitTests/**")
} }
}
tasks.register<Test>("functionalRegressionTest") {
include("**/org/jetbrains/kotlin/gradle/regressionTests/**")
} }
withType<JvmTestSuite>().configureEach { tasks.register<Test>("functionalDependencyResolutionTest") {
if (name == "test") return@configureEach include("**/org/jetbrains/kotlin/gradle/dependencyResolutionTests/**")
useJUnit() }
tasks.withType<Test>().configureEach {
if (!name.startsWith("functional")) return@configureEach
group = JavaBasePlugin.VERIFICATION_GROUP
description = "Runs functional tests"
testClassesDirs = functionalTestSourceSet.output.classesDirs
classpath = functionalTestSourceSet.runtimeClasspath
workingDir = projectDir
javaLauncher.set(javaToolchains.launcherFor {
languageVersion.set(JavaLanguageVersion.of(11))
})
dependsOnKotlinGradlePluginInstall()
testLogging {
events("passed", "skipped", "failed")
}
}
dependencies { dependencies {
implementation(project()) val implementation = project.configurations.getByName(functionalTestSourceSet.implementationConfigurationName)
val compileOnly = project.configurations.getByName(functionalTestSourceSet.compileOnlyConfigurationName)
implementation("com.android.tools.build:gradle:7.2.1") implementation("com.android.tools.build:gradle:7.2.1")
implementation("com.android.tools.build:gradle-api:7.2.1") implementation("com.android.tools.build:gradle-api:7.2.1")
compileOnly("com.android.tools:common:30.2.1") compileOnly("com.android.tools:common:30.2.1")
@@ -280,42 +281,7 @@ if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
implementation("org.reflections:reflections:0.10.2") implementation("org.reflections:reflections:0.10.2")
} }
configurations.named(sources.implementationConfigurationName) {
extendsFrom(configurations.getByName(mainSourceSet.implementationConfigurationName))
extendsFrom(configurations.getByName(testSourceSet.implementationConfigurationName))
}
configurations.named(sources.runtimeOnlyConfigurationName) {
extendsFrom(configurations.getByName(mainSourceSet.runtimeOnlyConfigurationName))
extendsFrom(configurations.getByName(testSourceSet.runtimeOnlyConfigurationName))
}
targets.all {
testTask.configure {
dependsOnKotlinGradlePluginInstall()
testLogging {
events("passed", "skipped", "failed")
}
javaLauncher.set(javaToolchains.launcherFor {
languageVersion.set(JavaLanguageVersion.of(11))
})
}
}
// open internal visibility to the test code
kotlin.target.compilations {
named(name) {
associateWith(this@compilations.getByName("main"))
associateWith(this@compilations.getByName("common"))
}
}
}
tasks.named("check") { tasks.named("check") {
dependsOn(functionalTest.name) dependsOn("functionalTest")
}
}
} }
} }