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

Use 'jvm-test-suite' for KGP functional tests

Browse Source
This commit is contained in:
Yahor Berdnikau
2022-11-30 15:00:20 +01:00
committed by Space Team
parent 8726360a8e
commit c682d4f4cc
2 changed files with 65 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+65 -29
View File
@@ -6,10 +6,7 @@ import org.jetbrains.kotlin.pill.PillExtension
plugins {
id("gradle-plugin-common-configuration")
id("jps-compatible")
}
if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
apply(from = "functionalTest.gradle.kts")
`jvm-test-suite`
}
repositories {
@@ -90,23 +87,6 @@ dependencies {
exclude(group = "*")
}
if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
val functionalTestImplementation by configurations.getting
val functionalTestCompileOnly by configurations.getting
functionalTestImplementation("com.android.tools.build:gradle:7.2.1")
functionalTestImplementation("com.android.tools.build:gradle-api:7.2.1")
functionalTestCompileOnly("com.android.tools:common:30.2.1")
functionalTestImplementation(gradleKotlinDsl())
functionalTestImplementation(project(":kotlin-gradle-plugin-kpm-android"))
functionalTestImplementation(project(":kotlin-gradle-plugin-tcs-android"))
functionalTestImplementation(project(":kotlin-tooling-metadata"))
functionalTestImplementation(testFixtures(project(":kotlin-gradle-plugin-idea")))
functionalTestImplementation("com.github.gundy:semver4j:0.16.4:nodeps") {
exclude(group = "*")
}
functionalTestImplementation("org.reflections:reflections:0.10.2")
}
testCompileOnly(project(":compiler"))
testCompileOnly(project(":kotlin-annotation-processing"))
testCompileOnly(project(":kotlin-annotation-processing-gradle"))
@@ -121,14 +101,6 @@ dependencies {
testImplementation(project(":kotlin-tooling-metadata"))
}
if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
tasks.withType<Test>().named("functionalTest").configure {
javaLauncher.set(javaToolchains.launcherFor {
languageVersion.set(JavaLanguageVersion.of(11))
})
}
}
if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
configurations.commonApi.get().exclude("com.android.tools.external.com-intellij", "intellij-core")
}
@@ -243,3 +215,67 @@ gradlePlugin {
}
}
}
// Gradle plugins functional tests
if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
testing {
suites {
val functionalTest by registering(JvmTestSuite::class) {
useJUnit()
dependencies {
implementation(project)
implementation("com.android.tools.build:gradle:7.2.1")
implementation("com.android.tools.build:gradle-api:7.2.1")
compileOnly("com.android.tools:common:30.2.1")
implementation(gradleKotlinDsl())
implementation(project(":kotlin-gradle-plugin-kpm-android"))
implementation(project(":kotlin-gradle-plugin-tcs-android"))
implementation(project(":kotlin-tooling-metadata"))
implementation(project.dependencies.testFixtures(project(":kotlin-gradle-plugin-idea")))
implementation("com.github.gundy:semver4j:0.16.4:nodeps") {
(this as ExternalModuleDependency).exclude(group = "*")
}
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") {
dependsOn(functionalTest.name)
}
}
}
}
libraries/tools/kotlin-gradle-plugin/functionalTest.gradle.kts
-41
View File
@@ -1,41 +0,0 @@
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
val mainSourceSet: SourceSet = sourceSets["main"]
val functionalTestSourceSet: SourceSet = sourceSets.create("functionalTest") {
compileClasspath += mainSourceSet.output
runtimeClasspath += mainSourceSet.output
configurations.getByName(implementationConfigurationName) {
extendsFrom(configurations.getByName(mainSourceSet.implementationConfigurationName))
extendsFrom(configurations.getByName("testImplementation"))
}
configurations.getByName(runtimeOnlyConfigurationName) {
extendsFrom(configurations.getByName(mainSourceSet.runtimeOnlyConfigurationName))
extendsFrom(configurations.getByName("testRuntimeOnly"))
}
}
project.extensions.getByType<KotlinJvmProjectExtension>().target.compilations {
named(functionalTestSourceSet.name) {
associateWith(this@compilations.getByName("main"))
associateWith(this@compilations.getByName("common"))
}
}
val functionalTest by tasks.register<Test>("functionalTest") {
group = JavaBasePlugin.VERIFICATION_GROUP
description = "Runs functional tests"
testClassesDirs = functionalTestSourceSet.output.classesDirs
classpath = functionalTestSourceSet.runtimeClasspath
workingDir = projectDir
dependsOnKotlinGradlePluginInstall()
testLogging {
events("passed", "skipped", "failed")
}
}
tasks.named("check") {
dependsOn(functionalTest)
}