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

Remove @SimpleGradlePluginTests annotation

Browse Source 
And related Gradle tasks to run it.

^KT-45745 Fixed
This commit is contained in:
Yahor Berdnikau
2022-03-22 13:55:20 +01:00
committed by teamcity
parent 881a6bed35
commit 10fdc399c4
2 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+1 -17
View File
@@ -204,19 +204,6 @@ val allParallelTestsTask = tasks.register<Test>("kgpAllParallelTests") {
if (isTeamcityBuild) finalizedBy(cleanTestKitCacheTask)
}
val simpleTestsTask = tasks.register<Test>("kgpSimpleTests") {
group = KGP_TEST_TASKS_GROUP
description = "Run only simple tests for Kotlin Gradle Plugin (deprecated)"
maxParallelForks = maxParallelTestForks
useJUnitPlatform {
includeTags("SimpleKGP")
includeEngines("junit-jupiter")
}
if (isTeamcityBuild) finalizedBy(cleanTestKitCacheTask)
}
val jvmTestsTask = tasks.register<Test>("kgpJvmTests") {
group = KGP_TEST_TASKS_GROUP
description = "Run tests for Kotlin/JVM part of Gradle plugin"
@@ -247,8 +234,6 @@ val daemonsTestsTask = tasks.register<Test>("kgpDaemonTests") {
description = "Run only Gradle and Kotlin daemon tests for Kotlin Gradle Plugin"
maxParallelForks = 1
mustRunAfter(simpleTestsTask)
useJUnitPlatform {
includeTags("DaemonsKGP")
includeEngines("junit-jupiter")
@@ -296,7 +281,7 @@ val androidTestsTask = tasks.register<Test>("kgpAndroidTests") {
tasks.named<Task>("check") {
dependsOn("testAdvanceGradleVersion")
dependsOn(simpleTestsTask, jvmTestsTask, jsTestsTask, daemonsTestsTask, otherPluginsTestTask, mppTestsTask, androidTestsTask)
dependsOn(jvmTestsTask, jsTestsTask, daemonsTestsTask, otherPluginsTestTask, mppTestsTask, androidTestsTask)
if (isTeamcityBuild) {
dependsOn("testAdvanceGradleVersionMppAndAndroid")
dependsOn("testMppAndAndroid")
@@ -346,7 +331,6 @@ tasks.withType<Test> {
val shouldApplyJunitPlatform = name !in setOf(
allParallelTestsTask.name,
simpleTestsTask.name,
jvmTestsTask.name,
jsTestsTask.name,
daemonsTestsTask.name,
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testTags.kt
-9
View File
@@ -7,15 +7,6 @@ package org.jetbrains.kotlin.gradle.testbase
import org.junit.jupiter.api.Tag
/**
* Add it to test classes performing simple KGP checks (deprecated).
*/
@Target(AnnotationTarget.CLASS, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.FUNCTION)
@Retention(AnnotationRetention.RUNTIME)
@Tag("SimpleKGP")
@Deprecated("will be removed soon", level = DeprecationLevel.ERROR)
annotation class SimpleGradlePluginTests
/**
* Add it to test classes performing Gradle or Kotlin daemon checks.
*/